renaming tests to surefire convention

Also moved the build code to shared

Author: jantje

io.sloeber.tests/src/io/sloeber/core/CompileAndUpload.java renamed to io.sloeber.tests/src/io/sloeber/core/CompileAndUploadTest.java

@@ -43,14 +43,14 @@
 
 @SuppressWarnings("nls")
 @RunWith(Parameterized.class)
-public class CompileAndUpload {
+public class CompileAndUploadTest {
 	private static final boolean reinstall_boards_and_libraries = false;
 	private static int mCounter = 0;
 	private IBoard myBoard;
 	private String myName;
 	private static String interval = "1500";// change between 1500 and 100
 
-	public CompileAndUpload(String name, IBoard board) {
+	public CompileAndUploadTest(String name, IBoard board) {
 		this.myBoard = board;
 		this.myName = name;
 

io.sloeber.tests/src/io/sloeber/core/CreateAndCompileArduinoIDEExamplesOnAVRHardware.java renamed to io.sloeber.tests/src/io/sloeber/core/CreateAndCompileArduinoIDEExamplesOnAVRHardwareTest.java

@@ -36,7 +36,7 @@
 
 @SuppressWarnings("nls")
 @RunWith(Parameterized.class)
-public class CreateAndCompileArduinoIDEExamplesOnAVRHardware {
+public class CreateAndCompileArduinoIDEExamplesOnAVRHardwareTest {
 	private static int mCounter = 0;
 	private CodeDescriptor myCodeDescriptor;
 	private String myName;
@@ -45,7 +45,7 @@ public class CreateAndCompileArduinoIDEExamplesOnAVRHardware {
 	private boolean myUsesSerial;
 	private static int totalFails = 0;
 
-	public CreateAndCompileArduinoIDEExamplesOnAVRHardware(String name, CodeDescriptor codeDescriptor,
+	public CreateAndCompileArduinoIDEExamplesOnAVRHardwareTest(String name, CodeDescriptor codeDescriptor,
 			boolean usesSerial, boolean usesSerial1, boolean usesKeyboard) {
 
 		this.myCodeDescriptor = codeDescriptor;

io.sloeber.tests/src/io/sloeber/core/CreateAndCompileArduinoIDEExamplesOnTeensy.java renamed to io.sloeber.tests/src/io/sloeber/core/CreateAndCompileArduinoIDEExamplesOnTeensyTest.java

@@ -29,7 +29,7 @@
 
 @SuppressWarnings("nls")
 @RunWith(Parameterized.class)
-public class CreateAndCompileArduinoIDEExamplesOnTeensy {
+public class CreateAndCompileArduinoIDEExamplesOnTeensyTest {
 	private static int mCounter = 0;
 	private CodeDescriptor myCodeDescriptor;
 	private String myName;
@@ -38,7 +38,7 @@ public class CreateAndCompileArduinoIDEExamplesOnTeensy {
 	private boolean myUsesSerial;
 	private static int totalFails = 0;
 
-	public CreateAndCompileArduinoIDEExamplesOnTeensy(String name, CodeDescriptor codeDescriptor,
+	public CreateAndCompileArduinoIDEExamplesOnTeensyTest(String name, CodeDescriptor codeDescriptor,
 			boolean usesSerial, boolean usesSerial1, boolean usesKeyboard) {
 
 		this.myCodeDescriptor = codeDescriptor;

io.sloeber.tests/src/io/sloeber/core/CreateAndCompileExamples.java renamed to io.sloeber.tests/src/io/sloeber/core/CreateAndCompileExamplesTest.java

@@ -43,15 +43,15 @@
 
 @SuppressWarnings("nls")
 @RunWith(Parameterized.class)
-public class CreateAndCompileExamples {
+public class CreateAndCompileExamplesTest {
 	private static final boolean reinstall_boards_and_examples = false;
 	private static int mCounter = 0;
 	private CodeDescriptor myCodeDescriptor;
 	private BoardDescriptor myBoardid;
 	private static int totalFails = 0;
 	private String myName;
 
-	public CreateAndCompileExamples(String name, BoardDescriptor boardid, CodeDescriptor codeDescriptor) {
+	public CreateAndCompileExamplesTest(String name, BoardDescriptor boardid, CodeDescriptor codeDescriptor) {
 		this.myBoardid = boardid;
 		this.myCodeDescriptor = codeDescriptor;
 		this.myName = name;

io.sloeber.tests/src/io/sloeber/core/CreateAndCompile.java renamed to io.sloeber.tests/src/io/sloeber/core/CreateAndCompileTest.java

@@ -1,39 +1,30 @@
 package io.sloeber.core;
 
-import static org.junit.Assert.fail;
-
 import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
 
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IncrementalProjectBuilder;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
 import io.sloeber.core.api.BoardDescriptor;
 import io.sloeber.core.api.BoardsManager;
-import io.sloeber.core.api.CodeDescriptor;
-import io.sloeber.core.api.CompileOptions;
-import io.sloeber.core.api.ConfigurationDescriptor;
 import io.sloeber.core.api.Preferences;
 
 @SuppressWarnings("nls")
 @RunWith(Parameterized.class)
-public class CreateAndCompile {
+public class CreateAndCompileTest {
 	// use the boolean below to avoid downloading and installation
 	private static final boolean reinstall_boards_and_libraries = true;
 	private BoardDescriptor mBoard;
-	private static int mCounter = 0;
 
-	public CreateAndCompile(BoardDescriptor board) {
+
+	public CreateAndCompileTest(BoardDescriptor board) {
 		this.mBoard = board;
 	}
 
@@ -152,40 +143,10 @@ public static void installAdditionalBoards() {
 
 	@Test
 	public void testBoard() {
-		BuildAndVerify(this.mBoard);
+		Shared.BuildAndVerify(this.mBoard);
 
 	}
 
-	public static void BuildAndVerify(BoardDescriptor boardid) {
 
-		IProject theTestProject = null;
-		CodeDescriptor codeDescriptor = CodeDescriptor.createDefaultIno();
-		NullProgressMonitor monitor = new NullProgressMonitor();
-		String projectName = String.format("%03d_", new Integer(mCounter++)) + boardid.getBoardID();
-		try {
-
-			theTestProject = boardid.createProject(projectName, null, ConfigurationDescriptor.getDefaultDescriptors(),
-					codeDescriptor, new CompileOptions(null), monitor);
-			Shared.waitForAllJobsToFinish(); // for the indexer
-		} catch (Exception e) {
-			e.printStackTrace();
-			fail("Failed to create the project:" + projectName);
-			return;
-		}
-		try {
-			theTestProject.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
-			if (Shared.hasBuildErrors(theTestProject)) {
-				fail("Failed to compile the project:" + projectName + " build errors");
-			}
-		} catch (CoreException e) {
-			e.printStackTrace();
-			fail("Failed to compile the project:" + boardid.getBoardName() + " exception");
-		}
-		try {
-			theTestProject.delete(false, true, null);
-		} catch (CoreException e) {
-			e.printStackTrace();
-		}
-	}
 
 }

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

@@ -65,7 +65,7 @@ public void redirectedJson() {
 			fail("redirect Json ");
 			return;
 		}
-		CreateAndCompile.BuildAndVerify(boardid);
+		Shared.BuildAndVerify(boardid);
 	}
 
 	/**

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

@@ -10,16 +10,22 @@
 import org.eclipse.core.resources.IMarker;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
+import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.jobs.IJobManager;
 import org.eclipse.core.runtime.jobs.Job;
 import org.osgi.framework.Bundle;
 
+import io.sloeber.core.api.BoardDescriptor;
 import io.sloeber.core.api.BoardsManager;
+import io.sloeber.core.api.CodeDescriptor;
+import io.sloeber.core.api.CompileOptions;
+import io.sloeber.core.api.ConfigurationDescriptor;
 import io.sloeber.core.api.Other;
 
 @SuppressWarnings("nls")
@@ -30,6 +36,7 @@ public class Shared {
 
 	private static String jantjesWindowsMachine = "D:\\arduino\\arduino-1.8.2Teensy1.38beta2\\hardware\\teensy";
 	private static String jantjesVirtualLinuxMachine = "/home/jantje/programs/arduino-1.8.0/hardware/teensy";
+	private static int mCounter = 0;
 
 	public static String getTeensyPlatform() {
 		switch (Other.getSystemHash()) {
@@ -93,4 +100,36 @@ public static IPath getTemplateFolder(String templateName) {
 		return new Path(new String());
 	}
 
+	public static void BuildAndVerify(BoardDescriptor boardid) {
+
+		IProject theTestProject = null;
+		CodeDescriptor codeDescriptor = CodeDescriptor.createDefaultIno();
+		NullProgressMonitor monitor = new NullProgressMonitor();
+		String projectName = String.format("%03d_", new Integer(mCounter++)) + boardid.getBoardID();
+		try {
+
+			theTestProject = boardid.createProject(projectName, null, ConfigurationDescriptor.getDefaultDescriptors(),
+					codeDescriptor, new CompileOptions(null), monitor);
+			Shared.waitForAllJobsToFinish(); // for the indexer
+		} catch (Exception e) {
+			e.printStackTrace();
+			fail("Failed to create the project:" + projectName);
+			return;
+		}
+		try {
+			theTestProject.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
+			if (Shared.hasBuildErrors(theTestProject)) {
+				fail("Failed to compile the project:" + projectName + " build errors");
+			}
+		} catch (CoreException e) {
+			e.printStackTrace();
+			fail("Failed to compile the project:" + boardid.getBoardName() + " exception");
+		}
+		try {
+			theTestProject.delete(false, true, null);
+		} catch (CoreException e) {
+			e.printStackTrace();
+		}
+	}
+
 }