test should use require and remove incorrect messages

pkg/generator_test.go

@@ -34,12 +34,12 @@ func (s *GeneratorSuite) getInterfaceFromFile(interfacePath, interfaceName strin
 	if !filepath.IsAbs(interfacePath) {
 		interfacePath = getFixturePath(interfacePath)
 	}
-	s.NoError(
-		s.parser.Parse(s.ctx, interfacePath), "The parser is able to parse the given file.",
+	s.Require().NoError(
+		s.parser.Parse(s.ctx, interfacePath),
 	)
 
-	s.NoError(
-		s.parser.Load(), "The parser is able to load the config.",
+	s.Require().NoError(
+		s.parser.Load(),
 	)
 
 	iface, err := s.parser.Find(interfaceName)
@@ -59,7 +59,7 @@ func (s *GeneratorSuite) checkGenerationWithConfig(
 ) *Generator {
 	generator := s.getGeneratorWithConfig(filepath, interfaceName, cfg)
 	err := generator.Generate(s.ctx)
-	s.NoError(err, "The generator ran without errors.")
+	s.Require().NoError(err)
 	if err != nil {
 		return generator
 	}
@@ -72,7 +72,7 @@ func (s *GeneratorSuite) checkGenerationWithConfig(
 	// just formatting the source, is sufficient for the needs of the current test styles.
 	var actual []byte
 	actual, fmtErr := format.Source(generator.buf.Bytes())
-	s.NoError(fmtErr, "The formatter ran without errors.")
+	s.Require().NoError(fmtErr)
 
 	// Compare lines for easier debugging via testify's slice diff output
 	expectedLines := strings.Split(expected, "\n")
@@ -96,7 +96,7 @@ func (s *GeneratorSuite) checkGenerationRegexWithConfig(
 ) *Generator {
 	generator := s.getGeneratorWithConfig(filepath, interfaceName, cfg)
 	err := generator.Generate(s.ctx)
-	s.NoError(err, "The generator ran without errors.")
+	s.Require().NoError(err)
 	if err != nil {
 		return generator
 	}
@@ -108,7 +108,7 @@ func (s *GeneratorSuite) checkGenerationRegexWithConfig(
 	// just formatting the source, is sufficient for the needs of the current test styles.
 	var actual []byte
 	actual, fmtErr := format.Source(generator.buf.Bytes())
-	s.NoError(fmtErr, "The formatter ran without errors.")
+	s.Require().NoError(fmtErr)
 
 	for _, re := range expected {
 		s.Equalf(re.shouldMatch, re.re.Match(actual), "match '%s' should be %t", re.re.String(), re.shouldMatch)
@@ -561,7 +561,7 @@ func NewExpecter(t mockConstructorTestingTNewExpecter) *Expecter {
 
 func (s *GeneratorSuite) TestGeneratorExpecterWithRolledVariadic() {
 	expectedBytes, err := os.ReadFile(getMocksPath("ExpecterAndRolledVariadic.go"))
-	s.NoError(err)
+	s.Require().NoError(err)
 	expected := string(expectedBytes)
 	expected = expected[strings.Index(expected, "// ExpecterAndRolledVariadic is"):]
 	generator := NewGenerator(
@@ -571,16 +571,16 @@ func (s *GeneratorSuite) TestGeneratorExpecterWithRolledVariadic() {
 			UnrollVariadic: false,
 		}, s.getInterfaceFromFile("expecter.go", "Expecter"), pkg,
 	)
-	s.NoError(generator.Generate(s.ctx), "The generator ran without errors.")
+	s.Require().NoError(generator.Generate(s.ctx))
 
 	var actual []byte
 	actual, fmtErr := format.Source(generator.buf.Bytes())
-	s.NoError(fmtErr, "The formatter ran without errors.")
+	s.Require().NoError(fmtErr)
 
 	expectedLines := strings.Split(expected, "\n")
 	actualLines := strings.Split(string(actual), "\n")
 
-	s.Equal(
+	s.Require().Equal(
 		expectedLines, actualLines,
 		"The generator produced unexpected output.",
 	)
@@ -801,11 +801,11 @@ func NewMockrequester_unexported(t mockConstructorTestingTNewMockrequester_unexp
 			Exported:   true,
 		}, s.getInterfaceFromFile("requester_unexported.go", "requester_unexported"), pkg,
 	)
-	s.NoError(generator.Generate(s.ctx), "The generator ran without errors.")
+	s.Require().NoError(generator.Generate(s.ctx))
 
 	var actual []byte
 	actual, fmtErr := format.Source(generator.buf.Bytes())
-	s.NoError(fmtErr, "The formatter ran without errors.")
+	s.Require().NoError(fmtErr)
 
 	expectedLines := strings.Split(expected, "\n")
 	actualLines := strings.Split(string(actual), "\n")
@@ -849,11 +849,11 @@ func NewRequester_unexported(t mockConstructorTestingTNewRequester_unexported) *
 			Exported:   true,
 		}, s.getInterfaceFromFile("requester_unexported.go", "requester_unexported"), pkg,
 	)
-	s.NoError(generator.Generate(s.ctx), "The generator ran without errors.")
+	s.Require().NoError(generator.Generate(s.ctx))
 
 	var actual []byte
 	actual, fmtErr := format.Source(generator.buf.Bytes())
-	s.NoError(fmtErr, "The formatter ran without errors.")
+	s.Require().NoError(fmtErr)
 
 	expectedLines := strings.Split(expected, "\n")
 	actualLines := strings.Split(string(actual), "\n")
@@ -951,7 +951,7 @@ func (s *GeneratorSuite) TestVersionOnCorrectLine() {
 	gen.GeneratePrologue(s.ctx, pkg)
 	err := gen.Generate(s.ctx)
 
-	s.NoError(err)
+	s.Require().NoError(err)
 	scan := bufio.NewScanner(&gen.buf)
 	s.Contains("Code generated by", scan.Text())
 }
@@ -1549,15 +1549,15 @@ func NewRequesterReturnElided(t mockConstructorTestingTNewRequesterReturnElided)
 
 func (s *GeneratorSuite) TestGeneratorVariadicArgs() {
 	expectedBytes, err := os.ReadFile(getMocksPath("RequesterVariadic.go"))
-	s.NoError(err)
+	s.Require().NoError(err)
 	expected := string(expectedBytes)
 	expected = expected[strings.Index(expected, "// RequesterVariadic is"):]
 	s.checkGeneration("requester_variadic.go", "RequesterVariadic", false, "", expected)
 }
 
 func (s *GeneratorSuite) TestGeneratorVariadicArgsAsOneArg() {
 	expectedBytes, err := os.ReadFile(getMocksPath("RequesterVariadicOneArgument.go"))
-	s.NoError(err)
+	s.Require().NoError(err)
 	expected := string(expectedBytes)
 	expected = expected[strings.Index(expected, "// RequesterVariadicOneArgument is"):]
 	generator := NewGenerator(
@@ -1567,11 +1567,11 @@ func (s *GeneratorSuite) TestGeneratorVariadicArgsAsOneArg() {
 			UnrollVariadic: false,
 		}, s.getInterfaceFromFile("requester_variadic.go", "RequesterVariadic"), pkg,
 	)
-	s.NoError(generator.Generate(s.ctx), "The generator ran without errors.")
+	s.Require().NoError(generator.Generate(s.ctx))
 
 	var actual []byte
 	actual, fmtErr := format.Source(generator.buf.Bytes())
-	s.NoError(fmtErr, "The formatter ran without errors.")
+	s.Require().NoError(fmtErr)
 
 	expectedLines := strings.Split(expected, "\n")
 	actualLines := strings.Split(string(actual), "\n")
@@ -2362,7 +2362,7 @@ func (s *GeneratorSuite) TestGeneratorForStructWithTag() {
 
 	gen := s.getGeneratorWithConfig("struct_with_tag.go", "StructWithTag", GeneratorConfig{})
 	err := gen.Generate(s.ctx)
-	s.NoError(err)
+	s.Require().NoError(err)
 
 	actual := bufio.NewScanner(&gen.buf).Text()
 	s.Contains(expected, actual)