[rfc][icedtea-web] fix to ManifestedJar1Test cases

[Jiri Vanek]

Hi!

This patch is fixing two long-term failing reproducers in ManifestedJar1Test testcase

The patch to netx itself is discussable  - do we wont to survive two jars, both with specified main 
class in manifest, and no other clue to main?

I chose no - the reason is that it can be programmers error, and order can be *to* easily changed. 
However it may be to strict, and to chose the first one is correct....
Then the fix to manifestedJar1main2mainNoAppDesc will be different.

The fix to manifestedJar1nothing2nothingAppDesc is obvious, and I'm surprised it was ever passing 
before. Now it looks better.

J.
-------------- next part --------------
diff -r bc73a1362e9c netx/net/sourceforge/jnlp/ResourcesDesc.java
--- a/netx/net/sourceforge/jnlp/ResourcesDesc.java	Fri Nov 22 12:12:48 2013 +0100
+++ b/netx/net/sourceforge/jnlp/ResourcesDesc.java	Fri Nov 22 14:52:21 2013 +0100
@@ -72,11 +72,20 @@
     }
 
     public static JARDesc getMainJAR(List<JARDesc> jars) {
+        JARDesc markedMain = null;
         for (JARDesc jar : jars) {
             if (jar.isMain()) {
-                return jar;
+                if (markedMain == null){
+                markedMain = jar;
+                } else {
+                    //more then one main jar specified. It stinks. Return null to die later null;
+                    throw new RuntimeException("More then one main jar specified. Thas fatal");
+                }
             }
         }
+        if (markedMain!=null){
+            return markedMain;
+        }
 
         if (jars.size() > 0) {
             return jars.get(0);
diff -r bc73a1362e9c tests/reproducers/simple/ManifestedJar1/testcases/ManifestedJar1Test.java
--- a/tests/reproducers/simple/ManifestedJar1/testcases/ManifestedJar1Test.java	Fri Nov 22 12:12:48 2013 +0100
+++ b/tests/reproducers/simple/ManifestedJar1/testcases/ManifestedJar1Test.java	Fri Nov 22 14:52:21 2013 +0100
@@ -155,14 +155,13 @@
      *
      * Two jars, both with manifest, sboth with main tag, no app desc
      *
-     * thisis passing, SUSPICIOUS, but to lunch at least something is better then to lunch nothing at all.
-     * althoug it maybe SHOULD throw twoMainException
      */
     @Test
     public void manifestedJar1main2mainNoAppDesc() throws Exception {
         String id = "ManifestedJar-1main2mainNoAppDesc";
         ProcessResult pr = server.executeJavawsHeadless(null, "/" + id + ".jnlp");
-        assertManifestedJar1(id, pr);
+        assertNotManifestedJar1(id, pr);
+        assertNotManifestedJar2(id, pr);
         assertNotDead(id, pr);
     }
 
@@ -210,7 +209,7 @@
     public void manifestedJar1nothing2nothingAppDesc() throws Exception {
         String id = "ManifestedJar-1nothing2nothingAppDesc";
         ProcessResult pr = server.executeJavawsHeadless(null, "/" + id + ".jnlp");
-        assertNotManifestedJar2(id, pr);
+        assertManifestedJar2(id, pr);
         assertNotManifestedJar1(id, pr);
         assertNotDead(id, pr);
     }