[HtmlUnit] SVN: [13844] branches/huThread/htmlunit/src/test/java/com/gargoylesoftware /htmlunit/javascript/regexp

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

[HtmlUnit] SVN: [13844] branches/huThread/htmlunit/src/test/java/com/gargoylesoftware /htmlunit/javascript/regexp

asashour-2
Revision: 13844
          http://sourceforge.net/p/htmlunit/code/13844
Author:   asashour
Date:     2017-03-20 13:32:02 +0000 (Mon, 20 Mar 2017)
Log Message:
-----------
thread: update

Modified Paths:
--------------
    branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxyGlobalPropertiesStringFunctionsTest.java
    branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxyGlobalPropertiesTest.java
    branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxyInstancePropertiesTest.java

Modified: branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxyGlobalPropertiesStringFunctionsTest.java
===================================================================
--- branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxyGlobalPropertiesStringFunctionsTest.java 2017-03-20 13:29:13 UTC (rev 13843)
+++ branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxyGlobalPropertiesStringFunctionsTest.java 2017-03-20 13:32:02 UTC (rev 13844)
@@ -25,7 +25,6 @@
  * Tests for {@link HtmlUnitRegExpProxy}.
  * Test the various properties.
  *
- *
  * @author Ronald Brill
  * @author Frank Danek
  */
