test impact Remove Sloeber setup and ... to boardsmanager

jan · jan · commit 3be09fc24033 · 2024-10-13T23:07:48.000+02:00
diff --git a/io.sloeber.tests/BuildTests Sloeber Load packages.launch b/io.sloeber.tests/BuildTests Sloeber Load packages.launch
diff --git a/io.sloeber.tests/src/io/sloeber/core/BuildTests.java b/io.sloeber.tests/src/io/sloeber/core/BuildTests.java
@@ -65,6 +65,7 @@ public class BuildTests {
     private static final boolean reinstall_boards_and_libraries = false;
     private final static String AUTOBUILD_CFG = ".autoBuildProject";
     private static final String HIDlibName = "HID-Project";
+    private static final String  packageURL=    "http://talk2arduino.wisen.com.au/master/package_talk2.wisen.com_index.json";
 
     /*
      * In new new installations (of the Sloeber development environment) the
@@ -93,9 +94,9 @@ private static void installAdditionalLibs() {
 
     public static void installAdditionalBoards() throws Exception {
 
-        String[] packageUrlsToAdd = { ESP8266.packageURL, ESP32.packageURL,
-                "http://talk2arduino.wisen.com.au/master/package_talk2.wisen.com_index.json" };
-        BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)), false);
+        String[] packageUrlsToAdd = { ESP8266.packageURL, ESP32.packageURL,packageURL};
+        BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)));
+        BoardsManager.update(false);
         Shared.waitForBoardsManager();
         if (reinstall_boards_and_libraries) {
             BoardsManager.removeAllInstalledPlatforms();
@@ -671,10 +672,10 @@ public void testDifferentSourceFolders(String projectName, CodeDescription codeD
     public void redirectedJson() throws Exception {
         // this board references to arduino avr so install that one to
         Arduino.installLatestAVRBoards();
-        BoardsManager.installLatestPlatform("package_talk2.wisen.com_index.json", "Talk2", "avr");
+        BoardsManager.installLatestPlatform(packageURL, "Talk2", "avr");
         Map<String, String> options = new HashMap<>();
         options.put("mhz", "16MHz");
-        BoardDescription boardid = BoardsManager.getBoardDescription("package_talk2.wisen.com_index.json", "Talk2",
+        BoardDescription boardid = BoardsManager.getBoardDescription(packageURL, "Talk2",
                 "avr", "whispernode", options);
         if (boardid == null) {
             fail("redirect Json ");
diff --git a/io.sloeber.tests/src/io/sloeber/core/CompileAndUpload.java b/io.sloeber.tests/src/io/sloeber/core/CompileAndUpload.java
@@ -100,7 +100,7 @@ static Stream<Arguments> uploadBourds() throws Exception {
 	public static void installAdditionalBoards() {
 		Preferences.setUseBonjour(false);
 		String[] packageUrlsToAdd = { ESP32.packageURL, ESP8266.packageURL };
-		BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)), true);
+		BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)));
 
 		if (reinstall_boards_and_libraries) {
 			BoardsManager.removeAllInstalledPlatforms();
diff --git a/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileArduinoIDEExamplesonJantjesBoardsTest.java b/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileArduinoIDEExamplesonJantjesBoardsTest.java
@@ -38,7 +38,7 @@ public static void setup() throws Exception {
         Preferences.setUseBonjour(false);
         Shared.waitForAllJobsToFinish();
         String[] packageUrlsToAdd = { Jantje.additionalJsonURL };
-        BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)), true);
+        BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)));
         Jantje.installLatestLocalDebugBoards();
         Shared.waitForAllJobsToFinish();
 
diff --git a/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileDefaultInoOnAllBoardsTest.java b/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileDefaultInoOnAllBoardsTest.java
@@ -355,7 +355,7 @@ public static void installAdditionalBoards() throws Exception {
 		if (isMac) {
 			toAddList.removeAll(Arrays.asList(packageUrlsToIgnoreOnMac));
 		}
-		BoardsManager.setPackageURLs(toAddList, true);
+		BoardsManager.addPackageURLs(toAddList);
 
 		if (!skipPlatformInstallation) {
 			BoardsManager.installAllLatestPlatforms();
diff --git a/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileExamplesTest.java b/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileExamplesTest.java
@@ -81,7 +81,7 @@ public static Stream<Arguments> examples() throws Exception {
 
 	public static void installAdditionalBoards() {
 		String[] packageUrlsToAdd = { ESP8266.packageURL, Adafruit.packageURL };
-		BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)), true);
+		BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)));
 		if (reinstall_boards_and_examples) {
 			BoardsManager.installAllLatestPlatforms();
 			BoardsManager.onlyKeepLatestPlatforms();
diff --git a/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileLibraryExamplesTest.java b/io.sloeber.tests/src/io/sloeber/core/CreateAndCompileLibraryExamplesTest.java
@@ -82,7 +82,7 @@ public static void installMyStuff() {
 
     public static void installAdditionalBoards() {
         String[] packageUrlsToAdd = { ESP8266.packageURL, Adafruit.packageURL, ESP32.packageURL };
-        BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)), reinstall_boards_and_examples);
+        BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)));
         if (reinstall_boards_and_examples) {
             BoardsManager.installAllLatestPlatforms();
             BoardsManager.onlyKeepLatestPlatforms();
diff --git a/io.sloeber.tests/src/io/sloeber/core/Shared.java b/io.sloeber.tests/src/io/sloeber/core/Shared.java
@@ -132,6 +132,8 @@ public static void waitForIndexer(IProject iProject) throws Exception {
 			if(count%10==0) {
 				System.out.println("Waiting for indexer");
 			}
+			icProject = CoreModel.getDefault().create(iProject);
+			index = CCorePlugin.getIndexManager().getIndex(icProject);
 		}
 	}
 
@@ -248,15 +250,15 @@ public static String buildAndVerifyGivenBuilders(String projectName, BoardDescri
 			}
 			// clean so we will get a full build for this buider
 			theTestProject.build(IncrementalProjectBuilder.CLEAN_BUILD, monitor);
-			
+
 			// set the builder
 			CoreModel coreModel = CoreModel.getDefault();
 			ICProjectDescription projectDescription = coreModel.getProjectDescription(theTestProject, true);
 			IAutoBuildConfigurationDescription autoDesc = IAutoBuildConfigurationDescription
 					.getActiveConfig(projectDescription);
 			autoDesc.setBuilder(curBuilder);
 			coreModel.setProjectDescription(theTestProject, projectDescription);
-				
+
 			theTestProject.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
 
 			if (hasBuildErrors(theTestProject)!=null) {
diff --git a/io.sloeber.tests/src/io/sloeber/providers/Adafruit.java b/io.sloeber.tests/src/io/sloeber/providers/Adafruit.java
@@ -18,7 +18,7 @@ public class Adafruit extends MCUBoard {
 
     public Adafruit(String architectureID, String boardName) {
 
-        myBoardDescriptor = BoardsManager.getBoardDescription("package_adafruit_index.json", "adafruit", architectureID,
+        myBoardDescriptor = BoardsManager.getBoardDescription(packageURL, "adafruit", architectureID,
                 boardName, null);
         if (myBoardDescriptor == null) {
             fail(boardName + " Board not found");
diff --git a/io.sloeber.tests/src/io/sloeber/providers/Arduino.java b/io.sloeber.tests/src/io/sloeber/providers/Arduino.java
@@ -13,10 +13,12 @@
 import io.sloeber.arduinoFramework.api.IArduinoPackage;
 import io.sloeber.arduinoFramework.api.IArduinoPlatform;
 import io.sloeber.arduinoFramework.api.IArduinoPlatformVersion;
+import io.sloeber.core.api.Defaults;
 
 @SuppressWarnings("nls")
 public class Arduino extends MCUBoard {
 
+	private static final String packageURL= Defaults.DEFAULT_INSTALL_JSON;
     private static final String providerArduino = "arduino";
     private static final String providerIntel = "Intel";
     private static final String AVRArchitectureName = "avr";
@@ -25,7 +27,6 @@ public class Arduino extends MCUBoard {
     private static final String NFRArchitectureName = "nrf52";
     private static final String MBEDArchitectureName = "mbed";
     private static final String intelCurieArchitectureName = "arc32";
-    private static final String jsonFileName = "package_index.json";
 
     public static final String circuitplay32ID = "circuitplay32u4cat";
     public static final String unoID = "uno";
@@ -116,7 +117,7 @@ public static MCUBoard arduino_101() {
     }
 
     private Arduino(String providerName, String architectureName, String boardID) {
-        this.myBoardDescriptor = BoardsManager.getBoardDescription(jsonFileName, providerName, architectureName,
+        this.myBoardDescriptor = BoardsManager.getBoardDescription(packageURL, providerName, architectureName,
                 boardID, null);
         if (this.myBoardDescriptor == null) {
             fail(boardID + " Board not found");
@@ -264,19 +265,19 @@ private static List<String> supportKeyboardList() {
     }
 
     public static void installLatestAVRBoards() {
-        BoardsManager.installLatestPlatform(jsonFileName, providerArduino, AVRArchitectureName);
+        BoardsManager.installLatestPlatform(packageURL, providerArduino, AVRArchitectureName);
     }
 
     public static void installLatestSamDBoards() {
-        BoardsManager.installLatestPlatform(jsonFileName, providerArduino, SAMDArchitectureName);
+        BoardsManager.installLatestPlatform(packageURL, providerArduino, SAMDArchitectureName);
     }
 
     public static void installLatestSamBoards() {
-        BoardsManager.installLatestPlatform(jsonFileName, providerArduino, SAMArchitectureName);
+        BoardsManager.installLatestPlatform(packageURL, providerArduino, SAMArchitectureName);
     }
 
     public static void installLatestIntellCurieBoards() {
-        BoardsManager.installLatestPlatform(jsonFileName, providerIntel, intelCurieArchitectureName);
+        BoardsManager.installLatestPlatform(packageURL, providerIntel, intelCurieArchitectureName);
     }
 
     public static List<MCUBoard> getAllBoards() {
diff --git a/io.sloeber.tests/src/io/sloeber/providers/ESP32.java b/io.sloeber.tests/src/io/sloeber/providers/ESP32.java
@@ -13,7 +13,6 @@
 public class ESP32 extends MCUBoard {
     private static final String provider = "esp32";
     private static final String architectureName = "esp32";
-    private static final String jsonFileName = "package_esp32_index.json";
     public static final String packageURL = "https://espressif.github.io/arduino-esp32/package_esp32_index.json";
     public static final String esp32ID = "esp32";
 
@@ -28,7 +27,7 @@ public static MCUBoard esp32() {
     }
 
     public ESP32(String boardName, Map<String, String> options) {
-        myBoardDescriptor = BoardsManager.getBoardDescription(jsonFileName, provider, architectureName, boardName,
+        myBoardDescriptor = BoardsManager.getBoardDescription(packageURL, provider, architectureName, boardName,
                 options);
         if (myBoardDescriptor == null) {
             fail(boardName + " Board not found");
@@ -43,7 +42,7 @@ public ESP32(BoardDescription boardDesc) {
     }
 
     public static void installLatest() {
-        BoardsManager.installLatestPlatform(jsonFileName, provider, architectureName);
+        BoardsManager.installLatestPlatform(packageURL, provider, architectureName);
     }
 
     @Override
diff --git a/io.sloeber.tests/src/io/sloeber/providers/ESP8266.java b/io.sloeber.tests/src/io/sloeber/providers/ESP8266.java
@@ -13,7 +13,6 @@
 public class ESP8266 extends MCUBoard {
     private static final String provider = "esp8266";
     private static final String architectureName = "esp8266";
-    private static final String jsonFileName = "package_esp8266com_index.json";
     public static final String packageURL = "https://arduino.esp8266.com/stable/package_esp8266com_index.json";
 
     public static MCUBoard wemosD1() {
@@ -33,7 +32,7 @@ public static MCUBoard ESPressoLite() {
     }
 
     public ESP8266(String boardName, Map<String, String> options) {
-        myBoardDescriptor = BoardsManager.getBoardDescription(jsonFileName, provider, architectureName, boardName,
+        myBoardDescriptor = BoardsManager.getBoardDescription(packageURL, provider, architectureName, boardName,
                 options);
         if (this.myBoardDescriptor == null) {
             fail(boardName + " Board not found");
@@ -48,7 +47,7 @@ public ESP8266(BoardDescription boardDesc) {
     }
 
     public static void installLatest() {
-        BoardsManager.installLatestPlatform(jsonFileName, provider, architectureName);
+        BoardsManager.installLatestPlatform(packageURL, provider, architectureName);
     }
 
     @Override
diff --git a/io.sloeber.tests/src/io/sloeber/providers/Jantje.java b/io.sloeber.tests/src/io/sloeber/providers/Jantje.java
@@ -9,14 +9,15 @@
 
 import io.sloeber.arduinoFramework.api.BoardDescription;
 import io.sloeber.arduinoFramework.api.BoardsManager;
+import io.sloeber.core.api.Defaults;
 
 @SuppressWarnings("nls")
 public class Jantje extends MCUBoard {
 
     private static final String provider = "Jantje";
     private static final String packageName = "Jantje";
     private static final String localDebugArchitectureName = "pc";
-    private static final String jsonFileName = "package_jantje_index.json";
+    private static final String packageURL = Defaults.JANTJE_BOARD_JSON_URL;
     // the below json url is need as esp8266 is a referenced platform
     public static final String additionalJsonURL = "https://arduino.esp8266.com/stable/package_esp8266com_index.json";
 
@@ -43,7 +44,7 @@ public static MCUBoard uno() {
     public Jantje(String boardName) {
         Map<String, String> options = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);
         options.put("type", "debug");
-        myBoardDescriptor = BoardsManager.getBoardDescription(jsonFileName, packageName, localDebugArchitectureName,
+        myBoardDescriptor = BoardsManager.getBoardDescription(packageURL, packageName, localDebugArchitectureName,
                 boardName, options);
         if (myBoardDescriptor == null) {
             fail(boardName + " Board not found");
@@ -52,7 +53,7 @@ public Jantje(String boardName) {
     }
 
     public static void installLatestLocalDebugBoards() {
-        BoardsManager.installLatestPlatform(jsonFileName, provider, localDebugArchitectureName);
+        BoardsManager.installLatestPlatform(packageURL, provider, localDebugArchitectureName);
     }
 
     @Override
diff --git a/io.sloeber.tests/src/io/sloeber/providers/Teensy.java b/io.sloeber.tests/src/io/sloeber/providers/Teensy.java
@@ -21,7 +21,6 @@ public class Teensy extends MCUBoard {
     public final static String Teensy_LC_ID = "teensyLC";
     public final static String TEENSY_PLATFORM_ID = "avr";
     public final static String TEENSY_PROVIDER= "teensy";
-	private static final String jsonFileName = "package_teensy_index.json";
 	public static final String packageURL = "https://www.pjrc.com/teensy/package_teensy_index.json";
 
     public static MCUBoard Teensy_LC() {
@@ -71,7 +70,7 @@ private Teensy(String boardID) {
         default:
             break;
         }
-        myBoardDescriptor = BoardsManager.getBoardDescription(jsonFileName, TEENSY_PROVIDER, TEENSY_PLATFORM_ID,boardID,options);
+        myBoardDescriptor = BoardsManager.getBoardDescription(packageURL, TEENSY_PROVIDER, TEENSY_PLATFORM_ID,boardID,options);
 
         setUploadPort("none");
         setAttributes();
@@ -140,7 +139,7 @@ protected void setAttributes() {
     }
 
 	public static void installLatest() {
-	        BoardsManager.installLatestPlatform(jsonFileName, TEENSY_PROVIDER, TEENSY_PLATFORM_ID);
+	        BoardsManager.installLatestPlatform(packageURL, TEENSY_PROVIDER, TEENSY_PLATFORM_ID);
 	}
 
 	public static List<MCUBoard> getAllBoards() {

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ public static void installAdditionalBoards() throws Exception {`
`355`	`355`	`if (isMac) {`
`356`	`356`	`toAddList.removeAll(Arrays.asList(packageUrlsToIgnoreOnMac));`
`357`	`357`	`}`
`358`		`- BoardsManager.setPackageURLs(toAddList, true);`
	`358`	`+ BoardsManager.addPackageURLs(toAddList);`
`359`	`359`
`360`	`360`	`if (!skipPlatformInstallation) {`
`361`	`361`	`BoardsManager.installAllLatestPlatforms();`
Original file line number	Diff line number	Diff line change
`@@ -132,6 +132,8 @@ public static void waitForIndexer(IProject iProject) throws Exception {`
`132`	`132`	`if(count%10==0) {`
`133`	`133`	`System.out.println("Waiting for indexer");`
`134`	`134`	`}`
	`135`	`+ icProject = CoreModel.getDefault().create(iProject);`
	`136`	`+ index = CCorePlugin.getIndexManager().getIndex(icProject);`
`135`	`137`	`}`
`136`	`138`	`}`
`137`	`139`
`@@ -248,15 +250,15 @@ public static String buildAndVerifyGivenBuilders(String projectName, BoardDescri`
`248`	`250`	`}`
`249`	`251`	`// clean so we will get a full build for this buider`
`250`	`252`	`theTestProject.build(IncrementalProjectBuilder.CLEAN_BUILD, monitor);`
`251`		`-`
	`253`	`+`
`252`	`254`	`// set the builder`
`253`	`255`	`CoreModel coreModel = CoreModel.getDefault();`
`254`	`256`	`ICProjectDescription projectDescription = coreModel.getProjectDescription(theTestProject, true);`
`255`	`257`	`IAutoBuildConfigurationDescription autoDesc = IAutoBuildConfigurationDescription`
`256`	`258`	`.getActiveConfig(projectDescription);`
`257`	`259`	`autoDesc.setBuilder(curBuilder);`
`258`	`260`	`coreModel.setProjectDescription(theTestProject, projectDescription);`
`259`		`-`
	`261`	`+`
`260`	`262`	`theTestProject.build(IncrementalProjectBuilder.FULL_BUILD, monitor);`
`261`	`263`
`262`	`264`	`if (hasBuildErrors(theTestProject)!=null) {`