Skip to content

Commit 0b30f30

Browse files
author
jan
committed
make testing more junit5 compatible
Things didn't work due to a junit4 and junit5 mix. Now that is fixed some cleanup actions can be done Probably more to come
1 parent 510beea commit 0b30f30

6 files changed

+64
-195
lines changed

‎io.sloeber.autoBuild.test/launch/AutoBuildRegression.launch

Lines changed: 0 additions & 139 deletions
Original file line numberDiff line numberDiff line change
@@ -20,134 +20,6 @@
2020
<setEntry value="io.sloeber.tests"/>
2121
<setEntry value="io.sloeber.ui"/>
2222
<setEntry value="io.sloeber.ui.nl1"/>
23-
<setEntry value="org.eclipse.cdt"/>
24-
<setEntry value="org.eclipse.cdt.autotools.core"/>
25-
<setEntry value="org.eclipse.cdt.autotools.docs"/>
26-
<setEntry value="org.eclipse.cdt.autotools.tests"/>
27-
<setEntry value="org.eclipse.cdt.autotools.ui"/>
28-
<setEntry value="org.eclipse.cdt.autotools.ui.tests"/>
29-
<setEntry value="org.eclipse.cdt.build.crossgcc"/>
30-
<setEntry value="org.eclipse.cdt.build.gcc.core.tests"/>
31-
<setEntry value="org.eclipse.cdt.build.gcc.ui"/>
32-
<setEntry value="org.eclipse.cdt.codan.checkers"/>
33-
<setEntry value="org.eclipse.cdt.codan.checkers.ui"/>
34-
<setEntry value="org.eclipse.cdt.codan.core"/>
35-
<setEntry value="org.eclipse.cdt.codan.core.cxx"/>
36-
<setEntry value="org.eclipse.cdt.codan.core.tests"/>
37-
<setEntry value="org.eclipse.cdt.codan.examples"/>
38-
<setEntry value="org.eclipse.cdt.codan.ui"/>
39-
<setEntry value="org.eclipse.cdt.codan.ui.cxx"/>
40-
<setEntry value="org.eclipse.cdt.codan.ui.example.cfgview"/>
41-
<setEntry value="org.eclipse.cdt.core.autotools.core"/>
42-
<setEntry value="org.eclipse.cdt.core.autotools.ui"/>
43-
<setEntry value="org.eclipse.cdt.core.tests"/>
44-
<setEntry value="org.eclipse.cdt.debug.application"/>
45-
<setEntry value="org.eclipse.cdt.debug.application.doc"/>
46-
<setEntry value="org.eclipse.cdt.debug.application.tests"/>
47-
<setEntry value="org.eclipse.cdt.debug.core"/>
48-
<setEntry value="org.eclipse.cdt.debug.core.memory"/>
49-
<setEntry value="org.eclipse.cdt.debug.core.memory.tests"/>
50-
<setEntry value="org.eclipse.cdt.debug.gdbjtag"/>
51-
<setEntry value="org.eclipse.cdt.debug.gdbjtag.core"/>
52-
<setEntry value="org.eclipse.cdt.debug.gdbjtag.core.tests"/>
53-
<setEntry value="org.eclipse.cdt.debug.gdbjtag.ui"/>
54-
<setEntry value="org.eclipse.cdt.debug.ui"/>
55-
<setEntry value="org.eclipse.cdt.debug.ui.memory.floatingpoint"/>
56-
<setEntry value="org.eclipse.cdt.debug.ui.memory.memorybrowser"/>
57-
<setEntry value="org.eclipse.cdt.debug.ui.memory.search"/>
58-
<setEntry value="org.eclipse.cdt.debug.ui.memory.traditional"/>
59-
<setEntry value="org.eclipse.cdt.debug.ui.memory.transport"/>
60-
<setEntry value="org.eclipse.cdt.dsf"/>
61-
<setEntry value="org.eclipse.cdt.dsf.gdb"/>
62-
<setEntry value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui"/>
63-
<setEntry value="org.eclipse.cdt.dsf.gdb.multicorevisualizer.ui.tests"/>
64-
<setEntry value="org.eclipse.cdt.dsf.gdb.tests"/>
65-
<setEntry value="org.eclipse.cdt.dsf.gdb.ui"/>
66-
<setEntry value="org.eclipse.cdt.dsf.ui"/>
67-
<setEntry value="org.eclipse.cdt.examples.dsf"/>
68-
<setEntry value="org.eclipse.cdt.examples.dsf.gdb"/>
69-
<setEntry value="org.eclipse.cdt.examples.dsf.pda"/>
70-
<setEntry value="org.eclipse.cdt.examples.dsf.pda.ui"/>
71-
<setEntry value="org.eclipse.cdt.flatpak.launcher"/>
72-
<setEntry value="org.eclipse.cdt.gdb"/>
73-
<setEntry value="org.eclipse.cdt.gdb.ui"/>
74-
<setEntry value="org.eclipse.cdt.launch"/>
75-
<setEntry value="org.eclipse.cdt.launch.remote"/>
76-
<setEntry value="org.eclipse.cdt.launch.serial.core"/>
77-
<setEntry value="org.eclipse.cdt.launch.serial.ui"/>
78-
<setEntry value="org.eclipse.cdt.llvm.dsf.lldb.core"/>
79-
<setEntry value="org.eclipse.cdt.llvm.dsf.lldb.ui"/>
80-
<setEntry value="org.eclipse.cdt.make.core.tests"/>
81-
<setEntry value="org.eclipse.cdt.make.ui"/>
82-
<setEntry value="org.eclipse.cdt.make.ui.tests"/>
83-
<setEntry value="org.eclipse.cdt.managedbuilder.core.tests"/>
84-
<setEntry value="org.eclipse.cdt.managedbuilder.gnu.ui"/>
85-
<setEntry value="org.eclipse.cdt.managedbuilder.headlessbuilderapp"/>
86-
<setEntry value="org.eclipse.cdt.managedbuilder.llvm.tests"/>
87-
<setEntry value="org.eclipse.cdt.managedbuilder.llvm.ui"/>
88-
<setEntry value="org.eclipse.cdt.managedbuilder.ui"/>
89-
<setEntry value="org.eclipse.cdt.managedbuilder.ui.tests"/>
90-
<setEntry value="org.eclipse.cdt.meson.core"/>
91-
<setEntry value="org.eclipse.cdt.meson.docs"/>
92-
<setEntry value="org.eclipse.cdt.meson.ui.editor"/>
93-
<setEntry value="org.eclipse.cdt.msw.build"/>
94-
<setEntry value="org.eclipse.cdt.msw.build.tests"/>
95-
<setEntry value="org.eclipse.cdt.native.serial"/>
96-
<setEntry value="org.eclipse.cdt.platform.branding"/>
97-
<setEntry value="org.eclipse.cdt.remote.core"/>
98-
<setEntry value="org.eclipse.cdt.sdk"/>
99-
<setEntry value="org.eclipse.cdt.testing"/>
100-
<setEntry value="org.eclipse.cdt.tests.dsf"/>
101-
<setEntry value="org.eclipse.cdt.tests.dsf.gdb"/>
102-
<setEntry value="org.eclipse.cdt.testsrunner"/>
103-
<setEntry value="org.eclipse.cdt.testsrunner.boost"/>
104-
<setEntry value="org.eclipse.cdt.testsrunner.gtest"/>
105-
<setEntry value="org.eclipse.cdt.testsrunner.qttest"/>
106-
<setEntry value="org.eclipse.cdt.testsrunner.tap"/>
107-
<setEntry value="org.eclipse.cdt.testsrunner.tests"/>
108-
<setEntry value="org.eclipse.cdt.ui.tests"/>
109-
<setEntry value="org.eclipse.cdt.unittest"/>
110-
<setEntry value="org.eclipse.cdt.util"/>
111-
<setEntry value="org.eclipse.cdt.visualizer.core"/>
112-
<setEntry value="org.eclipse.cdt.visualizer.examples"/>
113-
<setEntry value="org.eclipse.cdt.visualizer.ui"/>
114-
<setEntry value="org.eclipse.launchbar.core"/>
115-
<setEntry value="org.eclipse.launchbar.core.tests"/>
116-
<setEntry value="org.eclipse.launchbar.remote.core"/>
117-
<setEntry value="org.eclipse.launchbar.remote.ui"/>
118-
<setEntry value="org.eclipse.launchbar.ui"/>
119-
<setEntry value="org.eclipse.remote.console"/>
120-
<setEntry value="org.eclipse.remote.core"/>
121-
<setEntry value="org.eclipse.remote.core.tests"/>
122-
<setEntry value="org.eclipse.remote.doc.isv"/>
123-
<setEntry value="org.eclipse.remote.jsch.core"/>
124-
<setEntry value="org.eclipse.remote.jsch.tests"/>
125-
<setEntry value="org.eclipse.remote.jsch.ui"/>
126-
<setEntry value="org.eclipse.remote.proxy.core"/>
127-
<setEntry value="org.eclipse.remote.proxy.protocol.core"/>
128-
<setEntry value="org.eclipse.remote.proxy.server.core"/>
129-
<setEntry value="org.eclipse.remote.proxy.server.linux.ppc64le"/>
130-
<setEntry value="org.eclipse.remote.proxy.server.linux.x86_64"/>
131-
<setEntry value="org.eclipse.remote.proxy.server.macosx.x86_64"/>
132-
<setEntry value="org.eclipse.remote.proxy.tests"/>
133-
<setEntry value="org.eclipse.remote.proxy.ui"/>
134-
<setEntry value="org.eclipse.remote.serial.core"/>
135-
<setEntry value="org.eclipse.remote.serial.ui"/>
136-
<setEntry value="org.eclipse.remote.telnet.core"/>
137-
<setEntry value="org.eclipse.remote.telnet.core.tests"/>
138-
<setEntry value="org.eclipse.remote.telnet.ui"/>
139-
<setEntry value="org.eclipse.remote.ui"/>
140-
<setEntry value="org.eclipse.remote.ui.tests"/>
141-
<setEntry value="org.eclipse.tm.terminal.connector.cdtserial"/>
142-
<setEntry value="org.eclipse.tm.terminal.connector.local"/>
143-
<setEntry value="org.eclipse.tm.terminal.connector.process"/>
144-
<setEntry value="org.eclipse.tm.terminal.connector.remote"/>
145-
<setEntry value="org.eclipse.tm.terminal.connector.ssh"/>
146-
<setEntry value="org.eclipse.tm.terminal.connector.telnet"/>
147-
<setEntry value="org.eclipse.tm.terminal.control"/>
148-
<setEntry value="org.eclipse.tm.terminal.test"/>
149-
<setEntry value="org.eclipse.tm.terminal.view.core"/>
150-
<setEntry value="org.eclipse.tm.terminal.view.ui"/>
15123
</setAttribute>
15224
<booleanAttribute key="includeOptional" value="true"/>
15325
<stringAttribute key="location" value="R:\regression"/>
@@ -404,17 +276,6 @@
404276
<setEntry value="io.sloeber.autoBuild.test@default:default"/>
405277
<setEntry value="io.sloeber.autoBuild.ui@default:default"/>
406278
<setEntry value="io.sloeber.autoBuild@default:default"/>
407-
<setEntry value="org.eclipse.cdt.build.gcc.core@default:default"/>
408-
<setEntry value="org.eclipse.cdt.core.native@default:default"/>
409-
<setEntry value="org.eclipse.cdt.core.win32.x86_64@default:false"/>
410-
<setEntry value="org.eclipse.cdt.core.win32@default:false"/>
411-
<setEntry value="org.eclipse.cdt.core@default:default"/>
412-
<setEntry value="org.eclipse.cdt.make.core@default:default"/>
413-
<setEntry value="org.eclipse.cdt.managedbuilder.core@default:default"/>
414-
<setEntry value="org.eclipse.cdt.ui@default:default"/>
415-
<setEntry value="org.eclipse.tools.templates.core@default:default"/>
416-
<setEntry value="org.eclipse.tools.templates.freemarker@default:default"/>
417-
<setEntry value="org.eclipse.tools.templates.ui@default:default"/>
418279
</setAttribute>
419280
<booleanAttribute key="show_selected_only" value="false"/>
420281
<booleanAttribute key="tracing" value="false"/>

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

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@ public class CompileAndUpload {
5757
private static String interval = "1500";// change between 1500 and 100
5858

5959
static Stream<Arguments> uploadBourds() throws Exception {
60-
WaitForInstallerToFinish();
60+
installAdditionalBoards();
61+
62+
Shared.waitForAllJobsToFinish();
6163

6264
File file = ConfigurationPreferences.getInstallationPath().append("test.properties").toFile();
6365
if (!file.exists()) {
@@ -94,18 +96,6 @@ static Stream<Arguments> uploadBourds() throws Exception {
9496

9597
}
9698

97-
/*
98-
* In new new installations (of the Sloeber development environment) the
99-
* installer job will trigger downloads These mmust have finished before we can
100-
* start testing
101-
*/
102-
103-
public static void WaitForInstallerToFinish() {
104-
105-
installAdditionalBoards();
106-
107-
Shared.waitForAllJobsToFinish();
108-
}
10999

110100
public static void installAdditionalBoards() {
111101
Preferences.setUseBonjour(false);
@@ -152,12 +142,12 @@ public void Build_Verify_upload(MCUBoard myBoard, CodeDescription codeDescriptor
152142
String projectName = String.format("%05d_%s", Integer.valueOf(Shared.buildCounter++), myName);
153143
theTestProject = SloeberProject.createArduinoProject(projectName, null, myBoard.getBoardDescriptor(),
154144
codeDescriptor, compileOptions, monitor);
155-
Shared.waitForAllJobsToFinish(); // for the indexer
145+
Shared.waitForIndexer(theTestProject);
156146

157147
theTestProject.build(IncrementalProjectBuilder.FULL_BUILD, monitor);
158148
if (Shared.hasBuildErrors(theTestProject) != null) {
159149
// try again because the libraries may not yet been added
160-
Shared.waitForAllJobsToFinish(); // for the indexer
150+
Shared.waitForIndexer(theTestProject);
161151
Thread.sleep(3000);// seen sometimes the libs were still not
162152
// added
163153
theTestProject.build(IncrementalProjectBuilder.FULL_BUILD, monitor);

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

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.stream.Stream;
2626

2727
import org.eclipse.core.runtime.IPath;
28+
import org.junit.jupiter.api.BeforeAll;
2829
import org.junit.jupiter.params.ParameterizedTest;
2930
import org.junit.jupiter.params.provider.Arguments;
3031
import org.junit.jupiter.params.provider.MethodSource;
@@ -45,16 +46,25 @@ public class CreateAndCompileArduinoIDEExamplesOnTeensyTest {
4546
private static int maxFails = 50;
4647
private static int mySkipAtStart = 0;
4748

49+
@BeforeAll
50+
public static void setup() throws Exception {
51+
Shared.waitForBoardsManager();
52+
Teensy.installLatest();
4853

49-
public static Stream<Arguments> teensyHardwareData() throws Exception {
50-
installAdditionalBoards();
54+
Shared.setUseParralBuildProjects(Boolean.TRUE);
5155

56+
//Shared.setDefaultBuilder(AutoBuildProject.MAKE_BUILDER_ID);
5257
Shared.waitForAllJobsToFinish();
5358
Preferences.setUseBonjour(false);
59+
}
60+
61+
62+
public static Stream<Arguments> teensyHardwareData() throws Exception {
63+
5464
List<Arguments> ret = new LinkedList<>();
5565
List<MCUBoard> allBoards = Teensy.getAllBoards();
5666

57-
TreeMap<String, IExample> exampleFolders = LibraryManager.getExamplesLibrary(null);
67+
TreeMap<String, IExample> exampleFolders = LibraryManager.getExamplesFromIDE();
5868
for (Map.Entry<String, IExample> curexample : exampleFolders.entrySet()) {
5969
String fqn = curexample.getKey().trim();
6070
IPath examplePath = curexample.getValue().getCodeLocation();
@@ -84,9 +94,6 @@ private static boolean skipExample(Example example) {
8494
return false;
8595
}
8696

87-
public static void installAdditionalBoards() {
88-
Teensy.installLatest();
89-
}
9097

9198
@ParameterizedTest
9299
@MethodSource("teensyHardwareData")

‎io.sloeber.tests/src/io/sloeber/core/CreateAndCompileArduinoIDEExamplesonJantjesBoardsTest.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,11 @@
1313
import java.util.stream.Stream;
1414

1515
import org.eclipse.core.runtime.IPath;
16+
import org.junit.jupiter.api.BeforeAll;
1617
import org.junit.jupiter.params.ParameterizedTest;
1718
import org.junit.jupiter.params.provider.Arguments;
1819
import org.junit.jupiter.params.provider.MethodSource;
20+
1921
import io.sloeber.core.api.BoardDescription;
2022
import io.sloeber.core.api.BoardsManager;
2123
import io.sloeber.core.api.CodeDescription;
@@ -31,19 +33,25 @@ public class CreateAndCompileArduinoIDEExamplesonJantjesBoardsTest {
3133
private static int myTotalFails = 0;
3234
private static int maxFails = 200;
3335
private static int mySkipAtStart = 0;
34-
35-
36-
public static Stream<Arguments> jantjesHardwareData() throws Exception {
36+
@BeforeAll
37+
public static void setup() throws Exception {
3738
Preferences.setUseBonjour(false);
39+
Shared.waitForAllJobsToFinish();
3840
String[] packageUrlsToAdd = { Jantje.additionalJsonURL };
3941
BoardsManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)), true);
4042
Jantje.installLatestLocalDebugBoards();
4143
Shared.waitForAllJobsToFinish();
4244

45+
Shared.setUseParralBuildProjects(Boolean.TRUE);
46+
//Shared.setDefaultBuilder(AutoBuildProject.MAKE_BUILDER_ID);
47+
}
48+
49+
50+
public static Stream<Arguments> jantjesHardwareData() throws Exception {
4351
List<MCUBoard> allBoards = Jantje.getAllBoards();
4452
List<Arguments> ret = new LinkedList<>();
4553

46-
Map<String, IExample> exampleFolders = LibraryManager.getExamplesLibrary(null);
54+
Map<String, IExample> exampleFolders = LibraryManager.getExamplesFromIDE();
4755
for (Map.Entry<String, IExample> curexample : exampleFolders.entrySet()) {
4856
String fqn = curexample.getKey().trim();
4957
IPath examplePath = curexample.getValue().getCodeLocation();

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

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ public class CreateAndCompileExamplesTest {
3636

3737

3838
public static Stream<Arguments> examples() throws Exception {
39-
WaitForInstallerToFinish();
39+
installAdditionalBoards();
40+
Shared.waitForAllJobsToFinish();
4041
Preferences.setUseBonjour(false);
4142

4243
MCUBoard myBoards[] = { Arduino.leonardo(),
@@ -76,18 +77,6 @@ public static Stream<Arguments> examples() throws Exception {
7677

7778
}
7879

79-
/*
80-
* In new new installations (of the Sloeber development environment) the
81-
* installer job will trigger downloads These mmust have finished before we
82-
* can start testing
83-
*/
84-
85-
public static void WaitForInstallerToFinish() {
86-
87-
installAdditionalBoards();
88-
89-
Shared.waitForAllJobsToFinish();
90-
}
9180

9281
public static void installAdditionalBoards() {
9382
String[] packageUrlsToAdd = { ESP8266.packageURL, Adafruit.packageURL };

0 commit comments

Comments
 (0)