Refactored integration test

Author: cmaglie

internal/integrationtest/compile_4/lib_discovery_caching_test.go

@@ -39,72 +39,69 @@ func TestLibDiscoveryCache(t *testing.T) {
 	require.NoError(t, sketchbook.RemoveAll())
 	require.NoError(t, testdata.CopyDirTo(cli.SketchbookDir()))
 
-	buildpath, err := paths.MkTempDir("", "tmpbuildpath")
-	require.NoError(t, err)
-	t.Cleanup(func() { buildpath.RemoveAll() })
-
-	{
+	t.Run("BasicLibDiscovery", func(t *testing.T) {
 		sketchA := sketchbook.Join("SketchA")
+		buildpath, err := sketchA.Join("build").Abs()
+		require.NoError(t, err)
+		t.Cleanup(func() { buildpath.RemoveAll() })
+
 		{
+			require.NoError(t, sketchA.Join("SketchA.ino").WriteFile([]byte(`
+#include <LibA.h>
+void setup() {}
+void loop() {libAFunction();}`)))
 			outjson, _, err := cli.Run("compile", "-v", "-b", "arduino:avr:uno", "--build-path", buildpath.String(), "--json", sketchA.String())
 			require.NoError(t, err)
 			j := requirejson.Parse(t, outjson)
-			j.MustContain(`{"builder_result":{
-		"used_libraries": [
-			{ "name": "LibA" },
-        	{ "name": "LibB" }
-    	],
-	}}`)
+			usedLibs := j.Query("[.builder_result.used_libraries[].name]")
+			usedLibs.MustEqual(`["LibA", "LibB"]`)
 		}
 
-		// Update SketchA
-		require.NoError(t, sketchA.Join("SketchA.ino").WriteFile([]byte(`
+		{
+			// Update SketchA
+			require.NoError(t, sketchA.Join("SketchA.ino").WriteFile([]byte(`
 #include <LibC.h>
 #include <LibA.h>
 void setup() {}
 void loop() {libAFunction();}
-`)))
-
-		{
+			`)))
 			// This compile should FAIL!
 			outjson, _, err := cli.Run("compile", "-v", "-b", "arduino:avr:uno", "--build-path", buildpath.String(), "--json", sketchA.String())
 			require.Error(t, err)
 			j := requirejson.Parse(t, outjson)
+			usedLibs := j.Query("[.builder_result.used_libraries[].name]")
+			usedLibs.MustEqual(`["LibC", "LibA"]`)
 			j.MustContain(`{
-"builder_result":{
-	"used_libraries": [
-		{ "name": "LibC" },
-		{ "name": "LibA" }
-	],
-    "diagnostics": [
-		{
-			"severity": "ERROR",
-			"message": "'libAFunction' was not declared in this scope\n void loop() {libAFunction();}\n              ^~~~~~~~~~~~"
-		}
-	]
-}}`)
+			"builder_result":{
+				"diagnostics": [
+					{
+						"severity": "ERROR",
+						"message": "'libAFunction' was not declared in this scope\n void loop() {libAFunction();}\n              ^~~~~~~~~~~~"
+					}
+				]
+			}}`)
 			j.Query(".compiler_out").MustContain(`"The list of included libraries has been changed... rebuilding all libraries."`)
 		}
 
 		{
+			// Compile again the bad sketch
+
 			// This compile should FAIL!
 			outjson, _, err := cli.Run("compile", "-v", "-b", "arduino:avr:uno", "--build-path", buildpath.String(), "--json", sketchA.String())
 			require.Error(t, err)
 			j := requirejson.Parse(t, outjson)
+			usedLibs := j.Query("[.builder_result.used_libraries[].name]")
+			usedLibs.MustEqual(`["LibC", "LibA"]`)
 			j.MustContain(`{
-"builder_result":{
-	"used_libraries": [
-		{ "name": "LibC" },
-		{ "name": "LibA" }
-	],
-    "diagnostics": [
-		{
-			"severity": "ERROR",
-			"message": "'libAFunction' was not declared in this scope\n void loop() {libAFunction();}\n              ^~~~~~~~~~~~"
-		}
-	]
-}}`)
+			"builder_result":{
+				"diagnostics": [
+					{
+						"severity": "ERROR",
+						"message": "'libAFunction' was not declared in this scope\n void loop() {libAFunction();}\n              ^~~~~~~~~~~~"
+					}
+				]
+			}}`)
 			j.Query(".compiler_out").MustNotContain(`"The list of included libraries has changed... rebuilding all libraries."`)
 		}
-	}
+	})
 }