Changeset 429 for trunk/icedtea-web/tests/test-extensions-tests

Timestamp:

Sep 24, 2014, 9:34:21 PM (11 years ago)

Author:

dmik

Message:

icedtea-web: Merge version 1.5.1 from vendor to trunk.

Location:

trunk/icedtea-web/tests/test-extensions-tests/net/sourceforge/jnlp

Files:

• MessagePropertiesTest.java (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions-tests/net/sourceforge/jnlp/MessagePropertiesTest.java )
• ResourcesTest.java (modified) (16 diffs)
• ServerAccessTest.java (modified) (1 diff)
• TinyHttpdImplTest.java (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions-tests/net/sourceforge/jnlp/TinyHttpdImplTest.java )
• awt (copied) (copied from branches/vendor/sourceforge/icedtea-web/1.5.1/tests/test-extensions-tests/net/sourceforge/jnlp/awt )

trunk/icedtea-web/tests/test-extensions-tests/net/sourceforge/jnlp/ResourcesTest.java

@@ -65 +65 @@
     public void testNonExisitngBrowserWillNotDeadlock() throws Exception {
         server.setCurrentBrowser(Browsers.none);
-        ServerAccess.ProcessResult pr = server.executeBrowser("not_existing_url.html");
+        ProcessResult pr = server.executeBrowser("not_existing_url.html");
         Assert.assertNull(pr.process);
         Assert.assertEquals(pr.stderr, "");
@@ -71 +71 @@
         Assert.assertTrue(pr.wasTerminated);
         Assert.assertTrue(pr.returnValue < 0);
-        junit.framework.Assert.assertNotNull(pr.deadlyException);
+        Assert.assertNotNull(pr.deadlyException);
     }
 
@@ -78 +78 @@
         server.setCurrentBrowser(Browsers.none);
         List<String> al=Arrays.asList(new String[] {"definietly_not_Existing_process"});
-        ServerAccess.ProcessResult pr = server.executeProcess(al);
+        ProcessResult pr = server.executeProcess(al);
         Assert.assertNull(pr.process);
         Assert.assertEquals(pr.stderr, "");
@@ -84 +84 @@
         Assert.assertTrue(pr.wasTerminated);
         Assert.assertTrue(pr.returnValue < 0);
-        junit.framework.Assert.assertNotNull(pr.deadlyException);
+        Assert.assertNotNull(pr.deadlyException);
     }
 
@@ -97 +97 @@
     @TestInBrowsers(testIn=Browsers.none)
     public void testNonExisitngBrowserWillNotCauseMess() throws Exception {
-        ServerAccess.ProcessResult pr = server.executeBrowser("not_existing_url.html");
+        ProcessResult pr = server.executeBrowser("not_existing_url.html");
         Assert.assertNull(pr.process);
         Assert.assertEquals(pr.stderr, "");
@@ -103 +103 @@
         Assert.assertTrue(pr.wasTerminated);
         Assert.assertTrue(pr.returnValue < 0);
-        junit.framework.Assert.assertNotNull(pr.deadlyException);
+        Assert.assertNotNull(pr.deadlyException);
     }
 
@@ -121 +121 @@
     public void testBrowser3() throws Exception {
         testBrowser(server.getCurrentBrowser());
-
-
     }
 
@@ -216 +214 @@
         expected = 2;
         Assert.assertTrue("Created from  " + s + "there must be " + expected + " browsers in factory. Is" + bf.getAllBrowsers().size(), bf.getAllBrowsers().size() == expected);
-
-
-
-
     }
 
@@ -275 +269 @@
             @Override
             public void charReaded(char ch) {
-                //ServerAccess.logOutputReprint("OO recieved char: "+ch);
                 o1.append(ch);
             }
@@ -281 +274 @@
             @Override
             public void lineReaded(String s) {
-                //ServerAccess.logOutputReprint("OO recieved line: "+s);
                 o2.append(s).append("\n");
             }
@@ -289 +281 @@
             @Override
             public void charReaded(char ch) {
-                //ServerAccess.logOutputReprint("EE recieved char: "+ch);
                 e1.append(ch);
             }
@@ -295 +286 @@
             @Override
             public void lineReaded(String s) {
-                //ServerAccess.logOutputReprint("EE recieved line: "+s);
                 e2.append(s).append("\n");
             }
         };
-       ServerAccess.ProcessResult pr = server.executeBrowser("not_existing_url.html",lo,le);
-        server.setCurrentBrowser(BrowserFactory.getFactory().getFirst().getID());
-        Assert.assertNotNull(server.getCurrentBrowsers());
-        Assert.assertNotNull(server.getCurrentBrowser());
-//        ServerAccess.logOutputReprint("total o");
-//        ServerAccess.logOutputReprint(pr.stdout);
-//        ServerAccess.logOutputReprint("total e");
-//        ServerAccess.logOutputReprint(pr.stderr);
+       ProcessResult pr = server.executeBrowser("not_existing_url.html",lo,le);
+       server.setCurrentBrowser(BrowserFactory.getFactory().getFirst().getID());
+       Assert.assertNotNull(server.getCurrentBrowsers());
+       Assert.assertNotNull(server.getCurrentBrowser());
        Assert.assertEquals(pr.stdout, o1.toString());
        Assert.assertEquals(pr.stderr, e1.toString());
