Skip to content

Commit 81ba37a

Browse files
author
jantje
committed
remove the regression test that fails on travis
It is a test that is very unlikely to give regression and it works fine on my buildserver and my system I assume it is a security related issue @travis
1 parent 3824e15 commit 81ba37a

File tree

2 files changed

+62
-25
lines changed

2 files changed

+62
-25
lines changed

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

+1-25
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
import static org.junit.Assert.fail;
44

5-
import java.util.Arrays;
65
import java.util.HashMap;
7-
import java.util.HashSet;
86
import java.util.Map;
97

108
import org.eclipse.cdt.core.model.CoreModel;
@@ -18,10 +16,10 @@
1816
import org.junit.Test;
1917

2018
import io.sloeber.core.api.BoardDescriptor;
21-
import io.sloeber.core.api.PackageManager;
2219
import io.sloeber.core.api.CodeDescriptor;
2320
import io.sloeber.core.api.CompileOptions;
2421
import io.sloeber.core.api.ConfigurationDescriptor;
22+
import io.sloeber.core.api.PackageManager;
2523
import io.sloeber.core.api.SerialManager;
2624

2725
@SuppressWarnings("nls")
@@ -40,33 +38,11 @@ public static void WaitForInstallerToFinish() {
4038
}
4139

4240
public static void installAdditionalBoards() {
43-
String[] packageUrlsToAdd = { "http://talk2arduino.wisen.com.au/master/package_talk2.wisen.com_index.json" };
44-
PackageManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)), false);
4541
if (!MySystem.getTeensyPlatform().isEmpty()) {
4642
PackageManager.addPrivateHardwarePath(MySystem.getTeensyPlatform());
4743
}
4844
}
4945

50-
/**
51-
* Test wether a platform json redirect is handled properly
52-
* https://github.com/jantje/arduino-eclipse-plugin/issues/393
53-
*/
54-
@SuppressWarnings("static-method")
55-
@Test
56-
public void redirectedJson() {
57-
//this board references to arduino avr so install that one to
58-
PackageManager.installLatestPlatform("package_index.json", "arduino", "Arduino AVR Boards");
59-
PackageManager.installLatestPlatform("package_talk2.wisen.com_index.json", "Talk2","Talk2 AVR Boards");
60-
Map<String, String> options = new HashMap<>();
61-
options.put("mhz", "16MHz");
62-
BoardDescriptor boardid = PackageManager.getBoardDescriptor("package_talk2.wisen.com_index.json", "Talk2",
63-
"Talk2 AVR Boards", "whispernode", options);
64-
if (boardid == null) {
65-
fail("redirect Json ");
66-
return;
67-
}
68-
Shared.BuildAndVerify(boardid,CodeDescriptor.createDefaultIno());
69-
}
7046

7147
/**
7248
* make sure when switching between a board with variant file and without
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
package io.sloeber.core;
2+
3+
import static org.junit.Assert.fail;
4+
5+
import java.util.Arrays;
6+
import java.util.HashMap;
7+
import java.util.HashSet;
8+
import java.util.Map;
9+
10+
import org.junit.BeforeClass;
11+
import org.junit.Test;
12+
13+
import io.sloeber.core.api.BoardDescriptor;
14+
import io.sloeber.core.api.CodeDescriptor;
15+
import io.sloeber.core.api.PackageManager;
16+
import io.sloeber.core.api.SerialManager;
17+
18+
@SuppressWarnings("nls")
19+
public class RegressionTestFailingOnTravis {
20+
21+
/*
22+
* In new new installations (of the Sloeber development environment) the
23+
* installer job will trigger downloads These mmust have finished before we
24+
* can start testing
25+
*/
26+
@BeforeClass
27+
public static void WaitForInstallerToFinish() {
28+
Shared.waitForAllJobsToFinish();
29+
SerialManager.stopNetworkScanning();
30+
installAdditionalBoards();
31+
}
32+
33+
public static void installAdditionalBoards() {
34+
String[] packageUrlsToAdd = { "http://talk2arduino.wisen.com.au/master/package_talk2.wisen.com_index.json" };
35+
PackageManager.addPackageURLs(new HashSet<>(Arrays.asList(packageUrlsToAdd)), false);
36+
if (!MySystem.getTeensyPlatform().isEmpty()) {
37+
PackageManager.addPrivateHardwarePath(MySystem.getTeensyPlatform());
38+
}
39+
}
40+
41+
/**
42+
* Test wether a platform json redirect is handled properly
43+
* https://github.com/jantje/arduino-eclipse-plugin/issues/393
44+
*/
45+
@SuppressWarnings("static-method")
46+
@Test
47+
public void redirectedJson() {
48+
//this board references to arduino avr so install that one to
49+
PackageManager.installLatestPlatform("package_index.json", "arduino", "Arduino AVR Boards");
50+
PackageManager.installLatestPlatform("package_talk2.wisen.com_index.json", "Talk2","Talk2 AVR Boards");
51+
Map<String, String> options = new HashMap<>();
52+
options.put("mhz", "16MHz");
53+
BoardDescriptor boardid = PackageManager.getBoardDescriptor("package_talk2.wisen.com_index.json", "Talk2",
54+
"Talk2 AVR Boards", "whispernode", options);
55+
if (boardid == null) {
56+
fail("redirect Json ");
57+
return;
58+
}
59+
Shared.BuildAndVerify(boardid,CodeDescriptor.createDefaultIno());
60+
}
61+
}

0 commit comments

Comments
 (0)