Updated some libs, update related tests

Signed-off-by: Federico Fissore <f.fissore@arduino.cc>

Author: Federico Fissore

src/arduino.cc/builder/test/builder_test.go

@@ -284,26 +284,3 @@ func TestBuilderSketchWithBackup(t *testing.T) {
 	err := command.Run(context)
 	NoError(t, err)
 }
-
-/*
-func TestBuilderALinkage(t *testing.T) {
-	DownloadCoresAndToolsAndLibraries(t)
-
-	context := make(map[string]interface{})
-
-	buildPath := SetupBuildPath(t, context)
-	defer os.RemoveAll(buildPath)
-
-	context[constants.CTX_HARDWARE_FOLDERS] = []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "downloaded_board_manager_stuff"}
-	context[constants.CTX_TOOLS_FOLDERS] = []string{"downloaded_tools", "downloaded_board_manager_stuff"}
-	context[constants.CTX_LIBRARIES_FOLDERS] = []string{"downloaded_libraries"}
-	context[constants.CTX_FQBN] = "arduino:avr:robotControl"
-	context[constants.CTX_SKETCH_LOCATION] = filepath.Join("sketch9", "sketch.ino")
-	context[constants.CTX_BUILD_PROPERTIES_RUNTIME_IDE_VERSION] = "10600"
-	context[constants.CTX_VERBOSE] = true
-
-	command := builder.Builder{}
-	err := command.Run(context)
-	NoError(t, err)
-}
-*/

src/arduino.cc/builder/test/collect_all_source_files_from_folders_with_sources_test.go

@@ -85,17 +85,18 @@ func TestCollectAllSourceFilesFromFoldersWithSourcesOfLibrary(t *testing.T) {
 		NoError(t, err)
 	}
 
-	require.Equal(t, 8, len(*sourceFiles))
+	require.Equal(t, 9, len(*sourceFiles))
 	require.Equal(t, 0, len(*foldersWithSources))
 	sort.Strings(*sourceFiles)
 
 	require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "Bridge.cpp")), sourceFiles.Pop())
+	require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "BridgeClient.cpp")), sourceFiles.Pop())
+	require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "BridgeServer.cpp")), sourceFiles.Pop())
+	require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "BridgeUdp.cpp")), sourceFiles.Pop())
 	require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "Console.cpp")), sourceFiles.Pop())
 	require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "FileIO.cpp")), sourceFiles.Pop())
 	require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "HttpClient.cpp")), sourceFiles.Pop())
 	require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "Mailbox.cpp")), sourceFiles.Pop())
 	require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "Process.cpp")), sourceFiles.Pop())
-	require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "YunClient.cpp")), sourceFiles.Pop())
-	require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "YunServer.cpp")), sourceFiles.Pop())
 	require.Equal(t, 0, len(*sourceFiles))
 }

src/arduino.cc/builder/test/ctags_runner_test.go

@@ -77,13 +77,13 @@ func TestCTagsRunner(t *testing.T) {
 	}
 
 	ctagsTempFileName := context[constants.CTX_CTAGS_TEMP_FILE_NAME].(string)
-	expectedOutput := "server	" + ctagsTempFileName + "	/^YunServer server;$/;\"	kind:variable	line:32\n" +
+	expectedOutput := "server	" + ctagsTempFileName + "	/^BridgeServer server;$/;\"	kind:variable	line:32\n" +
 		"setup	" + ctagsTempFileName + "	/^void setup() {$/;\"	kind:function	line:34	signature:()	returntype:void\n" +
 		"loop	" + ctagsTempFileName + "	/^void loop() {$/;\"	kind:function	line:47	signature:()	returntype:void\n" +
