2 files changed, 77 insertions, 0 deletions
diff --git a/jack-tests/tests/com/android/jack/conditional/test004/dx/Tests.java b/jack-tests/tests/com/android/jack/conditional/test004/dx/Tests.java
new file mode 100644
index 0000000..9307a30
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/conditional/test004/dx/Tests.java
@@ -0,0 +1,47 @@
+/*
+ * 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.
+ */
+
+package com.android.jack.conditional.test004.dx;
+
+import com.android.jack.conditional.test004.jack.Conditional004;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+public class Tests {
+
+  @Test
+  public void test1() {
+    Assert.assertEquals(2, Conditional004.get(false));
+    try {
+      Conditional004.get(true);
+      Assert.fail();
+    } catch (NullPointerException e) {
+      // expected
+    }
+  }
+
+  @Test
+  public void test2() {
+    Assert.assertEquals(2, Conditional004.get2(true));
+    try {
+      Conditional004.get2(false);
+      Assert.fail();
+    } catch (NullPointerException e) {
+      // expected
+    }
+  }
+}
diff --git a/jack-tests/tests/com/android/jack/conditional/test004/jack/Conditional004.java b/jack-tests/tests/com/android/jack/conditional/test004/jack/Conditional004.java
new file mode 100644
index 0000000..e93eb2c
--- /dev/null
+++ b/jack-tests/tests/com/android/jack/conditional/test004/jack/Conditional004.java
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+package com.android.jack.conditional.test004.jack;
+
+public class Conditional004 {
+
+  @SuppressWarnings("boxing")
+  public static int get(boolean cond) {
+    return cond ? null : 2;
+  }
+
+  @SuppressWarnings("boxing")
+  public static int get2(boolean cond) {
+    return cond ? 2 : null;
+  }
+}