infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-16 00:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

6736248: EnumEditor bug. Class check incorrect

Browse Source 
Reviewed-by: rupashka, alexp
This commit is contained in:
Sergey Malenkov 2008-12-25 20:43:44 +03:00
parent 9330abadea
commit aa3da7789a
5 changed files with 202 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/src/share/classes/sun/beans/editors/EnumEditor.java
View File

@ -67,7 +67,7 @@ public final class EnumEditor implements PropertyEditor {
}
public void setValue( Object value ) {
if ( ( value != null ) && ( this.type != value.getClass() ) ) {
if ( ( value != null ) && !this.type.isInstance( value ) ) {
throw new IllegalArgumentException( "Unsupported value: " + value );
}
Object oldValue;

50
jdk/test/java/beans/PropertyEditor/TestEnumSubclass.java Normal file
View File

@ -0,0 +1,50 @@
/*
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code 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
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6736248
* @summary Tests PropertyEditor for value of subtype Enum with security manager
* @author Sergey Malenkov
*/
public class TestEnumSubclass {
public static void main(String[] args) {
System.setSecurityManager(new SecurityManager());
new TestEditor(Operation.class);
}
public enum Operation {
PLUS {
public int run(int i, int j) {
return i + j;
}
},
MINUS {
public int run(int i, int j) {
return i - j;
}
};
public abstract int run(int i, int j);
}
}

49
jdk/test/java/beans/PropertyEditor/TestEnumSubclassJava.java Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code 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
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6736248
* @summary Tests PropertyEditor for value of subtype Enum
* @author Sergey Malenkov
*/
public class TestEnumSubclassJava {
public static void main(String[] args) {
new TestEditor(Operation.class).testJava(Operation.PLUS);
}
public enum Operation {
PLUS {
public int run(int i, int j) {
return i + j;
}
},
MINUS {
public int run(int i, int j) {
return i - j;
}
};
public abstract int run(int i, int j);
}
}

49
jdk/test/java/beans/PropertyEditor/TestEnumSubclassNull.java Normal file
View File

@ -0,0 +1,49 @@
/*
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code 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
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6736248
* @summary Tests PropertyEditor for null value of subtype Enum
* @author Sergey Malenkov
*/
public class TestEnumSubclassNull {
public static void main(String[] args) {
new TestEditor(Operation.class).testJava(null);
}
public enum Operation {
PLUS {
public int run(int i, int j) {
return i + j;
}
},
MINUS {
public int run(int i, int j) {
return i - j;
}
};
public abstract int run(int i, int j);
}
}

53
jdk/test/java/beans/PropertyEditor/TestEnumSubclassValue.java Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code 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
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6736248
* @summary Tests PropertyEditor for value of subtype Enum
* @author Sergey Malenkov
*/
public class TestEnumSubclassValue {
public static void main(String[] args) {
TestEditor test = new TestEditor(Operation.class);
test.testValue(Operation.PLUS, "PLUS");
test.testValue(null, null);
test.testText("MINUS", Operation.MINUS);
test.testText(null, null);
}
public enum Operation {
PLUS {
public int run(int i, int j) {
return i + j;
}
},
MINUS {
public int run(int i, int j) {
return i - j;
}
};
public abstract int run(int i, int j);
}
}