comments in method body removed, condition refactored

gojuno · May 13, 2024 · 22e5586 · 22e5586
1 parent 5a7baf8
commit 22e5586
Show file tree

Hide file tree

Showing 15 changed files with 27 additions and 108 deletions.
diff --git a/template.go b/template.go
@@ -209,6 +209,7 @@ const (
 				}
 			{{end}}
 
+			// Times sets number of times {{$.Interface.Name}}.{{$method.Name}} should be invoked
 			func ({{$m}} *m{{$mock}}{{$method.Name}}{{(paramsRef)}}) Times(n uint64) *m{{$mock}}{{$method.Name}}{{(paramsRef)}} {
 				if n == 0 {
 					{{$m}}.mock.t.Fatalf("Times of {{$mock}}.{{$method.Name}} mock can not be zero")
@@ -219,13 +220,9 @@ const (
 
 			func ({{$m}} *m{{$mock}}{{$method.Name}}{{(paramsRef)}}) invocationsDone() bool {
 				if len({{$m}}.expectations) == 0 && {{$m}}.defaultExpectation == nil && {{$m}}.mock.func{{$method.Name}} == nil {
-					// does not need to check invocations if no expectations, defaultExpectation or func{{$method.Name}} set
 					return true
 				}
 
-				// if expectations were set we check total invocations
-				// if default expectation was set then invocations count should be greater than zero
-				// if func was set then invocations count should be greater than zero
 				totalInvocations := mm_atomic.LoadUint64(&{{$m}}.mock.after{{$method.Name}}Counter)
 				expectedInvocations := mm_atomic.LoadUint64(&{{$m}}.expectedInvocations)
 

diff --git a/tests/actor_mock.go b/tests/actor_mock.go
diff --git a/tests/context_accepter_mock.go b/tests/context_accepter_mock.go
diff --git a/tests/formatter_mock.go b/tests/formatter_mock.go
diff --git a/tests/generic_complex_union.go b/tests/generic_complex_union.go
diff --git a/tests/generic_in.go b/tests/generic_in.go
diff --git a/tests/generic_inline_union.go b/tests/generic_inline_union.go
diff --git a/tests/generic_inline_with_many_options.go b/tests/generic_inline_with_many_options.go
diff --git a/tests/generic_inout.go b/tests/generic_inout.go
diff --git a/tests/generic_multiple_args_with_different_types.go b/tests/generic_multiple_args_with_different_types.go
diff --git a/tests/generic_out.go b/tests/generic_out.go
diff --git a/tests/generic_simple_union.go b/tests/generic_simple_union.go
diff --git a/tests/generic_specific.go b/tests/generic_specific.go