Quantcast

CVS Commit: /htmlunit: Upgraded rhino JavaScript library to 1.6R2.

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|  
Report Content as Inappropriate

CVS Commit: /htmlunit: Upgraded rhino JavaScript library to 1.6R2.

mguillem
Log Message:
-----------
Upgraded rhino JavaScript library to 1.6R2.
Noteworthy is that the JavaScript stack trace is now added in the normal Java  stack trace (bug 274467 reported by Daniel Gredler,  see http://www.mozilla.org/rhino/rhino16R2.html for full change log).

Modified Files:
--------------
    htmlunit:
        project.xml
        (http://cvs.sourceforge.net/viewcvs.py/htmlunit/htmlunit/project.xml)
    htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host:
        WindowTest.java
        (http://cvs.sourceforge.net/viewcvs.py/htmlunit/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowTest.java)
    htmlunit/src/xdocs:
        changes.xml
        (http://cvs.sourceforge.net/viewcvs.py/htmlunit/htmlunit/src/xdocs/changes.xml)

Revision Data
-------------
Index: WindowTest.java
===================================================================
RCS file: /cvsroot/htmlunit/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowTest.java,v
retrieving revision 1.51
retrieving revision 1.52
diff -Lsrc/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowTest.java -Lsrc/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowTest.java -u -d -r1.51 -r1.52
--- src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowTest.java
+++ src/test/java/com/gargoylesoftware/htmlunit/javascript/host/WindowTest.java
@@ -63,7 +63,7 @@
 import com.gargoylesoftware.htmlunit.html.HtmlSubmitInput;
 
 /**
- * Tests for Window
+ * Tests for {@link Window}.
  *
  * @version  $Revision$
  * @author  <a href="mailto:[hidden email]">Mike Bowler</a>
@@ -493,13 +493,13 @@
             + "<body></body></html>";
 
         final List collectedAlerts = new ArrayList();
-        final List expectedAlertsMoz = Arrays.asList( new String[] {"null"} );
+        final List expectedAlertsMoz = Arrays.asList( new String[] {"null"} );
         loadPage(BrowserVersion.MOZILLA_1_0, content, collectedAlerts);
         createTestPageForRealBrowserIfNeeded(content, expectedAlertsMoz);
         assertEquals(expectedAlertsMoz, collectedAlerts);
-        
+
         collectedAlerts.clear();
-        final List expectedAlertsIE = Arrays.asList( new String[] {"about:blank"} );
+        final List expectedAlertsIE = Arrays.asList( new String[] {"about:blank"} );
         loadPage(BrowserVersion.INTERNET_EXPLORER_6_0, content, collectedAlerts);
         createTestPageForRealBrowserIfNeeded(content, expectedAlertsIE);
         assertEquals(expectedAlertsIE, collectedAlerts);
@@ -787,8 +787,6 @@
 
         final List collectedAlerts = Collections.synchronizedList(new ArrayList());
         loadPage(content, collectedAlerts);
-        
-        //
     }
 
     /**
@@ -917,7 +915,6 @@
 
         final List collectedAlerts = new ArrayList();
         loadPage(content, collectedAlerts);
-        
 
         assertEquals(expectedAlerts, collectedAlerts);
     }
@@ -1114,7 +1111,7 @@
         } );
         assertEquals( expectedAlerts, collectedAlerts );
     }
-    
+
     /**
      * @throws Exception If the test fails
      */
@@ -1129,17 +1126,17 @@
         final String bContent
             = "<html><head><title>B</title></head><body>"
             + "<button id='clickme' onClick='opener.location.href=\"../c.html\";'>Click me</a>"
-            + "</body></html>";        
+            + "</body></html>";
         final String cContent
             = "<html><head><title>C</title></head><body></body></html>";
         final String failContent
-            = "<html><head><title>FAILURE!!!</title></head><body></body></html>";        
+            = "<html><head><title>FAILURE!!!</title></head><body></body></html>";
 
         webConnection.setResponse(new URL("http://opener/test/a.html"), aContent);
         webConnection.setResponse(new URL("http://opener/test/b/b.html"), bContent);
         webConnection.setResponse(new URL("http://opener/test/c.html"), cContent);
         webConnection.setResponse(new URL("http://opener/c.html"), failContent);
-        
+
         webClient.setWebConnection( webConnection );
 
         final HtmlPage firstPage = ( HtmlPage )webClient.getPage(
@@ -1154,7 +1151,7 @@
         final HtmlButton buttonB = (HtmlButton)secondPage.getHtmlElementById("clickme");
         final HtmlPage thirdPage = (HtmlPage)buttonB.click();
         assertNotNull("C", thirdPage);
-        assertEquals( "C", thirdPage.getTitleText() );        
+        assertEquals( "C", thirdPage.getTitleText() );
     }
 
     /**
@@ -1205,7 +1202,7 @@
         final String secondContent
             = "<html><head><title>Second</title></head><body>"
              + "<h1>Second</h1><form>"
-             + "<input type='submit' name='action' value='Close' id='button' "
+             + "<input type='submit' name='action' value='Close' id='button' "
              + "onclick='window.close(); return false;'>"
              + "</form></body></html>";
 
@@ -1238,8 +1235,8 @@
         assertEquals(firstWindow, webClient.getCurrentWindow());
 
         assertEquals(Collections.EMPTY_LIST, collectedAlerts);
-    }    
-    
+    }
+
     /**
      * Test that length of frames collection is retrieved
      * @throws Exception if the test fails
@@ -1485,7 +1482,7 @@
             + "      window.execScript('alert(\"BadLanguage\")', 'BadLanguage');\n"
             + "    }\n"
             + "    catch(e) {\n"
-            + "      alert(e.message);\n"
+            + "      alert(e.message.substr(0, 20)); // msg now contains info on error location\n"
             + "    }\n"
             + "  }\n"
             + "</script>\n"
@@ -1684,11 +1681,11 @@
         assertEquals(2, eventCatcher.getEventCount());
 
         final WebWindow secondWebWindow = (WebWindow) eventCatcher.getEventAt(0).getSource();
-        
+
         assertSame(webClient.getCurrentWindow(), secondWebWindow);
         assertNotSame(firstWebWindow, secondWebWindow);
     }
-    
+
     /**
      * Open a window with only text for content, then try to set focus to it.
      *
@@ -1697,7 +1694,7 @@
     public void testOpenWindow_text() throws Exception {
         if (notYetImplemented()) {
             return;
-        }        
+        }
         final WebClient webClient = new WebClient();
         final MockWebConnection webConnection = new MockWebConnection(webClient);
 
@@ -1730,10 +1727,10 @@
         assertEquals(2, eventCatcher.getEventCount());
 
         final WebWindow secondWebWindow = (WebWindow) eventCatcher.getEventAt(0).getSource();
-        
+
         assertSame(webClient.getCurrentWindow(), secondWebWindow);
         assertNotSame(firstWebWindow, secondWebWindow);
-    }    
+    }
     /**
      * Open a window with only text for content, then try to set focus to it.
      *
@@ -1774,7 +1771,7 @@
         assertEquals(2, eventCatcher.getEventCount());
 
         final WebWindow secondWebWindow = (WebWindow) eventCatcher.getEventAt(0).getSource();
-        
+
         assertSame(webClient.getCurrentWindow(), secondWebWindow);
         assertNotSame(firstWebWindow, secondWebWindow);
     }
Index: project.xml
===================================================================
RCS file: /cvsroot/htmlunit/htmlunit/project.xml,v
retrieving revision 1.99
retrieving revision 1.100
diff -Lproject.xml -Lproject.xml -u -d -r1.99 -r1.100
--- project.xml
+++ project.xml
@@ -366,7 +366,7 @@
         <dependency>
             <groupId>rhino</groupId>
             <artifactId>js</artifactId>
-            <version>1.6R1</version>
+            <version>1.6R2</version>
             <type>jar</type>
             <url>http://www.mozilla.org/rhino</url>
             <properties>
Index: changes.xml
===================================================================
RCS file: /cvsroot/htmlunit/htmlunit/src/xdocs/changes.xml,v
retrieving revision 1.449
retrieving revision 1.450
diff -Lsrc/xdocs/changes.xml -Lsrc/xdocs/changes.xml -u -d -r1.449 -r1.450
--- src/xdocs/changes.xml
+++ src/xdocs/changes.xml
@@ -7,6 +7,12 @@
 
     <body>
         <release version="NextRelease" date="Unknown">
+            <action type="update" dev="mguillem">
+                Upgraded rhino JavaScript library to 1.6R2.
+                Noteworthy is that the JavaScript stack trace is now added in the normal Java
+                stack trace (bug 274467 reported by Daniel Gredler,
+                see http://www.mozilla.org/rhino/rhino16R2.html for full change log).
+            </action>
             <action type="update" dev="mguillem" id="1239285">
                 Fill frame windows with about:blank when the declaring tag is found
                 to allow JavaScript to run on it before the real content is loaded.


-------------------------------------------------------
This SF.Net email is sponsored by:
Power Architecture Resource Center: Free content, downloads, discussions,
and more. http://solutions.newsforge.com/ibmarch.tmpl
_______________________________________________
HtmlUnit-develop mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/htmlunit-develop
Loading...