Make the test counter part of basic builder

This way the counter continues when running multiple tests

Author: jantje

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

@@ -82,7 +82,7 @@ public void testExample(MCUBoard board) {
         if (!board.isExampleSupported(myExample)) {
             return;
         }
-        if (!Shared.BuildAndVerify(myBuildCounter, board.getBoardDescriptor(), myCodeDescriptor, null)) {
+        if (!Shared.BuildAndVerify( board.getBoardDescriptor(), myCodeDescriptor, null)) {
             myTotalFails++;
         }
     }

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

@@ -88,7 +88,7 @@ public void testExample(MCUBoard board) {
         Map<String,String> boardOptions=board.getBoardOptions(myExample);
         BoardDescriptor boardDescriptor=board.getBoardDescriptor();
         boardDescriptor.setOptions(boardOptions);
-        if (!Shared.BuildAndVerify(myBuildCounter, boardDescriptor, myCodeDescriptor, null)) {
+        if (!Shared.BuildAndVerify( boardDescriptor, myCodeDescriptor, null)) {
             myTotalFails++;
         }
 	}

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

@@ -293,7 +293,7 @@ public void testBoard() {
         Assume.assumeTrue("To many fails. Stopping test", myTotalFails < maxFails);
 
         IPath templateFolder = Shared.getTemplateFolder("CreateAndCompileTest");
-        Shared.BuildAndVerify(myBuildCounter, this.mBoard, CodeDescriptor.createCustomTemplate(templateFolder), null);
+        Shared.BuildAndVerify( this.mBoard, CodeDescriptor.createCustomTemplate(templateFolder), null);
 
     }
 

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

@@ -133,8 +133,9 @@ public void testExamples() {
         // failures
         Assume.assumeTrue("Skipping first " + mySkipAtStart + " tests", myBuildCounter++ >= mySkipAtStart);
         Assume.assumeTrue("To many fails. Stopping test", myTotalFails < maxFails);
-       // String projectName = String.format("%05d_%s", new Integer(myBuildCounter++), this.myName);
-        if (!Shared.BuildAndVerify( myBuildCounter++,myBoardDescriptor, myCodeDescriptor)) {
+       
+        myBuildCounter++;
+        if (!Shared.BuildAndVerify( myBoardDescriptor, myCodeDescriptor)) {
             myTotalFails++;
         }
 

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

@@ -107,7 +107,7 @@ public void testExample(MCUBoard board) {
         if (!board.isExampleSupported(myExample)) {
             return;
         }
-        if (!Shared.BuildAndVerify(myBuildCounter, board.getBoardDescriptor(), myCodeDescriptor, null)) {
+        if (!Shared.BuildAndVerify( board.getBoardDescriptor(), myCodeDescriptor, null)) {
             myTotalFails++;
         }
 	}

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

@@ -86,7 +86,7 @@ public void testExamples() {
         Map<String, String> boardOptions = myBoardID.getBoardOptions(myExample);
         BoardDescriptor boardDescriptor = myBoardID.getBoardDescriptor();
         boardDescriptor.setOptions(boardOptions);
-        Shared.BuildAndVerify(myBuildCounter,myBoardID.getBoardDescriptor(), codeDescriptor, myCompileOptions);
+        Shared.BuildAndVerify(myBoardID.getBoardDescriptor(), codeDescriptor, myCompileOptions);
 
     }
 

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

@@ -42,6 +42,7 @@ public class Shared {
 	public final static String	ADAFRUIT_BOARDS_URL	= "https://adafruit.github.io/arduino-board-index/package_adafruit_index.json";
 	public final static String	ESP8266_BOARDS_URL	= "http://arduino.esp8266.com/stable/package_esp8266com_index.json";
 	public static boolean deleteProjects=true;
+	private static int myBuildCounter;
 
 
 	public static boolean hasBuildErrors(IProject project) throws CoreException {
@@ -86,8 +87,8 @@ public static IPath getTemplateFolder(String templateName) {
 		return new Path(new String());
 	}
 
-	public static boolean BuildAndVerify( int buildCounter, BoardDescriptor boardDescriptor, CodeDescriptor codeDescriptor) {
-	    return BuildAndVerify(  buildCounter,  boardDescriptor,  codeDescriptor, null) ;
+	public static boolean BuildAndVerify(  BoardDescriptor boardDescriptor, CodeDescriptor codeDescriptor) {
+	    return BuildAndVerify(    boardDescriptor,  codeDescriptor, null) ;
 	}
 	/**
 	 * Convenience method to call BuildAndVerify with default project name and null as compile options
@@ -96,10 +97,11 @@ public static boolean BuildAndVerify( int buildCounter, BoardDescriptor boardDes
 	 * @param compileOptions can be null
 	 * @return
 	 */
-	public static boolean BuildAndVerify( int buildCounter, BoardDescriptor boardDescriptor, CodeDescriptor codeDescriptor,CompileOptions compileOptions) {
-	    String projectName = String.format("%03d_", new Integer(buildCounter)) + boardDescriptor.getBoardID();
+	public static boolean BuildAndVerify(  BoardDescriptor boardDescriptor, CodeDescriptor codeDescriptor,CompileOptions compileOptions) {
+		myBuildCounter++;
+	    String projectName = String.format("%05d_%s",new Integer( myBuildCounter), boardDescriptor.getBoardID());
 	    if(codeDescriptor.getExampleName()!=null) {
-	        projectName= String.format("%05d_%s_%s", new Integer(buildCounter),codeDescriptor.getExampleName(), boardDescriptor.getBoardID());
+	        projectName= String.format("%05d_%s_%s",new Integer( myBuildCounter),codeDescriptor.getExampleName(), boardDescriptor.getBoardID());
 	   }
 	  CompileOptions localCompileOptions=compileOptions;
 	  if(compileOptions==null) {