@@ -312 +298 @@
        Assert.assertEquals(pr.stdout.replace("\n", ""), o2.toString().replace("\n", ""));
        Assert.assertEquals(pr.stderr.replace("\n", ""), e2.toString().replace("\n", ""));
-
     }
 
@@ -325 +310 @@
 
     private void testBrowser(Browser browser) throws IOException {
-        File f1 = null;
+        File defaultPluginDir = null;
         if (browser.getDefaultPluginExpectedLocation() != null) {
-            f1 = new File(browser.getDefaultPluginExpectedLocation());
-        }
-        File f2 = null;
+            defaultPluginDir = new File(browser.getDefaultPluginExpectedLocation());
+        }
+        if (defaultPluginDir != null) {
+            Assert.assertTrue("browser's plugins  location should exist " + defaultPluginDir.toString() + " for " + browser.getID().toString(), defaultPluginDir.exists());
+        }
+
+        File userPluginDir = null;
         if (browser.getUserDefaultPluginExpectedLocation() != null) {
-            f2 = new File(browser.getUserDefaultPluginExpectedLocation());
-        }
-        if (f1 != null) {
-            Assert.assertTrue("browser's plugins  location should exist " + f1.toString() + " for " + browser.getID().toString(), f1.exists());
-        }
-        if (f2 != null) {
-            Assert.assertTrue("browser's users-plugins  location should exist " + f2.toString() + " for " + browser.getID().toString(), f2.exists());
-        }
-
-        File[] ff1 = new File[0];
-        if (f1 != null) {
-            ff1 = f1.listFiles();
-        }
-
-        File[] ff2 = new File[0];
-        if (f2 != null) {
-            ff2 = f2.listFiles();
-        }
-
-        Assert.assertTrue("at least one of browser's plugins  directory should contains at least one file didn't. For " + browser.getID().toString(), ff1.length + ff2.length > 0);
-
-        ff1 = new File[0];
-        if (f1 != null) {
-            ff1 = f1.listFiles(new FileFilter() {
+            userPluginDir = new File(browser.getUserDefaultPluginExpectedLocation());
+        }
+        // userPluginDir (~/.mozilla/plugins/) may not exist if user has not installed any Firefox plugins.
+
+        File[] defaultPlugins = new File[0];
+        if (defaultPluginDir != null && defaultPluginDir.isDirectory()) {
+            defaultPlugins = defaultPluginDir.listFiles();
+        }
+
+        File[] userPlugins = new File[0];
+        if (userPluginDir != null && userPluginDir.isDirectory()) {
+            userPlugins = userPluginDir.listFiles();
+        }
+
+        Assert.assertTrue("at least one of browser's plugins  directory should contains at least one file didn't. For " + browser.getID().toString(), defaultPlugins.length + userPlugins.length > 0);
+
+        defaultPlugins = new File[0];
+        if (defaultPluginDir != null && defaultPluginDir.isDirectory()) {
+            defaultPlugins = defaultPluginDir.listFiles(new FileFilter() {
 
                 @Override
@@ -363 +347 @@
         }
 
-        ff2 = new File[0];
-        if (f2 != null) {
-            ff2 = f2.listFiles(new FileFilter() {
+        userPlugins = new File[0];
+        if (userPluginDir != null && userPluginDir.isDirectory()) {
+            userPlugins = userPluginDir.listFiles(new FileFilter() {
 
                 @Override
@@ -375 +359 @@
 
         Assert.assertTrue("browser's plugins  directories should contains exactly one  " + LinuxBrowser.DEFAULT_PLUGIN_NAME + ", but didnt for " + browser.getID().toString(),
-                ff1.length + ff2.length == 1);
+                defaultPlugins.length + userPlugins.length == 1);
         String currentPath = server.getJavawsFile().getParentFile().getParentFile().getAbsolutePath();
 
-        File[] ff;
-        if (ff1.length == 1) {
-            ff = ff1;
+        File[] plugins;
+        if (defaultPlugins.length == 1) {
+            plugins = defaultPlugins;
         } else {
-            ff = ff2;
-        }
-        String s = ServerAccess.getContentOfStream(new FileInputStream(ff[0]), "ASCII");
+            plugins = userPlugins;
+        }
+        String s = ServerAccess.getContentOfStream(new FileInputStream(plugins[0]), "ASCII");
         Assert.assertTrue("browser's plugins  shoud points to" + currentPath + ", but  didnt",
                 s.contains(s));

trunk/icedtea-web/tests/test-extensions-tests/net/sourceforge/jnlp/ServerAccessTest.java

@@ -40 +40 @@
 import java.io.FileInputStream;
 import java.net.URL;
+
 import org.junit.Assert;
 import org.junit.Test;