latest rhino

Author: rbri

pom.xml

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.htmlunit</groupId>
     <artifactId>htmlunit-core-js</artifactId>
-    <version>4.2.0</version>
+    <version>4.3.0-SNAPSHOT</version>
     <name>HtmlUnit JavaScript Engine</name>
     <organization>
         <name>HtmlUnit</name>
@@ -124,13 +124,13 @@
                               <outputDirectory>${basedir}/src/repackaged-rhino/java/org/htmlunit/corejs</outputDirectory>
                               <resources>
                                   <resource>
-                                      <directory>../htmlunit-rhino-fork/src/org/mozilla</directory>
+                                      <directory>../htmlunit-rhino-fork/rhino-runtime/src/main/java/org/mozilla</directory>
                                       <includes>
                                           <include>**/*.java</include>
                                       </includes>
                                   </resource>
                                   <resource>
-                                      <directory>../htmlunit-rhino-fork/toolsrc/org/mozilla</directory>
+                                      <directory>../htmlunit-rhino-fork/rhino-tools/src/main/java/org/mozilla</directory>
                                       <includes>
                                           <include>javascript/tools/debugger/**/*.java</include>
                                           <include>javascript/tools/shell/**/*.java</include>
@@ -150,7 +150,7 @@
                             <outputDirectory>${basedir}/src/repackaged-rhino/resources/org/htmlunit/corejs</outputDirectory>
                             <resources>
                                 <resource>
-                                    <directory>../htmlunit-rhino-fork/src/org/mozilla</directory>
+                                    <directory>../htmlunit-rhino-fork/rhino-runtime/src/main/resources/org/mozilla</directory>
                                     <includes>
                                         <include>**/*.properties</include>
                                     </includes>
@@ -502,11 +502,11 @@
     </dependencies>
     <distributionManagement>
         <snapshotRepository>
-            <id>sonatype-nexus-snapshots</id>
+            <id>s01-sonatype-nexus-snapshots</id>
             <url>https://s01.oss.sonatype.org/content/repositories/snapshots</url>
         </snapshotRepository>
         <repository>
-            <id>sonatype-nexus-staging</id>
+            <id>s01-sonatype-nexus-staging</id>
             <url>https://s01.oss.sonatype.org/service/local/staging/deploy/maven2</url>
         </repository>
     </distributionManagement>

src/test/java/org/htmlunit/corejs/NativeObjectTest.java

@@ -11,6 +11,7 @@
  * Tests for NativeObject.
  *
  * @author Ahmed Ashour
+ * @author Ronald Brill
  */
 public class NativeObjectTest {
 
@@ -66,4 +67,38 @@ public Object run(final Context cx) {
 
        Utils.runWithAllOptimizationLevels(action);
     }
+
+    /**
+     * @throws Exception if the test fails
+     */
+    @Test
+    public void definePropertyUsingConsString() throws Exception {
+        final String script =
+            "  'use strict';\n"
+            + "  var log = '';\n"
+            + "  var f = function () {};\n"
+            + "  var a1='proto';\n"
+            + "  var p = a1 + 'type';\n"
+            + "  log = log + 'before: ' + f.prototype;\n"
+            + "  Object.defineProperty(f, p, {});\n"
+            + "  log = log + ' / after: ' + f.prototype;\n"
+            + "  var p = new f();\n"
+            + "  log = log + ' / ' + (p instanceof f);";
+
+        final ContextAction<Object> action = new ContextAction<Object>() {
+            @Override
+            public Object run(final Context cx) {
+                try {
+                    Scriptable scope = cx.initSafeStandardObjects();
+                    final Object o = cx.evaluateString(scope, script, "test_script", 1, null);
+                    assertEquals("before: [object Object] / after: [object Object] / true", o);
+                    return o;
+                } catch (final Exception e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        };
+
+        Utils.runWithAllOptimizationLevels(action);
+    }
 }