@@ -61,18 +60,10 @@
     }
 
     /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected boolean ignoreExpectationsLength() {
-        return true;
-    }
-
-    /**
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"HtmlUnit", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpMatchNoGroups() throws Exception {
         testMatch("1234HtmlUnitxyz", "new RegExp('HtmlUnit')");
     }
@@ -81,7 +72,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit,Html, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"HtmlUnit,Html", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234", "xyz"})
     public void regExpMatchOneGroup() throws Exception {
         testMatch("1234HtmlUnitxyz", "new RegExp('(Html)Unit')");
     }
@@ -90,7 +81,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit,Ht,lU, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"HtmlUnit,Ht,lU", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234", "xyz"})
     public void regExpMatchManyGroups() throws Exception {
         testMatch("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit')");
     }
@@ -99,8 +90,10 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "HtmlUnitxy,H,t,m,l,U,n,i,t,x,y, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "HtmlUnitxy,H,t,m,l,U,n,i,t,x,y, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"HtmlUnitxy,H,t,m,l,U,n,i,t,x,y", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-",
+                "HtmlUnitxy", "y", "1234", "z"},
+            IE = {"HtmlUnitxy,H,t,m,l,U,n,i,t,x,y", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-",
+                "HtmlUnitxy", "", "1234", "z"})
     public void regExpMatchTooManyGroups() throws Exception {
         testMatch("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)')");
     }
@@ -109,7 +102,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"HtmlUnit", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpMatchNoGroupsIgnoreCase() throws Exception {
         testMatch("1234HtmlUnitxyz", "new RegExp('HtmlUnit', 'i')");
     }
@@ -118,7 +111,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit,Html, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"HtmlUnit,Html", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234", "xyz"})
     public void regExpMatchOneGroupIgnoreCase() throws Exception {
         testMatch("1234HtmlUnitxyz", "new RegExp('(Html)Unit', 'i')");
     }
@@ -127,7 +120,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit,Ht,lU, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"HtmlUnit,Ht,lU", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234", "xyz"})
     public void regExpMatchManyGroupsIgnoreCase() throws Exception {
         testMatch("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit', 'i')");
     }
@@ -136,8 +129,10 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "HtmlUnitxy,H,t,m,l,U,n,i,t,x,y, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "HtmlUnitxy,H,t,m,l,U,n,i,t,x,y, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"HtmlUnitxy,H,t,m,l,U,n,i,t,x,y", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-",
+            "HtmlUnitxy", "y", "1234", "z"},
+            IE = {"HtmlUnitxy,H,t,m,l,U,n,i,t,x,y", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-",
+            "HtmlUnitxy", "", "1234", "z"})
     public void regExpMatchTooManyGroupsIgnoreCase() throws Exception {
         testMatch("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)', 'i')");
     }
@@ -146,7 +141,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"HtmlUnit", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpMatchNoGroupsGlobal() throws Exception {
         testMatch("1234HtmlUnitxyz", "new RegExp('HtmlUnit', 'g')");
     }
@@ -155,7 +150,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"HtmlUnit", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234", "xyz"})
     public void regExpMatchOneGroupGlobal() throws Exception {
         testMatch("1234HtmlUnitxyz", "new RegExp('(Html)Unit', 'g')");
     }
@@ -164,7 +159,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("Html,Htnl,Htol, $n, Htol, , , , , , , , , -, Htol, Htol, 1234HtmlUnit for Htnl; , xyz")
+    @Alerts({"Html,Htnl,Htol", "$n", "Htol", "", "", "", "", "", "", "", "", "-", "Htol", "Htol",
+        "1234HtmlUnit for Htnl; ", "xyz"})
     public void regExpMatchOneGroupGlobalManyMatches() throws Exception {
         testMatch("1234HtmlUnit for Htnl; Htolxyz", "new RegExp('(Ht.l)', 'g')");
     }
@@ -173,7 +169,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"HtmlUnit", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234", "xyz"})
     public void regExpMatchManyGroupsGlobal() throws Exception {
         testMatch("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit', 'g')");
     }
@@ -182,8 +178,9 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "HtmlUnitxy, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "HtmlUnitxy, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"HtmlUnitxy", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "y", "1234",
+                "z"},
+            IE = {"HtmlUnitxy", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "", "1234", "z"})
     public void regExpMatchTooManyGroupsGlobal() throws Exception {
         testMatch("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)', 'g')");
     }
@@ -220,7 +217,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("4, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"4", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpSearchNoGroups() throws Exception {
         testSearch("1234HtmlUnitxyz", "new RegExp('HtmlUnit')");
     }
@@ -229,7 +226,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("4, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"4", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234", "xyz"})
     public void regExpSearchOneGroup() throws Exception {
         testSearch("1234HtmlUnitxyz", "new RegExp('(Html)Unit')");
     }
@@ -238,7 +235,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("4, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"4", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234", "xyz"})
     public void regExpSearchManyGroups() throws Exception {
         testSearch("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit')");
     }
@@ -247,8 +244,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "4, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "4, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"4", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "y", "1234", "z"},
+            IE = {"4", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "", "1234", "z"})
     public void regExpSearchTooManyGroups() throws Exception {
         testSearch("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)')");
     }
@@ -257,7 +254,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("4, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"4", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpSearchNoGroupsIgnoreCase() throws Exception {
         testSearch("1234HtmlUnitxyz", "new RegExp('HtmlUnit', 'i')");
     }
@@ -266,7 +263,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("4, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"4", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234", "xyz"})
     public void regExpSearchOneGroupIgnoreCase() throws Exception {
         testSearch("1234HtmlUnitxyz", "new RegExp('(Html)Unit', 'i')");
     }
@@ -275,7 +272,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("4, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"4", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234", "xyz"})
     public void regExpSearchManyGroupsIgnoreCase() throws Exception {
         testSearch("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit', 'i')");
     }
@@ -284,8 +281,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "4, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "4, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"4", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "y", "1234", "z"},
+            IE = {"4", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "", "1234", "z"})
     public void regExpSearchTooManyGroupsIgnoreCase() throws Exception {
         testSearch("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)', 'i')");
     }
@@ -294,7 +291,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("4, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"4", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpSearchNoGroupsGlobal() throws Exception {
         testSearch("1234HtmlUnitxyz", "new RegExp('HtmlUnit', 'g')");
     }
@@ -303,7 +300,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("4, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"4", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234", "xyz"})
     public void regExpSearchOneGroupGlobal() throws Exception {
         testSearch("1234HtmlUnitxyz", "new RegExp('(Html)Unit', 'g')");
     }
@@ -312,7 +309,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("4, $n, Html, , , , , , , , , -, Html, Html, 1234, Unit for Html; Htmlxyz")
+    @Alerts({"4", "$n", "Html", "", "", "", "", "", "", "", "", "-", "Html", "Html", "1234", "Unit for Html; Htmlxyz"})
     public void regExpSearchOneGroupGlobalManyMatches() throws Exception {
         testSearch("1234HtmlUnit for Html; Htmlxyz", "new RegExp('(Html)', 'g')");
     }
@@ -321,7 +318,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("4, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"4", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234", "xyz"})
     public void regExpSearchManyGroupsGlobal() throws Exception {
         testSearch("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit', 'g')");
     }
@@ -330,8 +327,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "4, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "4, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"4", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "y", "1234", "z"},
+            IE = {"4", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "", "1234", "z"})
     public void regExpSearchTooManyGroupsGlobal() throws Exception {
         testSearch("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)', 'g')");
     }
@@ -368,7 +365,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("1234RegularExpressionsxyz, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"1234RegularExpressionsxyz", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpReplaceNoGroups() throws Exception {
         testReplace("1234HtmlUnitxyz", "new RegExp('HtmlUnit')");
     }
@@ -377,7 +374,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("1234RegularExpressionsxyz, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"1234RegularExpressionsxyz", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234",
+            "xyz"})
     public void regExpReplaceOneGroup() throws Exception {
         testReplace("1234HtmlUnitxyz", "new RegExp('(Html)Unit')");
     }
@@ -386,7 +384,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("1234RegularExpressionsxyz, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"1234RegularExpressionsxyz", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234",
+            "xyz"})
     public void regExpReplaceManyGroups() throws Exception {
         testReplace("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit')");
     }
@@ -395,8 +394,10 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "1234RegularExpressionsz, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "1234RegularExpressionsz, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"1234RegularExpressionsz", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy",
+                "y", "1234", "z"},
+            IE = {"1234RegularExpressionsz", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy",
+                "", "1234", "z"})
     public void regExpReplaceTooManyGroups() throws Exception {
         testReplace("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)')");
     }
@@ -405,7 +406,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("1234RegularExpressionsxyz, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"1234RegularExpressionsxyz", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpReplaceNoGroupsIgnoreCase() throws Exception {
         testReplace("1234HtmlUnitxyz", "new RegExp('HtmlUnit', 'i')");
     }
@@ -414,7 +415,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("1234RegularExpressionsxyz, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"1234RegularExpressionsxyz", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234",
+            "xyz"})
     public void regExpReplaceOneGroupIgnoreCase() throws Exception {
         testReplace("1234HtmlUnitxyz", "new RegExp('(Html)Unit', 'i')");
     }
@@ -423,7 +425,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("1234RegularExpressionsxyz, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"1234RegularExpressionsxyz", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234",
+            "xyz"})
     public void regExpReplaceManyGroupsIgnoreCase() throws Exception {
         testReplace("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit', 'i')");
     }
@@ -432,8 +435,10 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "1234RegularExpressionsz, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "1234RegularExpressionsz, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"1234RegularExpressionsz", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy",
+                "y", "1234", "z"},
+            IE = {"1234RegularExpressionsz", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy",
+                "", "1234", "z"})
     public void regExpReplaceTooManyGroupsIgnoreCase() throws Exception {
         testReplace("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)', 'i')");
     }
@@ -442,7 +447,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("1234RegularExpressionsxyz, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"1234RegularExpressionsxyz", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpReplaceNoGroupsGlobal() throws Exception {
         testReplace("1234HtmlUnitxyz", "new RegExp('HtmlUnit', 'g')");
     }
@@ -451,7 +456,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("1234RegularExpressionsxyz, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"1234RegularExpressionsxyz", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234",
+            "xyz"})
     public void regExpReplaceOneGroupGlobal() throws Exception {
         testReplace("1234HtmlUnitxyz", "new RegExp('(Html)Unit', 'g')");
     }
@@ -460,8 +466,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("1234RegularExpressionsUnit for RegularExpressions; RegularExpressionsxyz, "
-               + "$n, Html, , , , , , , , , -, Html, Html, 1234HtmlUnit for Html; , xyz")
+    @Alerts({"1234RegularExpressionsUnit for RegularExpressions; RegularExpressionsxyz", "$n", "Html", "", "", "", "",
+            "", "", "", "", "-", "Html", "Html", "1234HtmlUnit for Html; ", "xyz"})
     public void regExpReplaceOneGroupGlobalManyMatches() throws Exception {
         testReplace("1234HtmlUnit for Html; Htmlxyz", "new RegExp('(Html)', 'g')");
     }
@@ -470,7 +476,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("1234RegularExpressionsxyz, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"1234RegularExpressionsxyz", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234",
+            "xyz"})
     public void regExpReplaceManyGroupsGlobal() throws Exception {
         testReplace("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit', 'g')");
     }
@@ -479,8 +486,10 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "1234RegularExpressionsz, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "1234RegularExpressionsz, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"1234RegularExpressionsz", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy",
+                "y", "1234", "z"},
+            IE = {"1234RegularExpressionsz", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy",
+                "", "1234", "z"})
     public void regExpReplaceTooManyGroupsGlobal() throws Exception {
         testReplace("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)', 'g')");
     }

Modified: branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxyGlobalPropertiesTest.java
===================================================================
--- branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxyGlobalPropertiesTest.java 2017-03-20 13:29:13 UTC (rev 13843)
+++ branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxyGlobalPropertiesTest.java 2017-03-20 13:32:02 UTC (rev 13844)
@@ -28,7 +28,6 @@
  * Tests for {@link HtmlUnitRegExpProxy}.
  * Test the various properties.
  *
- *
  * @author Ronald Brill
  * @author Frank Danek
  */
