Skip to content

Commit 60d3295

Browse files
author
Federico Fissore
committed
Updated some libs, update related tests
Signed-off-by: Federico Fissore <[email protected]>
1 parent d72f9be commit 60d3295

5 files changed

+26
-39
lines changed

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

-23
Original file line numberDiff line numberDiff line change
@@ -284,26 +284,3 @@ func TestBuilderSketchWithBackup(t *testing.T) {
284284
err := command.Run(context)
285285
NoError(t, err)
286286
}
287-
288-
/*
289-
func TestBuilderALinkage(t *testing.T) {
290-
DownloadCoresAndToolsAndLibraries(t)
291-
292-
context := make(map[string]interface{})
293-
294-
buildPath := SetupBuildPath(t, context)
295-
defer os.RemoveAll(buildPath)
296-
297-
context[constants.CTX_HARDWARE_FOLDERS] = []string{filepath.Join("..", "hardware"), "hardware", "downloaded_hardware", "downloaded_board_manager_stuff"}
298-
context[constants.CTX_TOOLS_FOLDERS] = []string{"downloaded_tools", "downloaded_board_manager_stuff"}
299-
context[constants.CTX_LIBRARIES_FOLDERS] = []string{"downloaded_libraries"}
300-
context[constants.CTX_FQBN] = "arduino:avr:robotControl"
301-
context[constants.CTX_SKETCH_LOCATION] = filepath.Join("sketch9", "sketch.ino")
302-
context[constants.CTX_BUILD_PROPERTIES_RUNTIME_IDE_VERSION] = "10600"
303-
context[constants.CTX_VERBOSE] = true
304-
305-
command := builder.Builder{}
306-
err := command.Run(context)
307-
NoError(t, err)
308-
}
309-
*/

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -85,17 +85,18 @@ func TestCollectAllSourceFilesFromFoldersWithSourcesOfLibrary(t *testing.T) {
8585
NoError(t, err)
8686
}
8787

88-
require.Equal(t, 8, len(*sourceFiles))
88+
require.Equal(t, 9, len(*sourceFiles))
8989
require.Equal(t, 0, len(*foldersWithSources))
9090
sort.Strings(*sourceFiles)
9191

9292
require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "Bridge.cpp")), sourceFiles.Pop())
93+
require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "BridgeClient.cpp")), sourceFiles.Pop())
94+
require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "BridgeServer.cpp")), sourceFiles.Pop())
95+
require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "BridgeUdp.cpp")), sourceFiles.Pop())
9396
require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "Console.cpp")), sourceFiles.Pop())
9497
require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "FileIO.cpp")), sourceFiles.Pop())
9598
require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "HttpClient.cpp")), sourceFiles.Pop())
9699
require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "Mailbox.cpp")), sourceFiles.Pop())
97100
require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "Process.cpp")), sourceFiles.Pop())
98-
require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "YunClient.cpp")), sourceFiles.Pop())
99-
require.Equal(t, Abs(t, filepath.Join("downloaded_libraries", "Bridge", "src", "YunServer.cpp")), sourceFiles.Pop())
100101
require.Equal(t, 0, len(*sourceFiles))
101102
}

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,13 @@ func TestCTagsRunner(t *testing.T) {
7777
}
7878

