Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/.hgtags	Wed Feb 18 12:11:14 2015 -0800
     1.2 +++ b/.hgtags	Wed Feb 18 13:49:57 2015 -0800
     1.3 @@ -322,6 +322,8 @@
     1.4  4b9cc65dd24d398c4f921c0beccfb8caeaaaf584 jdk8u25-b17
     1.5  cdbf34dbef404b47805c8c85b11c65c2afaa6674 jdk8u25-b18
     1.6  4f9e65387c21831d0ea5726641a302c2ce73a4cc jdk8u25-b31
     1.7 +be20e9a00818df15af12544c21839c3a3d5768d9 jdk8u25-b32
     1.8 +a8526abf70a8c98aee5fed64eb727210745a6e5a jdk8u25-b33
     1.9  9b692a6e5f22228f822973d35610d37cb9dd9693 jdk8u31-b00
    1.10  6bf53bb6c969678488b1c073d56dd55df1a0ea17 jdk8u31-b01
    1.11  809bf97d7e70dcb3873fcbc10f12f62580b1c11d jdk8u31-b02
    1.12 @@ -336,6 +338,8 @@
    1.13  599bd596fa549d882aa8fc5104c322a75a3af728 jdk8u31-b11
    1.14  f36c71a03e4ed467f630cc46d076a5bb4c58b6d5 jdk8u31-b12
    1.15  ec36fa3b35eb00f053d624ae837579c6b8e446ac jdk8u31-b13
    1.16 +34a64e22b81bd78cf29603a80ff1f4cfc1694df8 jdk8u31-b31
    1.17 +d2b5784a3452a4fd9d1ccfefe93ee2d36662842c jdk8u31-b32
    1.18  f2925491b61b22ac42f8c30ee9c6723ffa401a4c jdk8u40-b00
    1.19  62468d841b842769d875bd97d10370585c296eb7 jdk8u40-b01
    1.20  b476c69c820ac1e05071f4de5abab8e2dff80e87 jdk8u40-b02
    1.21 @@ -358,6 +362,19 @@
    1.22  6ec61d2494283fbaca6df227f1a5b45487dc1ca7 jdk8u40-b19
    1.23  4d240320929f7b2247eeb97e43efe2370b70582e jdk8u40-b20
    1.24  dbb663a9d9aa2807ef501c7d20f29415816a1973 jdk8u40-b21
    1.25 +f9f70a0f60f48fbb95275b6c1110cedf740c6177 jdk8u40-b22
    1.26 +6ca090832d30fd0e46214ccc00816490ad75a8ab jdk8u40-b23
    1.27 +b2ce5df33715583c898530560d4202853b9ff9bc jdk8u40-b24
    1.28 +fb7b6c2b95c5661f15e8e747a63ec6d95d49fe46 jdk8u40-b25
    1.29 +05a3614ed5276e5db2a73cce918be04b1a2922fb jdk8u45-b00
    1.30 +21ec16eb7e6346c78b4fa67ccd6d2a9c58f0b696 jdk8u45-b01
    1.31 +37b3ef9a07323afd2556d6837824db154cccc874 jdk8u45-b02
    1.32 +ed3a4177da50d75d6da55ff521bf3f971cfe5214 jdk8u45-b03
    1.33 +65f24dedfd29ec02af43f745742647412d90f005 jdk8u45-b04
    1.34 +de2ee4c1341fd4eeaba39b81194df0c4274e7c8b jdk8u45-b05
    1.35 +cf0097b8987d2d2f480d8a6d2a8f235509bd4421 jdk8u45-b06
    1.36 +bb112473c7314146bebb75fb5220b4ec641b0b7a jdk8u45-b07
    1.37 +8ab14ee47c8b1558854d3cd71006eceb6c6804d1 jdk8u45-b08
    1.38  6ec61d2494283fbaca6df227f1a5b45487dc1ca7 jdk8u60-b00
    1.39  af290f203369ecf8e67b89c4a3a8df0bf535230e jdk8u60-b01
    1.40  39e0c14d45c3fee93a29993f1415b3393d03483f jdk8u60-b02

     2.1 --- a/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java	Wed Feb 18 12:11:14 2015 -0800
     2.2 +++ b/test/src/jdk/nashorn/api/scripting/ScriptEngineTest.java	Wed Feb 18 13:49:57 2015 -0800
     2.3 @@ -675,6 +675,41 @@
     2.4          assertEquals("helloworld", inv.invokeMethod(ctx.get(), "join", ""));
     2.5      }
     2.6  
     2.7 +    // @bug JDK-8068889: ConsString arguments to a functional interface wasn't converted to string.
     2.8 +    @Test
     2.9 +    public void functionalInterfaceStringTest() throws Exception {
    2.10 +        final ScriptEngineManager manager = new ScriptEngineManager();
    2.11 +        final ScriptEngine e = manager.getEngineByName("nashorn");
    2.12 +        final AtomicBoolean invoked = new AtomicBoolean(false);
    2.13 +        e.put("f", new Function<String, String>() {
    2.14 +            @Override
    2.15 +            public String apply(String t) {
    2.16 +                invoked.set(true);
    2.17 +                return t;
    2.18 +            }
    2.19 +        });
    2.20 +        assertEquals(e.eval("var x = 'a'; x += 'b'; f(x)"), "ab");
    2.21 +        assertTrue(invoked.get());
    2.22 +    }
    2.23 +
    2.24 +    // @bug JDK-8068889: ScriptObject arguments to a functional interface wasn't converted to a mirror.
    2.25 +    @Test
    2.26 +    public void functionalInterfaceObjectTest() throws Exception {
    2.27 +        final ScriptEngineManager manager = new ScriptEngineManager();
    2.28 +        final ScriptEngine e = manager.getEngineByName("nashorn");
    2.29 +        final AtomicBoolean invoked = new AtomicBoolean(false);
    2.30 +        e.put("c", new Consumer<Object>() {
    2.31 +            @Override
    2.32 +            public void accept(Object t) {
    2.33 +                assertTrue(t instanceof ScriptObjectMirror);
    2.34 +                assertEquals(((ScriptObjectMirror)t).get("a"), "xyz");
    2.35 +                invoked.set(true);
    2.36 +            }
    2.37 +        });
    2.38 +        e.eval("var x = 'xy'; x += 'z';c({a:x})");
    2.39 +        assertTrue(invoked.get());
    2.40 +    }
    2.41 +
    2.42      // @bug 8068524: NashornScriptEngineFactory.getParameter() throws IAE
    2.43      // for an unknown key, doesn't conform to the general spec
    2.44      @Test