Ported sketch_with_typename integration tests out of legacy

internal/integrationtest/compile_4/compile_test.go

@@ -60,7 +60,7 @@ func TestCompileOfProblematicSketches(t *testing.T) {
 		{"SketchWithoutFunctions", testBuilderSketchWithoutFunctions},
 		{"SketchWithConfig", testBuilderSketchWithConfig},
 		{"SketchWithUsbcon", tryBuildAvrLeonardo},
-		//{"SketchWithTypename", tryBuildAvrLeonardo}, // XXX: Failing sketch, typename not supported
+		{"SketchWithTypename", testBuilderSketchWithTypename},
 		{"SketchWithMacosxGarbage", tryBuildAvrLeonardo},
 		{"SketchWithNamespace", tryBuildAvrLeonardo},
 		{"SketchWithDefaultArgs", tryBuildAvrLeonardo},
@@ -147,6 +147,21 @@ func testBuilderSketchWithClass(t *testing.T, env *integrationtest.Environment,
 	comparePreprocessGoldenFile(t, sketchPath, preprocessedSketch)
 }
 
+func testBuilderSketchWithTypename(t *testing.T, env *integrationtest.Environment, cli *integrationtest.ArduinoCLI) {
+	// XXX: Failing sketch, typename not supported.
+	//      This test will be skipped until a better C++ parser is adopted
+	t.SkipNow()
+
+	// Build
+	_, err := tryBuild(t, env, cli, "arduino:avr:leonardo")
+	require.NoError(t, err)
+
+	// Preprocess
+	sketchPath, preprocessedSketch, err := tryPreprocess(t, env, cli, "arduino:avr:leonardo")
+	require.NoError(t, err)
+	comparePreprocessGoldenFile(t, sketchPath, preprocessedSketch)
+}
+
 func tryBuildAvrLeonardo(t *testing.T, env *integrationtest.Environment, cli *integrationtest.ArduinoCLI) {
 	_, err := tryBuild(t, env, cli, "arduino:avr:leonardo")
 	require.NoError(t, err)

internal/integrationtest/compile_4/testdata/SketchWithTypename/SketchWithTypename.preprocessed.txt

@@ -0,0 +1,24 @@
+#include <Arduino.h>
+#line 1 {{QuoteCppString .sketchMainFile}}
+template< typename T >
+  struct Foo{
+    typedef T Bar;
+};
+
+#line 6 {{QuoteCppString .sketchMainFile}}
+void setup();
+#line 10 {{QuoteCppString .sketchMainFile}}
+void loop();
+#line 12
+Foo<char>::Bar func();
+#line 6 {{QuoteCppString .sketchMainFile}}
+void setup() {
+  func();
+}
+
+void loop() {}
+
+typename Foo<char>::Bar func(){
+
+}
+

legacy/builder/test/ctags_runner_test.go

@@ -62,18 +62,6 @@ func TestCTagsRunner(t *testing.T) {
 	require.Equal(t, expectedOutput, strings.Replace(string(ctagsOutput), "\r\n", "\n", -1))
 }
 
-func TestCTagsRunnerSketchWithTypename(t *testing.T) {
-	sketchLocation := Abs(t, paths.New("sketch_with_typename", "sketch_with_typename.ino"))
-	ctagsOutput := ctagsRunnerTestTemplate(t, sketchLocation)
-
-	quotedSketchLocation := strings.Replace(sketchLocation.String(), "\\", "\\\\", -1)
-	expectedOutput := "Foo\t" + quotedSketchLocation + "\t/^  struct Foo{$/;\"\tkind:struct\tline:2\n" +
-		"setup\t" + quotedSketchLocation + "\t/^void setup() {$/;\"\tkind:function\tline:6\tsignature:()\treturntype:void\n" +
-		"loop\t" + quotedSketchLocation + "\t/^void loop() {}$/;\"\tkind:function\tline:10\tsignature:()\treturntype:void\n" +
-		"func\t" + quotedSketchLocation + "\t/^typename Foo<char>::Bar func(){$/;\"\tkind:function\tline:12\tsignature:()\treturntype:Foo::Bar\n"
-	require.Equal(t, expectedOutput, strings.Replace(string(ctagsOutput), "\r\n", "\n", -1))
-}
-
 func TestCTagsRunnerSketchWithNamespace(t *testing.T) {
 	sketchLocation := Abs(t, paths.New("sketch_with_namespace", "sketch_with_namespace.ino"))
 	ctagsOutput := ctagsRunnerTestTemplate(t, sketchLocation)

legacy/builder/test/prototypes_adder_test.go

@@ -413,45 +413,6 @@ func TestPrototypesAdderSketchWithUSBCON(t *testing.T) {
 	require.Contains(t, preprocessedSketch, "#line 5 "+quotedSketchLocation+"\nvoid ciao();\n#line 10 "+quotedSketchLocation+"\nvoid setup();\n#line 15 "+quotedSketchLocation+"\nvoid loop();\n#line 5 "+quotedSketchLocation+"\n")
 }
 
-func TestPrototypesAdderSketchWithTypename(t *testing.T) {
-	sketchLocation := paths.New("sketch_with_typename", "sketch_with_typename.ino")
-	quotedSketchLocation := cpp.QuoteString(Abs(t, sketchLocation).String())
-
-	ctx := &types.Context{
-		HardwareDirs:         paths.NewPathList(filepath.Join("..", "hardware"), "downloaded_hardware"),
-		BuiltInLibrariesDirs: paths.New("libraries", "downloaded_libraries"),
-		BuiltInToolsDirs:     paths.NewPathList("downloaded_tools"),
-		Verbose:              true,
-	}
-	ctx = prepareBuilderTestContext(t, ctx, sketchLocation, "arduino:avr:leonardo")
-	defer cleanUpBuilderTestContext(t, ctx)
-
-	var _err error
-	commands := []types.Command{
-		&builder.ContainerSetupHardwareToolsLibsSketchAndProps{},
-		types.BareCommand(func(ctx *types.Context) error {
-			ctx.LineOffset, _err = bldr.PrepareSketchBuildPath(ctx.Sketch, ctx.SourceOverride, ctx.SketchBuildPath)
-			return _err
-		}),
-		&builder.ContainerFindIncludes{},
-	}
-	for _, command := range commands {
-		err := command.Run(ctx)
-		NoError(t, err)
-	}
-	NoError(t, builder.PreprocessSketch(ctx))
-
-	preprocessedSketch := loadPreprocessedSketch(t, ctx)
-	require.Contains(t, preprocessedSketch, "#include <Arduino.h>\n#line 1 "+quotedSketchLocation+"\n")
-	expected := "#line 6 " + quotedSketchLocation + "\nvoid setup();\n#line 10 " + quotedSketchLocation + "\nvoid loop();\n#line 12 " + quotedSketchLocation + "\ntypename Foo<char>::Bar func();\n#line 6 " + quotedSketchLocation + "\n"
-	obtained := preprocessedSketch
-	// ctags based preprocessing ignores line with typename
-	// TODO: remove this exception when moving to a more powerful parser
-	expected = strings.Replace(expected, "#line 12 "+quotedSketchLocation+"\ntypename Foo<char>::Bar func();\n", "", -1)
-	obtained = strings.Replace(obtained, "#line 12 "+quotedSketchLocation+"\ntypename Foo<char>::Bar func();\n", "", -1)
-	require.Contains(t, obtained, expected)
-}
-
 func TestPrototypesAdderSketchWithIfDef2(t *testing.T) {
 	sketchLocation := paths.New("sketch_with_ifdef", "sketch_with_ifdef.ino")
 	quotedSketchLocation := cpp.QuoteString(Abs(t, sketchLocation).String())