7979
ctagsTempFileName := context[constants.CTX_CTAGS_TEMP_FILE_NAME].(string)
80-
expectedOutput := "server " + ctagsTempFileName + " /^YunServer server;$/;\" kind:variable line:32\n" +
80+
expectedOutput := "server " + ctagsTempFileName + " /^BridgeServer server;$/;\" kind:variable line:32\n" +
8181
"setup " + ctagsTempFileName + " /^void setup() {$/;\" kind:function line:34 signature:() returntype:void\n" +
8282
"loop " + ctagsTempFileName + " /^void loop() {$/;\" kind:function line:47 signature:() returntype:void\n" +
83-
"process " + ctagsTempFileName + " /^void process(YunClient client) {$/;\" kind:function line:63 signature:(YunClient client) returntype:void\n" +
84-
"digitalCommand " + ctagsTempFileName + " /^void digitalCommand(YunClient client) {$/;\" kind:function line:83 signature:(YunClient client) returntype:void\n" +
85-
"analogCommand " + ctagsTempFileName + " /^void analogCommand(YunClient client) {$/;\" kind:function line:111 signature:(YunClient client) returntype:void\n" +
86-
"modeCommand " + ctagsTempFileName + " /^void modeCommand(YunClient client) {$/;\" kind:function line:152 signature:(YunClient client) returntype:void\n"
83+
"process " + ctagsTempFileName + " /^void process(BridgeClient client) {$/;\" kind:function line:63 signature:(BridgeClient client) returntype:void\n" +
84+
"digitalCommand " + ctagsTempFileName + " /^void digitalCommand(BridgeClient client) {$/;\" kind:function line:83 signature:(BridgeClient client) returntype:void\n" +
85+
"analogCommand " + ctagsTempFileName + " /^void analogCommand(BridgeClient client) {$/;\" kind:function line:110 signature:(BridgeClient client) returntype:void\n" +
86+
"modeCommand " + ctagsTempFileName + " /^void modeCommand(BridgeClient client) {$/;\" kind:function line:150 signature:(BridgeClient client) returntype:void\n"
8787

8888
require.Equal(t, expectedOutput, strings.Replace(context[constants.CTX_CTAGS_OUTPUT].(string), "\r\n", "\n", -1))
8989
}

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

+16-7
Original file line numberDiff line numberDiff line change
@@ -69,9 +69,10 @@ type OsUrl struct {
6969
}
7070

7171
type Library struct {
72-
Name string
73-
Version string
74-
Url string
72+
Name string
73+
Version string
74+
VersionInLibProperties string
75+
Url string
7576
}
7677

7778
type Core struct {
@@ -125,10 +126,10 @@ func DownloadCoresAndToolsAndLibraries(t *testing.T) {
125126
}
126127

127128
libraries := []Library{
128-
Library{Name: "Audio", Version: "1.0.3"},
129+
Library{Name: "Audio", Version: "1.0.4"},
129130
Library{Name: "Adafruit PN532", Version: "1.0.0"},
130-
Library{Name: "Bridge", Version: "1.0.7"},
131-
Library{Name: "CapacitiveSensor", Version: "0.5.0"},
131+
Library{Name: "Bridge", Version: "1.1.0"},
132+
Library{Name: "CapacitiveSensor", Version: "0.5.0", VersionInLibProperties: "0.5"},
132133
Library{Name: "Robot IR Remote", Version: "1.0.2"},
133134
}
134135

@@ -390,7 +391,15 @@ func allLibrariesAlreadyDownloadedAndUnpacked(targetPath string, libraries []Lib
390391

391392
func libraryAlreadyDownloadedAndUnpacked(targetPath string, library Library) bool {
392393
_, err := os.Stat(filepath.Join(targetPath, strings.Replace(library.Name, " ", "_", -1)))
393-
return !os.IsNotExist(err)
394+
if os.IsNotExist(err) {
395+
return false
396+
}
397+
398+
libProps, err := props.Load(filepath.Join(targetPath, strings.Replace(library.Name, " ", "_", -1), "library.properties"), i18n.HumanLogger{})
399+
if err != nil {
400+
return false
401+
}
402+
return libProps["version"] == library.Version || libProps["version"] == library.VersionInLibProperties
394403
}
395404

396405
func downloadAndUnpackCore(core Core, url string, targetPath string) error {

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func TestPrototypesAdderBridgeExample(t *testing.T) {
7878
}
7979

8080
require.Equal(t, "#include <Arduino.h>\n#line 1\n", context[constants.CTX_INCLUDE_SECTION].(string))
81-
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))
81+
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))
8282
}
8383

8484
func TestPrototypesAdderSketchWithIfDef(t *testing.T) {

0 commit comments

Comments
 (0)