Fixing comments: reduced test time, locking in after, unexported wait…

…Time

- WaitUntil/After overrides each other value
- currently if channel is set that takes the priority, if not the
  waitTime is used to Sleep

.gitignore

@@ -22,4 +22,3 @@ _testmain.go
 *.exe
 
 .DS_Store
-*.swp

mock/mock.go

@@ -52,7 +52,7 @@ type Call struct {
 	// receives a message or is closed. nil means it returns immediately.
 	WaitFor <-chan time.Time
 
-	WaitTime time.Duration
+	waitTime time.Duration
 
 	// Holds a handler used to manipulate arguments content that are passed by
 	// reference. It's useful when mocking methods such as unmarshalers or
@@ -132,7 +132,9 @@ func (c *Call) WaitUntil(w <-chan time.Time) *Call {
 //
 //    Mock.On("MyMethod", arg1, arg2).After(time.Second)
 func (c *Call) After(d time.Duration) *Call {
-	c.WaitTime = d
+	c.lock()
+	defer c.unlock()
+	c.waitTime = d
 	return c
 }
 
@@ -331,8 +333,9 @@ func (m *Mock) MethodCalled(methodName string, arguments ...interface{}) Argumen
 	// block if specified
 	if call.WaitFor != nil {
 		<-call.WaitFor
+	} else {
+		time.Sleep(call.waitTime)
 	}
-	time.Sleep(call.WaitTime)
 
 	m.mutex.Lock()
 	runFn := call.RunFn

mock/mock_test.go

@@ -1229,7 +1229,7 @@ func (s *timer) GetTime(i int) string {
 }
 
 func TestAfterTotalWaitTimeWhileExecution(t *testing.T) {
-	waitDuration := 500
+	waitDuration := 10
 	total, waitMs := 5, time.Millisecond*time.Duration(waitDuration)
 	aTimer := new(timer)
 	for i := 0; i < total; i++ {
@@ -1252,15 +1252,6 @@ func TestAfterTotalWaitTimeWhileExecution(t *testing.T) {
 	}
 }
 
-func TestAfterWaitTimeDuration(t *testing.T) {
-	aTimer := new(timer)
-	waitDuration := time.Second
-
-	call := aTimer.On("GetTime", 1).After(waitDuration).Return("Time1").Once()
-
-	assert.Equal(t, waitDuration, call.WaitTime, "After should update call.WaitTime")
-}
-
 func ConcurrencyTestMethod(m *Mock) {
 	m.Called()
 }