Fix load discoveries tests

Author: silvanocerza

arduino/cores/packagemanager/loader_test.go

@@ -109,69 +109,87 @@ arduino_zero_native.pid.3=0x024d
 func TestLoadDiscoveries(t *testing.T) {
 	// Create all the necessary data to load discoveries
 	fakePath := paths.New("fake-path")
-	packageManager := NewPackageManager(fakePath, fakePath, fakePath, fakePath)
-	pack := packageManager.Packages.GetOrCreatePackage("arduino")
-	// ble-discovery tool
-	tool := pack.GetOrCreateTool("arduino:ble-discovery")
-	toolRelease := tool.GetOrCreateRelease(semver.ParseRelaxed("1.0.0"))
-	// We set this to fake the tool is installed
-	toolRelease.InstallDir = fakePath
-	tool.GetOrCreateRelease(semver.ParseRelaxed("0.1.0"))
-
-	// serial-discovery tool
-	tool = pack.GetOrCreateTool("arduino:serial-discovery")
-	tool.GetOrCreateRelease(semver.ParseRelaxed("1.0.0"))
-	toolRelease = tool.GetOrCreateRelease(semver.ParseRelaxed("0.1.0"))
-	// We set this to fake the tool is installed
-	toolRelease.InstallDir = fakePath
-
-	platform := pack.GetOrCreatePlatform("avr")
-	release := platform.GetOrCreateRelease(semver.MustParse("1.0.0"))
 
+	createTestPackageManager := func() *PackageManager {
+		packageManager := NewPackageManager(fakePath, fakePath, fakePath, fakePath)
+		pack := packageManager.Packages.GetOrCreatePackage("arduino")
+		// ble-discovery tool
+		tool := pack.GetOrCreateTool("ble-discovery")
+		toolRelease := tool.GetOrCreateRelease(semver.ParseRelaxed("1.0.0"))
+		// We set this to fake the tool is installed
+		toolRelease.InstallDir = fakePath
+		tool.GetOrCreateRelease(semver.ParseRelaxed("0.1.0"))
+
+		// serial-discovery tool
+		tool = pack.GetOrCreateTool("serial-discovery")
+		tool.GetOrCreateRelease(semver.ParseRelaxed("1.0.0"))
+		toolRelease = tool.GetOrCreateRelease(semver.ParseRelaxed("0.1.0"))
+		// We set this to fake the tool is installed
+		toolRelease.InstallDir = fakePath
+
+		platform := pack.GetOrCreatePlatform("avr")
+		release := platform.GetOrCreateRelease(semver.MustParse("1.0.0"))
+		release.InstallDir = fakePath
+
+		return packageManager
+	}
+
+	packageManager := createTestPackageManager()
+	release := packageManager.Packages["arduino"].Platforms["avr"].Releases["1.0.0"]
 	release.Properties = properties.NewFromHashmap(map[string]string{
 		"discovery.required": "arduino:ble-discovery",
 	})
 
-	discoveries, err := packageManager.LoadDiscoveries(release)
+	errs := packageManager.LoadDiscoveries()
+	require.Len(t, errs, 0)
+	discoveries := packageManager.DiscoveryManager().IDs()
 	require.Len(t, discoveries, 1)
-	require.NoError(t, err)
-	require.Equal(t, discoveries[0].GetID(), "arduino:ble-discovery")
+	require.Contains(t, discoveries, "arduino:ble-discovery")
 
+	packageManager = createTestPackageManager()
+	release = packageManager.Packages["arduino"].Platforms["avr"].Releases["1.0.0"]
 	release.Properties = properties.NewFromHashmap(map[string]string{
 		"discovery.required.0": "arduino:ble-discovery",
 		"discovery.required.1": "arduino:serial-discovery",
 	})
 
-	discoveries, err = packageManager.LoadDiscoveries(release)
+	errs = packageManager.LoadDiscoveries()
+	require.Len(t, errs, 0)
+	discoveries = packageManager.DiscoveryManager().IDs()
 	require.Len(t, discoveries, 2)
-	require.NoError(t, err)
-	require.Equal(t, discoveries[0].GetID(), "arduino:ble-discovery")
-	require.Equal(t, discoveries[1].GetID(), "arduino:serial-discovery")
+	require.Contains(t, discoveries, "arduino:ble-discovery")
+	require.Contains(t, discoveries, "arduino:serial-discovery")
 
+	packageManager = createTestPackageManager()
+	release = packageManager.Packages["arduino"].Platforms["avr"].Releases["1.0.0"]
 	release.Properties = properties.NewFromHashmap(map[string]string{
 		"discovery.required.0":     "arduino:ble-discovery",
 		"discovery.required.1":     "arduino:serial-discovery",
 		"discovery.teensy.pattern": "\"{runtime.tools.teensy_ports.path}/hardware/tools/teensy_ports\" -J2",
 	})
 
-	discoveries, err = packageManager.LoadDiscoveries(release)
+	errs = packageManager.LoadDiscoveries()
+	require.Len(t, errs, 0)
+	discoveries = packageManager.DiscoveryManager().IDs()
 	require.Len(t, discoveries, 3)
-	require.NoError(t, err)
-	require.Equal(t, discoveries[0].GetID(), "arduino:ble-discovery")
-	require.Equal(t, discoveries[1].GetID(), "arduino:serial-discovery")
-	require.Equal(t, discoveries[2].GetID(), "teensy")
+	require.Contains(t, discoveries, "arduino:ble-discovery")
+	require.Contains(t, discoveries, "arduino:serial-discovery")
+	require.Contains(t, discoveries, "teensy")
 
+	packageManager = createTestPackageManager()
+	release = packageManager.Packages["arduino"].Platforms["avr"].Releases["1.0.0"]
 	release.Properties = properties.NewFromHashmap(map[string]string{
 		"discovery.required":       "arduino:some-discovery",
 		"discovery.required.0":     "arduino:ble-discovery",
 		"discovery.required.1":     "arduino:serial-discovery",
 		"discovery.teensy.pattern": "\"{runtime.tools.teensy_ports.path}/hardware/tools/teensy_ports\" -J2",
 	})
 
-	discoveries, err = packageManager.LoadDiscoveries(release)
+	errs = packageManager.LoadDiscoveries()
+	require.Len(t, errs, 0)
+	discoveries = packageManager.DiscoveryManager().IDs()
 	require.Len(t, discoveries, 3)
-	require.NoError(t, err)
-	require.Equal(t, discoveries[0].GetID(), "arduino:ble-discovery")
-	require.Equal(t, discoveries[1].GetID(), "arduino:serial-discovery")
-	require.Equal(t, discoveries[2].GetID(), "teensy")
+	require.Contains(t, discoveries, "arduino:ble-discovery")
+	require.Contains(t, discoveries, "arduino:serial-discovery")
+	require.Contains(t, discoveries, "teensy")
 }

arduino/discovery/discoverymanager/discoverymanager.go

@@ -35,6 +35,15 @@ func New() *DiscoveryManager {
 	}
 }
 
+// IDs returns the list of discoveries' ids in this DiscoveryManager
+func (dm *DiscoveryManager) IDs() []string {
+	ids := []string{}
+	for id := range dm.discoveries {
+		ids = append(ids, id)
+	}
+	return ids
+}
+
 // Add adds a discovery to the list of managed discoveries
 func (dm *DiscoveryManager) Add(disc *discovery.PluggableDiscovery) error {
 	id := disc.GetID()