-		"process	" + ctagsTempFileName + "	/^void process(YunClient client) {$/;\"	kind:function	line:63	signature:(YunClient client)	returntype:void\n" +
-		"digitalCommand	" + ctagsTempFileName + "	/^void digitalCommand(YunClient client) {$/;\"	kind:function	line:83	signature:(YunClient client)	returntype:void\n" +
-		"analogCommand	" + ctagsTempFileName + "	/^void analogCommand(YunClient client) {$/;\"	kind:function	line:111	signature:(YunClient client)	returntype:void\n" +
-		"modeCommand	" + ctagsTempFileName + "	/^void modeCommand(YunClient client) {$/;\"	kind:function	line:152	signature:(YunClient client)	returntype:void\n"
+		"process	" + ctagsTempFileName + "	/^void process(BridgeClient client) {$/;\"	kind:function	line:63	signature:(BridgeClient client)	returntype:void\n" +
+		"digitalCommand	" + ctagsTempFileName + "	/^void digitalCommand(BridgeClient client) {$/;\"	kind:function	line:83	signature:(BridgeClient client)	returntype:void\n" +
+		"analogCommand	" + ctagsTempFileName + "	/^void analogCommand(BridgeClient client) {$/;\"	kind:function	line:110	signature:(BridgeClient client)	returntype:void\n" +
+		"modeCommand	" + ctagsTempFileName + "	/^void modeCommand(BridgeClient client) {$/;\"	kind:function	line:150	signature:(BridgeClient client)	returntype:void\n"
 
 	require.Equal(t, expectedOutput, strings.Replace(context[constants.CTX_CTAGS_OUTPUT].(string), "\r\n", "\n", -1))
 }

src/arduino.cc/builder/test/helper_tools_downloader.go

@@ -69,9 +69,10 @@ type OsUrl struct {
 }
 
 type Library struct {
-	Name    string
-	Version string
-	Url     string
+	Name                   string
+	Version                string
+	VersionInLibProperties string
+	Url                    string
 }
 
 type Core struct {
@@ -125,10 +126,10 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
 	}
 
 	libraries := []Library{
-		Library{Name: "Audio", Version: "1.0.3"},
+		Library{Name: "Audio", Version: "1.0.4"},
 		Library{Name: "Adafruit PN532", Version: "1.0.0"},
-		Library{Name: "Bridge", Version: "1.0.7"},
-		Library{Name: "CapacitiveSensor", Version: "0.5.0"},
+		Library{Name: "Bridge", Version: "1.1.0"},
+		Library{Name: "CapacitiveSensor", Version: "0.5.0", VersionInLibProperties: "0.5"},
 		Library{Name: "Robot IR Remote", Version: "1.0.2"},
 	}
 
@@ -390,7 +391,15 @@ func allLibrariesAlreadyDownloadedAndUnpacked(targetPath string, libraries []Lib
 
 func libraryAlreadyDownloadedAndUnpacked(targetPath string, library Library) bool {
 	_, err := os.Stat(filepath.Join(targetPath, strings.Replace(library.Name, " ", "_", -1)))
-	return !os.IsNotExist(err)
+	if os.IsNotExist(err) {
+		return false
+	}
+
+	libProps, err := props.Load(filepath.Join(targetPath, strings.Replace(library.Name, " ", "_", -1), "library.properties"), i18n.HumanLogger{})
+	if err != nil {
+		return false
+	}
+	return libProps["version"] == library.Version || libProps["version"] == library.VersionInLibProperties
 }
 
 func downloadAndUnpackCore(core Core, url string, targetPath string) error {

src/arduino.cc/builder/test/prototypes_adder_test.go

@@ -78,7 +78,7 @@ func TestPrototypesAdderBridgeExample(t *testing.T) {
 	}
 
 	require.Equal(t, "#include <Arduino.h>\n#line 1\n", context[constants.CTX_INCLUDE_SECTION].(string))
-	require.Equal(t, "void setup();\nvoid loop();\nvoid process(YunClient client);\nvoid digitalCommand(YunClient client);\nvoid analogCommand(YunClient client);\nvoid modeCommand(YunClient client);\n#line 33\n", context[constants.CTX_PROTOTYPE_SECTION].(string))
+	require.Equal(t, "void setup();\nvoid loop();\nvoid process(BridgeClient client);\nvoid digitalCommand(BridgeClient client);\nvoid analogCommand(BridgeClient client);\nvoid modeCommand(BridgeClient client);\n#line 33\n", context[constants.CTX_PROTOTYPE_SECTION].(string))
 }
 
 func TestPrototypesAdderSketchWithIfDef(t *testing.T) {