@@ -61,7 +61,7 @@ public class RegressionTest {
61
61
* start testing
62
62
*/
63
63
@ BeforeClass
64
- public static void WaitForInstallerToFinish () {
64
+ public static void beforeClass () {
65
65
Shared .waitForAllJobsToFinish ();
66
66
Shared .setDeleteProjects (false );
67
67
Preferences .setUseBonjour (false );
@@ -652,6 +652,7 @@ public void uploadPattern() throws Exception {
652
652
}
653
653
654
654
public static Stream <Arguments > testDifferentSourceFoldersData () {
655
+ beforeClass ();//This is not always called
655
656
List <Arguments > ret = new LinkedList <>();
656
657
OtherDescription otherDesc = new OtherDescription ();
657
658
CompileDescription projCompileDesc = new CompileDescription ();
@@ -709,9 +710,10 @@ public void testDifferentSourceFolders(String projectName, CodeDescription codeD
709
710
/**
710
711
* Test wether a platform json redirect is handled properly
711
712
* https://github.com/jantje/arduino-eclipse-plugin/issues/393
713
+ * @throws Exception
712
714
*/
713
715
@ Test
714
- public void redirectedJson () {
716
+ public void redirectedJson () throws Exception {
715
717
//this board references to arduino avr so install that one to
716
718
Arduino .installLatestAVRBoards ();
717
719
BoardsManager .installLatestPlatform ("package_talk2.wisen.com_index.json" , "Talk2" , "avr" );
@@ -723,14 +725,15 @@ public void redirectedJson() {
723
725
fail ("redirect Json " );
724
726
return ;
725
727
}
726
- if (!Shared .BuildAndVerify ("redirect_json" , boardid , CodeDescription .createDefaultIno (),
728
+ if (!Shared .buildAndVerify ("redirect_json" , boardid , CodeDescription .createDefaultIno (),
727
729
new CompileDescription ())) {
728
730
fail (Shared .getLastFailMessage () );
729
731
}
730
732
}
731
733
732
734
733
735
static Stream <Arguments > openAndClosePreservesSettingsValueCmd () {
736
+ beforeClass ();//This is not always called
734
737
CodeDescription codeDescriptordefaultCPPRoot = new CodeDescription (CodeDescription .CodeTypes .defaultCPP );
735
738
CodeDescription codeDescriptordefaultCPPSrc = new CodeDescription (CodeDescription .CodeTypes .defaultCPP );
736
739
CodeDescription codeDescriptordefaultCPXX = new CodeDescription (CodeDescription .CodeTypes .defaultCPP );
@@ -749,6 +752,7 @@ static Stream<Arguments> openAndClosePreservesSettingsValueCmd() {
749
752
750
753
751
754
public static Stream <Arguments > NightlyBoardPatronTestData () {
755
+ beforeClass ();//This is not always called
752
756
Preferences .setUseArduinoToolSelection (true );
753
757
CompileDescription compileOptions = new CompileDescription ();
754
758
MCUBoard zeroBoard = Arduino .zeroProgrammingPort ();
@@ -773,15 +777,15 @@ public static Stream<Arguments> NightlyBoardPatronTestData() {
773
777
774
778
@ ParameterizedTest
775
779
@ MethodSource ("NightlyBoardPatronTestData" )
776
- public void NightlyBoardPatron ( String name , MCUBoard boardID , Example example ,CompileDescription compileOptions ) {
780
+ public void NightlyBoardPatron ( String name , MCUBoard boardID , Example example ,CompileDescription compileOptions ) throws Exception {
777
781
778
782
Set <IExample > examples = new HashSet <>();
779
783
examples .add (example );
780
784
CodeDescription codeDescriptor = CodeDescription .createExample (false , examples );
781
785
782
786
BoardDescription boardDescriptor = boardID .getBoardDescriptor ();
783
787
boardDescriptor .setOptions (boardID .getBoardOptions (example ));
784
- if (!Shared .BuildAndVerify (name ,boardID .getBoardDescriptor (), codeDescriptor , compileOptions )) {
788
+ if (!Shared .buildAndVerifyAllBuilders (name ,boardID .getBoardDescriptor (), codeDescriptor , compileOptions )) {
785
789
fail (Shared .getLastFailMessage () );
786
790
}
787
791
0 commit comments