1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/emul/compact/src/test/java/org/apidesign/bck2brwsr/compact/tck/JFXIssuesTest.java Thu Feb 14 13:17:19 2013 +0100
1.3 @@ -0,0 +1,46 @@
1.4 +/**
1.5 + * Back 2 Browser Bytecode Translator
1.6 + * Copyright (C) 2012 Jaroslav Tulach <jaroslav.tulach@apidesign.org>
1.7 + *
1.8 + * This program is free software: you can redistribute it and/or modify
1.9 + * it under the terms of the GNU General Public License as published by
1.10 + * the Free Software Foundation, version 2 of the License.
1.11 + *
1.12 + * This program is distributed in the hope that it will be useful,
1.13 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
1.14 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
1.15 + * GNU General Public License for more details.
1.16 + *
1.17 + * You should have received a copy of the GNU General Public License
1.18 + * along with this program. Look for COPYING file in the top folder.
1.19 + * If not, see http://opensource.org/licenses/GPL-2.0.
1.20 + */
1.21 +package org.apidesign.bck2brwsr.compact.tck;
1.22 +
1.23 +import org.apidesign.bck2brwsr.vmtest.Compare;
1.24 +import org.apidesign.bck2brwsr.vmtest.VMTest;
1.25 +import org.testng.annotations.Factory;
1.26 +
1.27 +
1.28 +public class JFXIssuesTest {
1.29 + private abstract class Application {
1.30 + public abstract int getID();
1.31 + }
1.32 +
1.33 + private class MyApplication extends Application {
1.34 +
1.35 + @Override
1.36 + public int getID() {
1.37 + return 1;
1.38 + }
1.39 +
1.40 + }
1.41 +
1.42 + @Compare public boolean isClassAssignable() {
1.43 + return Application.class.isAssignableFrom(MyApplication.class);
1.44 + }
1.45 +
1.46 + @Factory public static Object[] create() {
1.47 + return VMTest.create(JFXIssuesTest.class);
1.48 + }
1.49 +}
2.1 --- a/emul/mini/src/main/java/java/lang/Class.java Thu Feb 14 12:06:44 2013 +0100
2.2 +++ b/emul/mini/src/main/java/java/lang/Class.java Thu Feb 14 13:17:19 2013 +0100
2.3 @@ -401,10 +401,15 @@
2.4 return cmpType != null && getComponentType().isAssignableFrom(cmpType);
2.5 }
2.6 String prop = "$instOf_" + getName().replace('.', '_');
2.7 - return hasProperty(cls, prop);
2.8 + return hasCnstrProperty(cls, prop);
2.9 }
2.10
2.11 -
2.12 + @JavaScriptBody(args = { "who", "prop" }, body =
2.13 + "if (who.cnstr.prototype[prop]) return true; else return false;"
2.14 + )
2.15 + private static native boolean hasCnstrProperty(Object who, String prop);
2.16 +
2.17 +
2.18 /**
2.19 * Determines if the specified {@code Class} object represents an
2.20 * interface type.
3.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java Thu Feb 14 12:06:44 2013 +0100
3.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/ClassTest.java Thu Feb 14 13:17:19 2013 +0100
3.3 @@ -181,5 +181,11 @@
3.4 ) throws Exception {
3.5 StaticMethodTest.assertExec(code, codeSeq, msg, clazz, method, expRes, args);
3.6 }
3.7 + @Test public void isClassAssignable() throws Exception {
3.8 + assertExec("isAssignable works on subclasses", Classes.class,
3.9 + "isClassAssignable__Z",
3.10 + true
3.11 + );
3.12 + }
3.13
3.14 }
4.1 --- a/vm/src/test/java/org/apidesign/vm4brwsr/Classes.java Thu Feb 14 12:06:44 2013 +0100
4.2 +++ b/vm/src/test/java/org/apidesign/vm4brwsr/Classes.java Thu Feb 14 13:17:19 2013 +0100
4.3 @@ -151,4 +151,20 @@
4.4 Method m = StaticMethod.class.getMethod("sum", int.class, int.class);
4.5 return (int) m.invoke(null, a, b);
4.6 }
4.7 +
4.8 + private abstract class Application {
4.9 + public abstract int getID();
4.10 + }
4.11 +
4.12 + private class MyApplication extends Application {
4.13 + @Override
4.14 + public int getID() {
4.15 + return 1;
4.16 + }
4.17 + }
4.18 +
4.19 + public static boolean isClassAssignable() {
4.20 + return Application.class.isAssignableFrom(MyApplication.class);
4.21 + }
4.22 +
4.23 }