Verifying behavior of isAssignableFrom with array class parameter defprop
authorJaroslav Tulach <jaroslav.tulach@apidesign.org>
Sun, 22 Jun 2014 17:46:43 +0200
branchdefprop
changeset 1634783acbc99199
parent 1633 a34e2191b6be
child 1635 deef1427bbe7
Verifying behavior of isAssignableFrom with array class parameter
rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/tck/ClassTest.java
rt/emul/mini/src/main/java/java/lang/Class.java
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/rt/emul/compact/src/test/java/org/apidesign/bck2brwsr/tck/ClassTest.java	Sun Jun 22 17:46:43 2014 +0200
     1.3 @@ -0,0 +1,47 @@
     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.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 + *
    1.29 + * @author Jaroslav Tulach <jtulach@netbeans.org>
    1.30 + */
    1.31 +public class ClassTest {
    1.32 +    @Compare
    1.33 +    public boolean isDoubleArrayAssignableToObject() throws Exception {
    1.34 +        double[] dbl = new double[0];
    1.35 +        Class<?> dblCls = dbl.getClass();
    1.36 +        return Object.class.isAssignableFrom(dblCls);
    1.37 +    }
    1.38 +
    1.39 +    @Compare
    1.40 +    public boolean isDoubleArrayAssignableToString() throws Exception {
    1.41 +        double[] dbl = new double[0];
    1.42 +        Class<?> dblCls = dbl.getClass();
    1.43 +        return String.class.isAssignableFrom(dblCls);
    1.44 +    }
    1.45 +    
    1.46 +    @Factory
    1.47 +    public static Object[] create() {
    1.48 +        return VMTest.create(ClassTest.class);
    1.49 +    }
    1.50 +}
     2.1 --- a/rt/emul/mini/src/main/java/java/lang/Class.java	Sun Jun 22 17:19:16 2014 +0200
     2.2 +++ b/rt/emul/mini/src/main/java/java/lang/Class.java	Sun Jun 22 17:46:43 2014 +0200
     2.3 @@ -406,6 +406,9 @@
     2.4          if (this == cls) {
     2.5              return true;
     2.6          }
     2.7 +        if (this == Object.class) {
     2.8 +            return true;
     2.9 +        }
    2.10          
    2.11          if (isArray()) {
    2.12              final Class<?> cmpType = cls.getComponentType();
    2.13 @@ -420,6 +423,9 @@
    2.14              if (cls.isPrimitive()) {
    2.15                  return false;
    2.16              }
    2.17 +            if (cls.isArray()) {
    2.18 +                return false;
    2.19 +            }
    2.20              String prop = "$instOf_" + getName().replace('.', '_');
    2.21              return hasCnstrProperty(cls, prop);
    2.22          }