prepare to ask teensy boards

Author: jantje

io.sloeber.tests/src/io/sloeber/core/CreateAndCompileArduinoIDEExamplesOnTeensyTest.java

@@ -15,6 +15,7 @@
 
 import io.sloeber.core.api.BoardDescriptor;
 import io.sloeber.core.api.CodeDescriptor;
+import io.sloeber.core.api.CompileOptions;
 import io.sloeber.core.api.LibraryManager;
 import io.sloeber.core.api.PackageManager;
 import io.sloeber.providers.MCUBoard;
@@ -24,26 +25,30 @@
 @RunWith(Parameterized.class)
 public class CreateAndCompileArduinoIDEExamplesOnTeensyTest {
 	private CodeDescriptor myCodeDescriptor;
-	private Examples myExample;
+
+	private String myTestName;
+	private BoardDescriptor myBoardDescriptor;
     private static int myBuildCounter = 0;
     private static int myTotalFails = 0;
     private static int maxFails = 50;
     private static int mySkipAtStart = 0;
 
-	public CreateAndCompileArduinoIDEExamplesOnTeensyTest(CodeDescriptor codeDescriptor, Examples example) {
+	public CreateAndCompileArduinoIDEExamplesOnTeensyTest(String testName,CodeDescriptor codeDescriptor,BoardDescriptor board) {
 
 		myCodeDescriptor = codeDescriptor;
-		myExample = example;
+		myTestName=testName;
+		myBoardDescriptor=board;
 	}
 
 	@SuppressWarnings("rawtypes")
-	@Parameters(name = "{index}: {0}")
+	@Parameters(name = "{0}")
 	public static Collection examples() {
 		installAdditionalBoards();
 
 		Shared.waitForAllJobsToFinish();
 		LinkedList<Object[]> examples = new LinkedList<>();
-
+		 MCUBoard[] allBoards=Teensy.getAllBoards();
+		 
 		TreeMap<String, IPath> exampleFolders = LibraryManager.getAllArduinoIDEExamples();
 		for (Map.Entry<String, IPath> curexample : exampleFolders.entrySet()) {
 			String fqn = curexample.getKey().trim();
@@ -54,8 +59,16 @@ public static Collection examples() {
 				paths.add(examplePath);
 				CodeDescriptor codeDescriptor = CodeDescriptor.createExample(false, paths);
 
-				Object[] theData = new Object[] {  codeDescriptor, example };
-				examples.add(theData);
+				for (MCUBoard curBoard : allBoards) {
+					if (curBoard.isExampleSupported(example)) {
+						String projectName = Shared.getProjectName(codeDescriptor, example, curBoard);
+						Map<String, String> boardOptions = curBoard.getBoardOptions(example);
+						BoardDescriptor boardDescriptor = curBoard.getBoardDescriptor();
+						boardDescriptor.setOptions(boardOptions);
+						Object[] theData = new Object[] { projectName, codeDescriptor, boardDescriptor };
+						examples.add(theData);
+					}
+				}
 			}
 		}
 
@@ -77,63 +90,24 @@ public static void installAdditionalBoards() {
 
 	}
 
-	public void testExample(MCUBoard board) {
+	public void testExample() {
 		// Stop after X fails because
 		// the fails stays open in eclipse and it becomes really slow
 		// There are only a number of issues you can handle
 		// best is to focus on the first ones and then rerun starting with the
 		// failures
         Assume.assumeTrue("Skipping first " + mySkipAtStart + " tests", myBuildCounter++ >= mySkipAtStart);
         Assume.assumeTrue("To many fails. Stopping test", myTotalFails < maxFails);
-        Map<String,String> boardOptions=board.getBoardOptions(myExample);
-        BoardDescriptor boardDescriptor=board.getBoardDescriptor();
-        boardDescriptor.setOptions(boardOptions);
-        if (!Shared.BuildAndVerify( boardDescriptor, myCodeDescriptor, null)) {
+        if (!Shared.BuildAndVerify(myTestName, myBoardDescriptor, myCodeDescriptor, new CompileOptions(null))) {
             myTotalFails++;
         }
 	}
 
 	@Test
-	public void testArduinoIDEExamplesOnTeensy3_6() {
-		if (!MySystem.getTeensyPlatform().isEmpty())
-			testExample(Teensy.Teensy3_6());
-	}
-
-	@Test
-	public void testArduinoIDEExamplesOnTeensy3_5() {
-		if (!MySystem.getTeensyPlatform().isEmpty())
-			testExample(Teensy.Teensy3_5());
-	}
-
-	@Test
-	public void testArduinoIDEExamplesOnTeensy3_1() {
-		if (!MySystem.getTeensyPlatform().isEmpty())
-			testExample(Teensy.Teensy3_1());
-	}
-
-	@Test
-	public void testArduinoIDEExamplesOnTeensy3_0() {
+	public void testArduinoIDEExamplesOnTeensy() {
 		if (!MySystem.getTeensyPlatform().isEmpty())
-			testExample(Teensy.Teensy3_0());
+			testExample();
 	}
 
-	@Test
-	public void testArduinoIDEExamplesOnTeensyLC() {
-		if (!MySystem.getTeensyPlatform().isEmpty())
-			testExample(Teensy.Teensy_LC());
-	}
-
-	@Test
-	public void testArduinoIDEExamplesOnTeensyPP2() {
-		if (!MySystem.getTeensyPlatform().isEmpty())
-			testExample(Teensy.teensypp2());
-	}
-
-	@Test
-	public void testArduinoIDEExamplesOnTeensy2() {
-		if (!MySystem.getTeensyPlatform().isEmpty())
-			testExample(Teensy.teensy2());
-
-	}
 
 }

io.sloeber.tests/src/io/sloeber/providers/Teensy.java

@@ -131,4 +131,17 @@ public Map<String, String> getBoardOptions(Examples example) {
 		}
 		return ret;
 	}
+	
+	public static MCUBoard[] getAllBoards() {
+		// hardcode this stuff now because I want to release 4.3.1
+		// shoulds be something like
+		// return
+		// PackageManager.getAllBoardDescriptors(getJsonFileName(),getPackageName(),getPlatformName()
+		// , options);
+		MCUBoard[] boards = { Teensy.Teensy3_6(), Teensy.Teensy3_5(), Teensy.Teensy3_1(), Teensy.Teensy3_0(),
+				Teensy.Teensy_LC(), Teensy.teensypp2(), Teensy.teensy2() };
+		return boards;
+
+
+    }
 }