From: Elliott Hughes Date: Wed, 14 Oct 2009 19:12:11 +0000 (-0700) Subject: Fix build. X-Git-Tag: android-x86-2.2~562 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=808049474c23a2e8c3849ff7700d118bc406784d;p=android-x86%2Fdalvik.git Fix build. Add missing files from https://android-git.corp.google.com/g/29998. --- diff --git a/libcore/luni-kernel/src/test/java/java/lang/reflect/AllTests.java b/libcore/luni-kernel/src/test/java/java/lang/reflect/AllTests.java new file mode 100644 index 000000000..7cf14758c --- /dev/null +++ b/libcore/luni-kernel/src/test/java/java/lang/reflect/AllTests.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package java.lang.reflect; + +import junit.framework.Test; +import junit.framework.TestSuite; + +public class AllTests { + public static final Test suite() { + TestSuite suite = tests.TestSuiteFactory.createTestSuite(); + suite.addTestSuite(java.lang.reflect.ConstructorTest.class); + suite.addTestSuite(java.lang.reflect.MethodTest.class); + return suite; + } +} diff --git a/libcore/luni-kernel/src/test/java/java/lang/reflect/ConstructorTest.java b/libcore/luni-kernel/src/test/java/java/lang/reflect/ConstructorTest.java new file mode 100644 index 000000000..e2672a891 --- /dev/null +++ b/libcore/luni-kernel/src/test/java/java/lang/reflect/ConstructorTest.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package java.lang.reflect; + +public class ConstructorTest extends junit.framework.TestCase { + public void test_getExceptionTypes() throws Exception { + Constructor constructor = ConstructorTestHelper.class.getConstructor(new Class[0]); + Class[] exceptions = constructor.getExceptionTypes(); + assertEquals(1, exceptions.length); + assertEquals(IndexOutOfBoundsException.class, exceptions[0]); + // Check that corrupting our array doesn't affect other callers. + exceptions[0] = NullPointerException.class; + exceptions = constructor.getExceptionTypes(); + assertEquals(1, exceptions.length); + assertEquals(IndexOutOfBoundsException.class, exceptions[0]); + } + + public void test_getParameterTypes() throws Exception { + Class[] expectedParameters = new Class[] { Object.class }; + Constructor constructor = ConstructorTestHelper.class.getConstructor(expectedParameters); + Class[] parameters = constructor.getParameterTypes(); + assertEquals(1, parameters.length); + assertEquals(expectedParameters[0], parameters[0]); + // Check that corrupting our array doesn't affect other callers. + parameters[0] = String.class; + parameters = constructor.getParameterTypes(); + assertEquals(1, parameters.length); + assertEquals(expectedParameters[0], parameters[0]); + } + + static class ConstructorTestHelper { + public ConstructorTestHelper() throws IndexOutOfBoundsException { } + public ConstructorTestHelper(Object o) { } + } +} diff --git a/libcore/luni-kernel/src/test/java/java/lang/reflect/MethodTest.java b/libcore/luni-kernel/src/test/java/java/lang/reflect/MethodTest.java new file mode 100644 index 000000000..ed41de95d --- /dev/null +++ b/libcore/luni-kernel/src/test/java/java/lang/reflect/MethodTest.java @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2009 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package java.lang.reflect; + +public class MethodTest extends junit.framework.TestCase { + public void test_getExceptionTypes() throws Exception { + Method method = MethodTestHelper.class.getMethod("m1", new Class[0]); + Class[] exceptions = method.getExceptionTypes(); + assertEquals(1, exceptions.length); + assertEquals(IndexOutOfBoundsException.class, exceptions[0]); + // Check that corrupting our array doesn't affect other callers. + exceptions[0] = NullPointerException.class; + exceptions = method.getExceptionTypes(); + assertEquals(1, exceptions.length); + assertEquals(IndexOutOfBoundsException.class, exceptions[0]); + } + + public void test_getParameterTypes() throws Exception { + Class[] expectedParameters = new Class[] { Object.class }; + Method method = MethodTestHelper.class.getMethod("m2", expectedParameters); + Class[] parameters = method.getParameterTypes(); + assertEquals(1, parameters.length); + assertEquals(expectedParameters[0], parameters[0]); + // Check that corrupting our array doesn't affect other callers. + parameters[0] = String.class; + parameters = method.getParameterTypes(); + assertEquals(1, parameters.length); + assertEquals(expectedParameters[0], parameters[0]); + } + + static class MethodTestHelper { + public void m1() throws IndexOutOfBoundsException { } + public void m2(Object o) { } + } +}