Fix tool loading testcases

In commit 7520e66 (Removed no more used "coan" tools), one tool was
removed, but these testcases were not updated accordingly. This commit
updates the testcases with the correct number of tools to expect.

While here, the testcases are expanded to also explicitely check the name
and version number for all tools. This makes the test more complete, but
also documents what tools and versions are expected exactly, which makes
it easier to diagnose problems like this one later.

Also, instead of using hardcoded array indices, this converts the latter
two testcases to use an idx variable, just like the first testcase. This
makes it easier to insert a new tool later.

Signed-off-by: Matthijs Kooijman <[email protected]>

Author: matthijskooijman

Diff for: src/arduino.cc/builder/test/tools_loader_test.go

@@ -64,7 +64,7 @@ func TestLoadTools(t *testing.T) {
 	NoError(t, err)
 
 	tools := ctx.Tools
-	require.Equal(t, 7, len(tools))
+	require.Equal(t, 6, len(tools))
 
 	sort.Sort(ByToolIDAndVersion(tools))
 
@@ -88,6 +88,10 @@ func TestLoadTools(t *testing.T) {
 	require.Equal(t, "bossac", tools[idx].Name)
 	require.Equal(t, "1.6.1-arduino", tools[idx].Version)
 	require.Equal(t, Abs(t, "./downloaded_tools/bossac/1.6.1-arduino"), tools[idx].Folder)
+	idx++
+	require.Equal(t, "ctags", tools[idx].Name)
+	require.Equal(t, "5.8-arduino10", tools[idx].Version)
+	require.Equal(t, Abs(t, "./downloaded_tools/ctags/5.8-arduino10"), tools[idx].Folder)
 }
 
 func TestLoadToolsWithBoardManagerFolderStructure(t *testing.T) {
@@ -106,14 +110,18 @@ func TestLoadToolsWithBoardManagerFolderStructure(t *testing.T) {
 
 	sort.Sort(ByToolIDAndVersion(tools))
 
-	require.Equal(t, "CMSIS", tools[0].Name)
-	require.Equal(t, "arm-none-eabi-gcc", tools[1].Name)
-	require.Equal(t, "4.8.3-2014q1", tools[1].Version)
-	require.Equal(t, Abs(t, "./downloaded_board_manager_stuff/RFduino/tools/arm-none-eabi-gcc/4.8.3-2014q1"), tools[1].Folder)
-
-	require.Equal(t, "openocd", tools[2].Name)
-	require.Equal(t, "0.9.0-arduino", tools[2].Version)
-	require.Equal(t, Abs(t, "./downloaded_board_manager_stuff/arduino/tools/openocd/0.9.0-arduino"), tools[2].Folder)
+	idx := 0
+	require.Equal(t, "CMSIS", tools[idx].Name)
+	require.Equal(t, "4.0.0-atmel", tools[idx].Version)
+	require.Equal(t, Abs(t, "./downloaded_board_manager_stuff/arduino/tools/CMSIS/4.0.0-atmel"), tools[idx].Folder)
+	idx++
+	require.Equal(t, "arm-none-eabi-gcc", tools[idx].Name)
+	require.Equal(t, "4.8.3-2014q1", tools[idx].Version)
+	require.Equal(t, Abs(t, "./downloaded_board_manager_stuff/RFduino/tools/arm-none-eabi-gcc/4.8.3-2014q1"), tools[idx].Folder)
+	idx++
+	require.Equal(t, "openocd", tools[idx].Name)
+	require.Equal(t, "0.9.0-arduino", tools[idx].Version)
+	require.Equal(t, Abs(t, "./downloaded_board_manager_stuff/arduino/tools/openocd/0.9.0-arduino"), tools[idx].Folder)
 }
 
 func TestLoadLotsOfTools(t *testing.T) {
@@ -128,13 +136,40 @@ func TestLoadLotsOfTools(t *testing.T) {
 	NoError(t, err)
 
 	tools := ctx.Tools
-	require.Equal(t, 9, len(tools))
+	require.Equal(t, 8, len(tools))
 
-	require.Equal(t, "arm-none-eabi-gcc", tools[0].Name)
-	require.Equal(t, "4.8.3-2014q1", tools[0].Version)
+	sort.Sort(ByToolIDAndVersion(tools))
 
-	require.Equal(t, "CMSIS", tools[7].Name)
-	require.Equal(t, "openocd", tools[8].Name)
-	require.Equal(t, "0.9.0-arduino", tools[8].Version)
-	require.Equal(t, Abs(t, "./downloaded_board_manager_stuff/arduino/tools/openocd/0.9.0-arduino"), tools[8].Folder)
+	idx := 0
+	require.Equal(t, "CMSIS", tools[idx].Name)
+	require.Equal(t, "4.0.0-atmel", tools[idx].Version)
+	require.Equal(t, Abs(t, "./downloaded_board_manager_stuff/arduino/tools/CMSIS/4.0.0-atmel"), tools[idx].Folder)
+	idx++
+	require.Equal(t, "arm-none-eabi-gcc", tools[idx].Name)
+	require.Equal(t, "4.8.3-2014q1", tools[idx].Version)
+	require.Equal(t, Abs(t, "./downloaded_tools/arm-none-eabi-gcc/4.8.3-2014q1"), tools[idx].Folder)
+	idx++
+	require.Equal(t, "avr-gcc", tools[idx].Name)
+	require.Equal(t, "4.8.1-arduino5", tools[idx].Version)
+	require.Equal(t, Abs(t, "./downloaded_tools/avr-gcc/4.8.1-arduino5"), tools[idx].Folder)
+	idx++
+	require.Equal(t, "avrdude", tools[idx].Name)
+	require.Equal(t, "6.0.1-arduino5", tools[idx].Version)
+	require.Equal(t, Abs(t, "./downloaded_tools/avrdude/6.0.1-arduino5"), tools[idx].Folder)
+	idx++
+	require.Equal(t, "bossac", tools[idx].Name)
+	require.Equal(t, "1.5-arduino", tools[idx].Version)
+	require.Equal(t, Abs(t, "./downloaded_tools/bossac/1.5-arduino"), tools[idx].Folder)
+	idx++
+	require.Equal(t, "bossac", tools[idx].Name)
+	require.Equal(t, "1.6.1-arduino", tools[idx].Version)
+	require.Equal(t, Abs(t, "./downloaded_tools/bossac/1.6.1-arduino"), tools[idx].Folder)
+	idx++
+	require.Equal(t, "ctags", tools[idx].Name)
+	require.Equal(t, "5.8-arduino10", tools[idx].Version)
+	require.Equal(t, Abs(t, "./downloaded_tools/ctags/5.8-arduino10"), tools[idx].Folder)
+	idx++
+	require.Equal(t, "openocd", tools[idx].Name)
+	require.Equal(t, "0.9.0-arduino", tools[idx].Version)
+	require.Equal(t, Abs(t, "./downloaded_board_manager_stuff/arduino/tools/openocd/0.9.0-arduino"), tools[idx].Folder)
 }