Merge "Add tests for missing classes"
diff --git a/test/122-missing-classes/build b/test/122-missing-classes/build
new file mode 100644
index 0000000..62e57c8
--- /dev/null
+++ b/test/122-missing-classes/build
@@ -0,0 +1,28 @@
+#!/bin/bash
+#
+# Copyright (C) 2012 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.
+
+# Stop if something fails.
+set -e
+
+mkdir classes
+
+# Some classes are available at compile time...
+${JAVAC} -d classes `find src -name '*.java'`
+
+# ...but not at run time.
+rm 'classes/MissingClass.class'
+rm 'classes/Main$MissingInnerClass.class'
+${DX} -JXmx256m --debug --dex --output=$TEST_NAME.jar classes
diff --git a/test/122-missing-classes/expected.txt b/test/122-missing-classes/expected.txt
new file mode 100644
index 0000000..ce761c3
--- /dev/null
+++ b/test/122-missing-classes/expected.txt
@@ -0,0 +1,6 @@
+Test Started
+testMissingFieldType caught NoClassDefFoundError
+testMissingMethodReturnType caught NoClassDefFoundError
+testMissingMethodParameterType caught NoClassDefFoundError
+testMissingInnerClass caught NoClassDefFoundError
+Test Finished
diff --git a/test/122-missing-classes/info.txt b/test/122-missing-classes/info.txt
new file mode 100644
index 0000000..a734f99
--- /dev/null
+++ b/test/122-missing-classes/info.txt
@@ -0,0 +1 @@
+Tests the effects of missing classes.
diff --git a/test/122-missing-classes/src/Main.java b/test/122-missing-classes/src/Main.java
new file mode 100644
index 0000000..1667d2d
--- /dev/null
+++ b/test/122-missing-classes/src/Main.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+public final class Main {
+
+ public static void main(String[] args) throws Exception {
+ System.out.println("Test Started");
+ testMissingFieldType();
+ testMissingMethodReturnType();
+ testMissingMethodParameterType();
+ testMissingInnerClass();
+ System.out.println("Test Finished");
+ }
+
+ private static class ClassWithMissingFieldType {
+ MissingClass field;
+ }
+
+ private static void testMissingFieldType() throws Exception {
+ try {
+ ClassWithMissingFieldType.class.getDeclaredFields();
+ throw new AssertionError();
+ } catch (NoClassDefFoundError e) {
+ System.out.println("testMissingFieldType caught NoClassDefFoundError");
+ }
+ }
+
+ private static class ClassWithMissingMethodReturnType {
+ MissingClass method() {
+ return null;
+ }
+ }
+
+ private static void testMissingMethodReturnType() throws Exception {
+ try {
+ ClassWithMissingMethodReturnType.class.getDeclaredMethods();
+ throw new AssertionError();
+ } catch (NoClassDefFoundError e) {
+ System.out.println("testMissingMethodReturnType caught NoClassDefFoundError");
+ }
+ }
+
+ private static class ClassWithMissingMethodParameterType {
+ void method(MissingClass arg) {}
+ }
+
+ private static void testMissingMethodParameterType() throws Exception {
+ try {
+ ClassWithMissingMethodParameterType.class.getDeclaredMethods();
+ throw new AssertionError();
+ } catch (NoClassDefFoundError e) {
+ System.out.println("testMissingMethodParameterType caught NoClassDefFoundError");
+ }
+ }
+
+ private static final class MissingInnerClass {
+ }
+
+ private static void testMissingInnerClass() throws Exception {
+ try {
+ Main.class.getDeclaredClasses();
+ throw new AssertionError();
+ } catch (NoClassDefFoundError e) {
+ System.out.println("testMissingInnerClass caught NoClassDefFoundError");
+ }
+ }
+}
diff --git a/test/122-missing-classes/src/MissingClass.java b/test/122-missing-classes/src/MissingClass.java
new file mode 100644
index 0000000..33aaa56
--- /dev/null
+++ b/test/122-missing-classes/src/MissingClass.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
+public final class MissingClass {
+ public static final class MissingInnerClass {
+ }
+}