@@ -64,18 +63,10 @@
     }
 
     /**
-     * {@inheritDoc}
-     */
-    @Override
-    protected boolean ignoreExpectationsLength() {
-        return true;
-    }
-
-    /**
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"HtmlUnit", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpExecNoGroups() throws Exception {
         testExec("1234HtmlUnitxyz", "new RegExp('HtmlUnit')");
     }
@@ -84,7 +75,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit,Html, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"HtmlUnit,Html", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234", "xyz"})
     public void regExpExecOneGroup() throws Exception {
         testExec("1234HtmlUnitxyz", "new RegExp('(Html)Unit')");
     }
@@ -93,7 +84,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit,Ht,lU, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"HtmlUnit,Ht,lU", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234", "xyz"})
     public void regExpExecManyGroups() throws Exception {
         testExec("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit')");
     }
@@ -102,8 +93,10 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "HtmlUnitxy,H,t,m,l,U,n,i,t,x,y, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "HtmlUnitxy,H,t,m,l,U,n,i,t,x,y, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"HtmlUnitxy,H,t,m,l,U,n,i,t,x,y", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-",
+                "HtmlUnitxy", "y", "1234", "z"},
+            IE = {"HtmlUnitxy,H,t,m,l,U,n,i,t,x,y", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-",
+                "HtmlUnitxy", "", "1234", "z"})
     @NotYetImplemented(IE)
     public void regExpExecTooManyGroups() throws Exception {
         testExec("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)')");
@@ -113,7 +106,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"HtmlUnit", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpExecNoGroupsIgnoreCase() throws Exception {
         testExec("1234HtmlUnitxyz", "new RegExp('HtmlUnit', 'i')");
     }
@@ -122,7 +115,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit,Html, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"HtmlUnit,Html", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234", "xyz"})
     public void regExpExecOneGroupIgnoreCase() throws Exception {
         testExec("1234HtmlUnitxyz", "new RegExp('(Html)Unit', 'i')");
     }
@@ -131,7 +124,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit,Ht,lU, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"HtmlUnit,Ht,lU", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234", "xyz"})
     public void regExpExecManyGroupsIgnoreCase() throws Exception {
         testExec("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit', 'i')");
     }
@@ -140,8 +133,10 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "HtmlUnitxy,H,t,m,l,U,n,i,t,x,y, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "HtmlUnitxy,H,t,m,l,U,n,i,t,x,y, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"HtmlUnitxy,H,t,m,l,U,n,i,t,x,y", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-",
+            "HtmlUnitxy", "y", "1234", "z"},
+            IE = {"HtmlUnitxy,H,t,m,l,U,n,i,t,x,y", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-",
+            "HtmlUnitxy", "", "1234", "z"})
     @NotYetImplemented(IE)
     public void regExpExecTooManyGroupsIgnoreCase() throws Exception {
         testExec("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)', 'i')");
@@ -151,7 +146,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"HtmlUnit", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpExecNoGroupsGlobal() throws Exception {
         testExec("1234HtmlUnitxyz", "new RegExp('HtmlUnit', 'g')");
     }
@@ -160,7 +155,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit,Html, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"HtmlUnit,Html", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234", "xyz"})
     public void regExpExecOneGroupGlobal() throws Exception {
         testExec("1234HtmlUnitxyz", "new RegExp('(Html)Unit', 'g')");
     }
@@ -169,7 +164,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("Html,Html, $n, Html, , , , , , , , , -, Html, Html, 1234, Unit for Htnl; Htolxyz")
+    @Alerts({"Html,Html", "$n", "Html", "", "", "", "", "", "", "", "", "-", "Html", "Html", "1234",
+            "Unit for Htnl; Htolxyz"})
     public void regExpExecOneGroupGlobalManyMatches() throws Exception {
         testExec("1234HtmlUnit for Htnl; Htolxyz", "new RegExp('(Ht.l)', 'g')");
     }
@@ -178,7 +174,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("HtmlUnit,Ht,lU, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"HtmlUnit,Ht,lU", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234", "xyz"})
     public void regExpExecManyGroupsGlobal() throws Exception {
         testExec("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit', 'g')");
     }
@@ -187,8 +183,10 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "HtmlUnitxy,H,t,m,l,U,n,i,t,x,y, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "HtmlUnitxy,H,t,m,l,U,n,i,t,x,y, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"HtmlUnitxy,H,t,m,l,U,n,i,t,x,y", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-",
+                "HtmlUnitxy", "y", "1234", "z"},
+            IE = {"HtmlUnitxy,H,t,m,l,U,n,i,t,x,y", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-",
+                "HtmlUnitxy", "", "1234", "z"})
     @NotYetImplemented(IE)
     public void regExpExecTooManyGroupsGlobal() throws Exception {
         testExec("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)', 'g')");
@@ -226,7 +224,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("true, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"true", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpTestNoGroups() throws Exception {
         testTest("1234HtmlUnitxyz", "new RegExp('HtmlUnit')");
     }
@@ -235,7 +233,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("true, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"true", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234", "xyz"})
     public void regExpTestOneGroup() throws Exception {
         testTest("1234HtmlUnitxyz", "new RegExp('(Html)Unit')");
     }
@@ -244,7 +242,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("true, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"true", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234", "xyz"})
     public void regExpTestManyGroups() throws Exception {
         testTest("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit')");
     }
@@ -253,8 +251,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "true, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "true, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"true", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "y", "1234", "z"},
+            IE = {"true", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "", "1234", "z"})
     @NotYetImplemented(IE)
     public void regExpTestTooManyGroups() throws Exception {
         testTest("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)')");
@@ -264,7 +262,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("true, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"true", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpTestNoGroupsIgnoreCase() throws Exception {
         testTest("1234HtmlUnitxyz", "new RegExp('HtmlUnit', 'i')");
     }
@@ -273,7 +271,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("true, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"true", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234", "xyz"})
     public void regExpTestOneGroupIgnoreCase() throws Exception {
         testTest("1234HtmlUnitxyz", "new RegExp('(Html)Unit', 'i')");
     }
@@ -282,7 +280,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("true, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"true", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234", "xyz"})
     public void regExpTestManyGroupsIgnoreCase() throws Exception {
         testTest("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit', 'i')");
     }
@@ -291,8 +289,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "true, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "true, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"true", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "y", "1234", "z"},
+            IE = {"true", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "", "1234", "z"})
     @NotYetImplemented(IE)
     public void regExpTestTooManyGroupsIgnoreCase() throws Exception {
         testTest("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)', 'i')");
@@ -302,7 +300,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("true, $n, , , , , , , , , , -, HtmlUnit, , 1234, xyz")
+    @Alerts({"true", "$n", "", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "", "1234", "xyz"})
     public void regExpTestNoGroupsGlobal() throws Exception {
         testTest("1234HtmlUnitxyz", "new RegExp('HtmlUnit', 'g')");
     }
@@ -311,7 +309,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("true, $n, Html, , , , , , , , , -, HtmlUnit, Html, 1234, xyz")
+    @Alerts({"true", "$n", "Html", "", "", "", "", "", "", "", "", "-", "HtmlUnit", "Html", "1234", "xyz"})
     public void regExpTestOneGroupGlobal() throws Exception {
         testTest("1234HtmlUnitxyz", "new RegExp('(Html)Unit', 'g')");
     }
@@ -320,7 +318,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("true, $n, Html, , , , , , , , , -, Html, Html, 1234, Unit for Html; Htmlxyz")
+    @Alerts({"true", "$n", "Html", "", "", "", "", "", "", "", "", "-", "Html", "Html", "1234",
+            "Unit for Html; Htmlxyz"})
     public void regExpTestOneGroupGlobalManyMatches() throws Exception {
         testTest("1234HtmlUnit for Html; Htmlxyz", "new RegExp('(Html)', 'g')");
     }
@@ -329,7 +328,7 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts("true, $n, Ht, lU, , , , , , , , -, HtmlUnit, lU, 1234, xyz")
+    @Alerts({"true", "$n", "Ht", "lU", "", "", "", "", "", "", "", "-", "HtmlUnit", "lU", "1234", "xyz"})
     public void regExpTestManyGroupsGlobal() throws Exception {
         testTest("1234HtmlUnitxyz", "new RegExp('(Ht)m(lU)nit', 'g')");
     }
@@ -338,8 +337,8 @@
      * @throws Exception if the test fails
      */
     @Test
