You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by ma...@apache.org on 2019/11/30 07:06:54 UTC
[netbeans] branch master updated: [TRAVIS] Remove timeouts for
platform/api.htmlui tests (#1700)
This is an automated email from the ASF dual-hosted git repository.
matthiasblaesing pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 1994f5b [TRAVIS] Remove timeouts for platform/api.htmlui tests (#1700)
1994f5b is described below
commit 1994f5b9f8dada5fe1929086a67c3cab0442fa33
Author: hectorespert <bl...@users.noreply.github.com>
AuthorDate: Sat Nov 30 08:06:43 2019 +0100
[TRAVIS] Remove timeouts for platform/api.htmlui tests (#1700)
* Retry platform/api.htmlui tests
* Remove timeouts for api/htmlui tests
---
.travis.yml | 2 +-
.../unit/src/org/netbeans/api/htmlui/HTMLViewProcessorTest.java | 1 -
.../test/unit/src/org/netbeans/modules/htmlui/ComponentsTest.java | 4 ++--
.../test/unit/src/org/netbeans/modules/htmlui/DialogsTest.java | 6 +++---
.../unit/src/org/netbeans/modules/htmlui/HtmlComponentTest.java | 8 ++++----
.../src/org/netbeans/modules/htmlui/OpenHTMLRegistrationTest.java | 2 +-
.../src/org/netbeans/modules/htmlui/ShowDialogFromEDTTest.java | 2 +-
.../org/netbeans/modules/htmlui/ShowDialogFromFXThreadTest.java | 4 ++--
8 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 797a36a..6a93d91 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -103,7 +103,7 @@ matrix:
- ant $OPTS clean
- ant $OPTS build
script:
- - hide-logs.sh ant -Dcluster.config=platform -Djavac.compilerargs=-nowarn -Dbuild.compiler.deprecation=false -Dtest-unit-sys-prop.ignore.random.failures=true -Dvanilla.javac.exists=true -f platform/api.htmlui test
+ - hide-logs.sh ant $OPTS -f platform/api.htmlui test
- hide-logs.sh ant $OPTS -f platform/api.intent test
- hide-logs.sh ant $OPTS -f platform/api.io test
- hide-logs.sh ant $OPTS -f platform/api.progress test
diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/api/htmlui/HTMLViewProcessorTest.java b/platform/api.htmlui/test/unit/src/org/netbeans/api/htmlui/HTMLViewProcessorTest.java
index 862ce5c..6269b4f 100644
--- a/platform/api.htmlui/test/unit/src/org/netbeans/api/htmlui/HTMLViewProcessorTest.java
+++ b/platform/api.htmlui/test/unit/src/org/netbeans/api/htmlui/HTMLViewProcessorTest.java
@@ -18,7 +18,6 @@
*/
package org.netbeans.api.htmlui;
-import java.io.IOException;
import java.util.Locale;
import javax.tools.Diagnostic;
import javax.tools.JavaFileObject;
diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ComponentsTest.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ComponentsTest.java
index 65cdc51..fde6139 100644
--- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ComponentsTest.java
+++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ComponentsTest.java
@@ -45,7 +45,7 @@ public class ComponentsTest {
NbResloc.init();
}
- @Test(timeOut = 9000)
+ @Test
public void loadSwing() throws Exception {
CountDownLatch cdl = new CountDownLatch(1);
JComponent p = TestPages.getSwing(10, cdl);
@@ -56,7 +56,7 @@ public class ComponentsTest {
cdl.await();
}
- @Test(timeOut = 9000)
+ @Test
public void loadFX() throws Exception {
final CountDownLatch cdl = new CountDownLatch(1);
final CountDownLatch done = new CountDownLatch(1);
diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/DialogsTest.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/DialogsTest.java
index aeabeca..c947db4 100644
--- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/DialogsTest.java
+++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/DialogsTest.java
@@ -45,7 +45,7 @@ public class DialogsTest {
public DialogsTest() {
}
- @BeforeClass(timeOut = 9000)
+ @BeforeClass
public static void initializeContext() throws Exception {
final JFXPanel p = new JFXPanel();
final URL u = DialogsTest.class.getResource("/org/netbeans/api/htmlui/empty.html");
@@ -71,7 +71,7 @@ public class DialogsTest {
f.setVisible(true);
}
- @Test(timeOut = 9000)
+ @Test
public void parseButtons() throws Throwable {
final Throwable[] ex = { null };
final JButton[] buttons = { null, null };
@@ -123,7 +123,7 @@ public class DialogsTest {
});
}
- @Test(timeOut = 9000)
+ @Test
public void noDefinedButtonsMeanOKCancel() throws Throwable {
final Throwable[] ex = { null };
final CountDownLatch done = new CountDownLatch(1);
diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/HtmlComponentTest.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/HtmlComponentTest.java
index 11e13f9..fe57aac 100644
--- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/HtmlComponentTest.java
+++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/HtmlComponentTest.java
@@ -46,7 +46,7 @@ public class HtmlComponentTest {
public HtmlComponentTest() {
}
- @BeforeClass(timeOut = 9000)
+ @BeforeClass
public static void initializeContext() throws Exception {
final HtmlComponent tc = new HtmlComponent();
final URL u = HtmlComponent.class.getResource("/org/netbeans/api/htmlui/empty.html");
@@ -66,7 +66,7 @@ public class HtmlComponentTest {
return cc;
}
- @Test(timeOut = 9000)
+ @Test
public void updateContext() throws Exception {
CheckContext cc = assertContext();
@@ -79,7 +79,7 @@ public class HtmlComponentTest {
assertNull(lkp.lookup(DefCnstr.class), "Disappeared again");
}
- @Test(timeOut = 9000)
+ @Test
public void closedWhenRemoved() throws Exception {
CheckContext cc = assertContext();
@@ -94,7 +94,7 @@ public class HtmlComponentTest {
assertTrue(inst.closed, "Close has been called on removal");
}
- @Test(timeOut = 9000)
+ @Test
public void updateContextWithNonDefaultCnstr() throws Exception {
CheckContext cc = assertContext();
diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/OpenHTMLRegistrationTest.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/OpenHTMLRegistrationTest.java
index aca0397..b3787a6 100644
--- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/OpenHTMLRegistrationTest.java
+++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/OpenHTMLRegistrationTest.java
@@ -46,7 +46,7 @@ public class OpenHTMLRegistrationTest {
public static void main() {
}
- @Test(timeOut = 9000)
+ @Test
public void verifyRegistered() {
final String path = "Actions/Test/html-test.instance";
final FileObject fo = FileUtil.getConfigFile(path);
diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromEDTTest.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromEDTTest.java
index 4b1387e..2bcf83f 100644
--- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromEDTTest.java
+++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromEDTTest.java
@@ -35,7 +35,7 @@ public class ShowDialogFromEDTTest implements Runnable {
private CountDownLatch cdl;
- @Test(timeOut = 9000)
+ @Test
public void showDialog() throws InterruptedException {
cdl = new CountDownLatch(1);
EventQueue.invokeLater(this);
diff --git a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromFXThreadTest.java b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromFXThreadTest.java
index b67d5cc..37eb2a4 100644
--- a/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromFXThreadTest.java
+++ b/platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromFXThreadTest.java
@@ -36,7 +36,7 @@ import org.testng.annotations.Test;
public class ShowDialogFromFXThreadTest implements Runnable {
private volatile boolean returned;
- @BeforeClass(timeOut = 9000)
+ @BeforeClass
public static void initFX() {
JFXPanel p = new JFXPanel();
JFrame f = new JFrame();
@@ -51,7 +51,7 @@ public class ShowDialogFromFXThreadTest implements Runnable {
private volatile CountDownLatch cdl;
- @Test(timeOut = 9000)
+ @Test
public void showDialog() throws Exception {
cdl = new CountDownLatch(1);
Platform.runLater(this);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists