[TRAVIS] Revert timeouts removed in api/htmlui tests

.travis.yml

@@ -103,7 +103,7 @@ matrix:
             - ant $OPTS clean
             - ant $OPTS build
           script:
-            - hide-logs.sh ant $OPTS -f platform/api.htmlui test
+            - travis_retry 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
@@ -158,7 +158,7 @@ matrix:
             - hide-logs.sh ant $OPTS -f platform/openide.dialogs test
             - hide-logs.sh ant $OPTS -f platform/openide.execution test
             - hide-logs.sh ant $OPTS -f platform/openide.execution.compat8 test
-            - hide-logs.sh ant $OPTS -f platform/openide.explorer test
+            - travis_retry hide-logs.sh ant $OPTS -f platform/openide.explorer test
             - hide-logs.sh ant $OPTS -f platform/openide.filesystems test
             - hide-logs.sh ant $OPTS -f platform/openide.filesystems.compat8 test
             - hide-logs.sh ant $OPTS -f platform/openide.filesystems.nb test

platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ComponentsTest.java

@@ -45,7 +45,7 @@ public ComponentsTest() {
         NbResloc.init();
     }
 
-    @Test
+    @Test(timeOut = 9000)
     public void loadSwing() throws Exception {
         CountDownLatch cdl = new CountDownLatch(1);
         JComponent p = TestPages.getSwing(10, cdl);
@@ -56,7 +56,7 @@ public void loadSwing() throws Exception {
         cdl.await();
     }
 
-    @Test
+    @Test(timeOut = 9000)
     public void loadFX() throws Exception {
         final CountDownLatch cdl = new CountDownLatch(1);
         final CountDownLatch done = new CountDownLatch(1);

platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/DialogsTest.java

@@ -45,7 +45,7 @@ public class DialogsTest {
     public DialogsTest() {
     }
 
-    @BeforeClass
+    @BeforeClass(timeOut = 9000)
     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 void run() {
         f.setVisible(true);
     }
 
-    @Test
+    @Test(timeOut = 9000)
     public void parseButtons() throws Throwable {
         final Throwable[] ex = { null };
         final JButton[] buttons = { null, null };
@@ -123,7 +123,7 @@ public void run() {
         });
     }
 
-    @Test
+    @Test(timeOut = 9000)
     public void noDefinedButtonsMeanOKCancel() throws Throwable {
         final Throwable[] ex = { null };
         final CountDownLatch done = new CountDownLatch(1);

platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/HtmlComponentTest.java

@@ -46,7 +46,7 @@ public class HtmlComponentTest {
     public HtmlComponentTest() {
     }
 
-    @BeforeClass
+    @BeforeClass(timeOut = 9000)
     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 static Object onLoad() {
         return cc;
     }
 
-    @Test
+    @Test(timeOut = 9000)
     public void updateContext() throws Exception {
         CheckContext cc = assertContext();
 
@@ -79,7 +79,7 @@ public void updateContext() throws Exception {
         assertNull(lkp.lookup(DefCnstr.class), "Disappeared again");
     }
 
-    @Test
+    @Test(timeOut = 9000)
     public void closedWhenRemoved() throws Exception {
         CheckContext cc = assertContext();
 
@@ -94,7 +94,7 @@ public void closedWhenRemoved() throws Exception {
         assertTrue(inst.closed, "Close has been called on removal");
     }
 
-    @Test
+    @Test(timeOut = 9000)
     public void updateContextWithNonDefaultCnstr() throws Exception {
         CheckContext cc = assertContext();
 

platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/OpenHTMLRegistrationTest.java

@@ -46,7 +46,7 @@ public OpenHTMLRegistrationTest() {
     public static void main() {
     }
 
-    @Test
+    @Test(timeOut = 9000)
     public void verifyRegistered() {
         final String path = "Actions/Test/html-test.instance";
         final FileObject fo = FileUtil.getConfigFile(path);

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
+    @Test(timeOut = 9000)
     public void showDialog() throws InterruptedException {
         cdl = new CountDownLatch(1);
         EventQueue.invokeLater(this);

platform/api.htmlui/test/unit/src/org/netbeans/modules/htmlui/ShowDialogFromFXThreadTest.java

@@ -36,7 +36,7 @@
 public class ShowDialogFromFXThreadTest implements Runnable {
     private volatile boolean returned;
 
-    @BeforeClass
+    @BeforeClass(timeOut = 9000)
     public static void initFX() {
         JFXPanel p = new JFXPanel();
         JFrame f = new JFrame();
@@ -51,7 +51,7 @@ public static void initFX() {
 
     private volatile CountDownLatch cdl;
 
-    @Test
+    @Test(timeOut = 9000)
     public void showDialog() throws Exception {
         cdl = new CountDownLatch(1);
         Platform.runLater(this);