# HG changeset patch # User Jaroslav Tulach # Date 1401277109 -7200 # Node ID a6f807104d8effc2061d3600aa5d01d5aed602c6 # Parent 752f48257d4aa94d0ff827c99ffc33ea50bb2380 Make sure Object is always available in each VM and each extension. diff -r 752f48257d4a -r a6f807104d8e rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java --- a/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java Wed May 28 10:47:18 2014 +0200 +++ b/rt/vm/src/main/java/org/apidesign/vm4brwsr/VM.java Wed May 28 13:38:29 2014 +0200 @@ -69,6 +69,7 @@ String[] both = config.classes().toArray(); final StringArray fixedNames = new StringArray(); + fixedNames.add(Object.class.getName().replace('.', '/')); fixedNames.add(Class.class.getName().replace('.', '/')); fixedNames.add(ArithmeticException.class.getName().replace('.', '/')); diff -r 752f48257d4a -r a6f807104d8e rt/vm/src/test/java/org/apidesign/vm4brwsr/ImplementExternalInterfaceTest.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/ImplementExternalInterfaceTest.java Wed May 28 13:38:29 2014 +0200 @@ -0,0 +1,58 @@ +/** + * Back 2 Browser Bytecode Translator + * Copyright (C) 2012 Jaroslav Tulach + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. Look for COPYING file in the top folder. + * If not, see http://opensource.org/licenses/GPL-2.0. + */ +package org.apidesign.vm4brwsr; + +import javax.script.ScriptEngine; +import org.testng.annotations.AfterClass; +import org.testng.annotations.BeforeClass; +import org.testng.annotations.Test; + +/** Tests whether private impl can implement public interface method + * from another extension. + * + * @author Jaroslav Tulach + */ +public class ImplementExternalInterfaceTest { + @Test public void checkHello() throws Exception { + String exp = "Hello!"; + + code.assertExec("Can extension implement class from another extension", + ImplementFactory.class, "hello__Ljava_lang_String_2", + exp + ); + } + + private static TestVM code; + + @BeforeClass + public static void compileTheCode() throws Exception { + StringBuilder sb = new StringBuilder(); + ScriptEngine[] eng = { null }; + code = TestVM.compileClassAsExtension(sb, eng, + "org/apidesign/vm4brwsr/ImplementInterface", null, null + ); + code = TestVM.compileClassesAsExtension(sb, eng, null, null, + "org/apidesign/vm4brwsr/ImplementFactory", + "org/apidesign/vm4brwsr/ImplementFactory$Impl" + ); + } + @AfterClass + public static void releaseTheCode() { + code = null; + } +} diff -r 752f48257d4a -r a6f807104d8e rt/vm/src/test/java/org/apidesign/vm4brwsr/ImplementFactory.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/ImplementFactory.java Wed May 28 13:38:29 2014 +0200 @@ -0,0 +1,47 @@ +/** + * Back 2 Browser Bytecode Translator + * Copyright (C) 2012 Jaroslav Tulach + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. Look for COPYING file in the top folder. + * If not, see http://opensource.org/licenses/GPL-2.0. + */ +package org.apidesign.vm4brwsr; + +/** + * + * @author Jaroslav Tulach + */ +public class ImplementFactory { + private ImplementFactory() { + } + + private static ImplementInterface create() { + return new Impl(); + } + + public static String hello() { + ImplementInterface i = create(); + return i.sayHello(); + } + + private static class Impl implements ImplementInterface { + + public Impl() { + } + + @Override + public String sayHello() { + return "Hello!"; + } + } +} diff -r 752f48257d4a -r a6f807104d8e rt/vm/src/test/java/org/apidesign/vm4brwsr/ImplementInterface.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/ImplementInterface.java Wed May 28 13:38:29 2014 +0200 @@ -0,0 +1,26 @@ +/** + * Back 2 Browser Bytecode Translator + * Copyright (C) 2012 Jaroslav Tulach + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. Look for COPYING file in the top folder. + * If not, see http://opensource.org/licenses/GPL-2.0. + */ +package org.apidesign.vm4brwsr; + +/** + * + * @author Jaroslav Tulach + */ +public interface ImplementInterface { + public String sayHello(); +} diff -r 752f48257d4a -r a6f807104d8e rt/vm/src/test/java/org/apidesign/vm4brwsr/TestVM.java --- a/rt/vm/src/test/java/org/apidesign/vm4brwsr/TestVM.java Wed May 28 10:47:18 2014 +0200 +++ b/rt/vm/src/test/java/org/apidesign/vm4brwsr/TestVM.java Wed May 28 13:38:29 2014 +0200 @@ -147,6 +147,12 @@ StringBuilder sb, ScriptEngine[] eng, String name, final String resourceName, final String resourceContent ) throws ScriptException, IOException { + return compileClassesAsExtension(sb, eng, resourceName, resourceContent, name); + } + static TestVM compileClassesAsExtension( + StringBuilder sb, ScriptEngine[] eng, + final String resourceName, final String resourceContent, String... names + ) throws ScriptException, IOException { if (sb == null) { sb = new StringBuilder(); } @@ -166,8 +172,9 @@ return super.get(name); } }). - addRootClasses(name). + addClasses(names). addResources("org/apidesign/vm4brwsr/obj.js"). + addExported("org/apidesign/vm4brwsr/"). obfuscation(ObfuscationLevel.FULL). library(); if (resourceName != null) {