-    @Alerts(DEFAULT = "true, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, y, 1234, z",
-            IE = "true, $n, H, t, m, l, U, n, i, t, x, -, HtmlUnitxy, , 1234, z")
+    @Alerts(DEFAULT = {"true", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "y", "1234", "z"},
+            IE = {"true", "$n", "H", "t", "m", "l", "U", "n", "i", "t", "x", "-", "HtmlUnitxy", "", "1234", "z"})
     @NotYetImplemented(IE)
     public void regExpTestTooManyGroupsGlobal() throws Exception {
         testTest("1234HtmlUnitxyz", "new RegExp('(H)(t)(m)(l)(U)(n)(i)(t)(x)(y)', 'g')");

Modified: branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxyInstancePropertiesTest.java
===================================================================
--- branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxyInstancePropertiesTest.java 2017-03-20 13:29:13 UTC (rev 13843)
+++ branches/huThread/htmlunit/src/test/java/com/gargoylesoftware/htmlunit/javascript/regexp/HtmlUnitRegExpProxyInstancePropertiesTest.java 2017-03-20 13:32:02 UTC (rev 13844)
@@ -26,7 +26,6 @@
  * Tests for {@link HtmlUnitRegExpProxy}.
  * Test the various properties.
  *
- *
  * @author Ronald Brill
  */
 @RunWith(BrowserRunner.class)


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
HtmlUnit-develop mailing list
[hidden email]
https://lists.sourceforge.net/lists/listinfo/htmlunit-develop