Share the counter with all the test so it continues

Author: jan

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

@@ -47,7 +47,6 @@
 @RunWith(Parameterized.class)
 public class CompileAndUpload {
 	private static final boolean reinstall_boards_and_libraries = false;
-	private static int mCounter = 0;
 	private MCUBoard myBoard;
 	private String myName;
 	private static String interval = "1500";// change between 1500 and 100
@@ -161,7 +160,7 @@ public void Build_Verify_upload(CodeDescription codeDescriptor,
 
 		IProject theTestProject = null;
 		NullProgressMonitor monitor = new NullProgressMonitor();
-		String projectName = String.format("%05d_%s",  Integer.valueOf(mCounter++),
+		String projectName = String.format("%05d_%s",  Integer.valueOf(Shared.buildCounter++),
 				this.myName);
 		try {
             theTestProject = SloeberProject.createArduinoProject(projectName, null,

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

@@ -38,7 +38,6 @@ public class CreateAndCompileArduinoIDEExamplesOnAVRHardwareTest {
     private CodeDescription myCodeDescriptor;
     private MCUBoard myBoard;
     private String myProjectName;
-    private static int myBuildCounter = 0;
     private static int myTotalFails = 0;
     private static int maxFails = 50;
     private static int mySkipAtStart = 0;
@@ -93,7 +92,7 @@ private static boolean skipExample(Example example) {
     @Test
     public void testExample() {
 
-        Assume.assumeTrue("Skipping first " + mySkipAtStart + " tests", myBuildCounter++ >= mySkipAtStart);
+        Assume.assumeTrue("Skipping first " + mySkipAtStart + " tests", Shared.buildCounter++ >= mySkipAtStart);
         Assume.assumeTrue("To many fails. Stopping test", myTotalFails < maxFails);
 
         if (!Shared.BuildAndVerify(myProjectName, myBoard.getBoardDescriptor(), myCodeDescriptor,

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

@@ -32,7 +32,7 @@ public class CreateAndCompileDefaultInoOnAllBoardsTest {
     private static final boolean skipPlatformInstallation = false;
     private static final boolean apply_known_work_Arounds = true;
     private static final boolean closeFailedProjects = false;
-    private static int myBuildCounter = 0;
+
     private static int myTotalFails = 0;
     private static int maxFails = 50;
     private static int mySkipTestsAtStart = 0;
@@ -346,13 +346,13 @@ public static void installAdditionalBoards() {
 
     @Test
     public void testBoard() throws Exception {
-        myBuildCounter++;
-        Assume.assumeTrue("Skipping first " + mySkipTestsAtStart + " tests", myBuildCounter >= mySkipTestsAtStart);
+        Shared.buildCounter++;
+        Assume.assumeTrue("Skipping first " + mySkipTestsAtStart + " tests", Shared.buildCounter >= mySkipTestsAtStart);
         Assume.assumeTrue("To many fails. Stopping test", myTotalFails < maxFails);
 
         IPath templateFolder = Shared.getTemplateFolder("CreateAndCompileTest");
         if (!Shared.BuildAndVerify(this.mBoard, CodeDescription.createCustomTemplate(templateFolder), null,
-                myBuildCounter)) {
+        		Shared.buildCounter)) {
             myTotalFails++;
             fail(Shared.getLastFailMessage());
         }

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

@@ -35,7 +35,6 @@ public class CreateAndCompileExamplesTest {
 	private static final boolean reinstall_boards_and_examples = false;
 	private CodeDescription myCodeDescriptor;
 	private BoardDescription myBoardDescriptor;
-    private static int myBuildCounter = 0;
     private static int myTotalFails = 0;
     private static int maxFails = 200;
     private static int mySkipAtStart = 0;
@@ -124,10 +123,10 @@ public void testExamples() {
         // 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("Skipping first " + mySkipAtStart + " tests", Shared.buildCounter++ >= mySkipAtStart);
         Assume.assumeTrue("To many fails. Stopping test", myTotalFails < maxFails);
 
-        myBuildCounter++;
+        Shared.buildCounter++;
         if (!Shared.BuildAndVerify(myName, myBoardDescriptor, myCodeDescriptor, new CompileDescription())) {
             myTotalFails++;
             fail(Shared.getLastFailMessage() );

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

@@ -36,7 +36,6 @@ public class CreateAndCompileLibraryExamplesTest {
     private static final int maxFails = 100;
     private static final int mySkipAtStart = 0;
 
-    private static int myBuildCounter = 0;
     private static int myTotalFails = 0;
     private Example myExample;
     private MCUBoard myBoard;
@@ -113,7 +112,7 @@ public static void installAdditionalBoards() {
     @Test
     public void testExamples() {
 
-        Assume.assumeTrue("Skipping first " + mySkipAtStart + " tests", myBuildCounter++ >= mySkipAtStart);
+        Assume.assumeTrue("Skipping first " + mySkipAtStart + " tests", Shared.buildCounter++ >= mySkipAtStart);
         Assume.assumeTrue("To many fails. Stopping test", myTotalFails < maxFails);
         if (!myBoard.isExampleSupported(myExample)) {
             fail("Trying to run a test on unsoprted board");

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

@@ -27,7 +27,6 @@
 @RunWith(Parameterized.class)
 public class NightlyBoardPatronTest {
 
-    private static int myBuildCounter = 0;
     private Example myExample;
     private MCUBoard myBoardID;
     private static int mySkipAtStart = 0;
@@ -80,8 +79,8 @@ public static Collection examples() {
 
     @Test
     public void testExamples() {
-    	myBuildCounter++ ;
-        Assume.assumeTrue("Skipping first " + mySkipAtStart + " tests", myBuildCounter >= mySkipAtStart);
+    	Shared.buildCounter++ ;
+        Assume.assumeTrue("Skipping first " + mySkipAtStart + " tests", Shared.buildCounter >= mySkipAtStart);
         Assume.assumeTrue("To many fails. Stopping test", myTotalFails < maxFails);
 
         ArrayList<IPath> paths = new ArrayList<>();
@@ -92,7 +91,7 @@ public void testExamples() {
         Map<String, String> boardOptions = myBoardID.getBoardOptions(myExample);
         BoardDescription boardDescriptor = myBoardID.getBoardDescriptor();
         boardDescriptor.setOptions(boardOptions);
-        if(!Shared.BuildAndVerify(myBoardID.getBoardDescriptor(), codeDescriptor, myCompileOptions,myBuildCounter)) {
+        if(!Shared.BuildAndVerify(myBoardID.getBoardDescriptor(), codeDescriptor, myCompileOptions,Shared.buildCounter)) {
             myTotalFails++;
             fail(Shared.getLastFailMessage() );
         }

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

@@ -10,8 +10,6 @@
 import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -46,6 +44,7 @@
 
 @SuppressWarnings("nls")
 public class Shared {
+    public static int buildCounter = 0;
     private static boolean deleteProjects = true;
 
     public static void setDeleteProjects(boolean deleteProjects) {