diff options
author | Yohann Roussel <yroussel@google.com> | 2015-03-31 11:23:08 +0200 |
---|---|---|
committer | Yohann Roussel <yroussel@google.com> | 2015-04-08 19:08:52 +0200 |
commit | 55a3102e8f62e4315a4d653a6699316144e5728a (patch) | |
tree | 869b47e0cdd57b50b6781a6aff9dfc80f21f6d68 | |
parent | 2b7c5bdbe7a2af93ecbb429931ff64c780bc8cc2 (diff) | |
download | toolchain_jack-55a3102e8f62e4315a4d653a6699316144e5728a.tar.gz toolchain_jack-55a3102e8f62e4315a4d653a6699316144e5728a.tar.bz2 toolchain_jack-55a3102e8f62e4315a4d653a6699316144e5728a.zip |
Test duplicate classes compilation error
Bug: 19989019
Change-Id: I77e2d9d8a9465ed27f180bbc664f248c37dc9e33
-rw-r--r-- | build.xml | 2 | ||||
-rw-r--r-- | jack-tests/.classpath | 2 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/frontend/FrontEndTests.java | 31 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/frontend/test016/jack/Duplicated.java | 21 | ||||
-rw-r--r-- | jack-tests/tests/com/android/jack/frontend/test016/jack/WithDuplicated.java | 21 |
5 files changed, 76 insertions, 1 deletions
@@ -639,6 +639,7 @@ <exclude name="com/android/jack/frontend/test013/jack/ExtendingInnerOnly.java"/> <exclude name="com/android/jack/frontend/test014/jack/ExtendingInnerInStaticContext.java"/> <exclude name="com/android/jack/frontend/test015/jack/WithOuterContextButStatic.java"/> + <exclude name="com/android/jack/frontend/test016/jack/WithDuplicated.java"/> <exclude name="com/android/jack/nopackage/jack/**"/> <exclude name="com/android/jack/java7/boxing/**"/> <exclude name="com/android/jack/java7/switches/**"/> @@ -674,6 +675,7 @@ <exclude name="com/android/jack/frontend/test013/jack/ExtendingInnerOnly.java"/> <exclude name="com/android/jack/frontend/test014/jack/ExtendingInnerInStaticContext.java"/> <exclude name="com/android/jack/frontend/test015/jack/WithOuterContextButStatic.java"/> + <exclude name="com/android/jack/frontend/test016/jack/WithDuplicated.java"/> <exclude name="com/android/jack/nopackage/jack/**"/> <exclude name="com/android/jack/java7/boxing/**"/> <exclude name="com/android/jack/java7/switches/**"/> diff --git a/jack-tests/.classpath b/jack-tests/.classpath index 9de67f42..03ac40ae 100644 --- a/jack-tests/.classpath +++ b/jack-tests/.classpath @@ -2,7 +2,7 @@ <classpath> <classpathentry kind="src" path="src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/> - <classpathentry excluding="com/android/jack/classpath/test002/lib1override/|com/android/jack/compiletime/test*/**|com/android/jack/enums/test003/link/Other.java|com/android/jack/enums/test003/link/Values.java|com/android/jack/error/test001/jack/A.java|com/android/jack/error/test002/jack/A.java|com/android/jack/jarjar/test003/dontcompile/|com/android/jack/java7/boxing/|com/android/jack/java7/exceptions/|com/android/jack/java7/parser/|com/android/jack/java7/switches/|com/android/jack/java7/trywithresources/|com/android/jack/lookup/test001/liboverride/|com/android/jack/nopackage/test*/**|com/android/jack/frontend/test002/jack/PackageName/ClassInConflictingPackage.java|com/android/jack/frontend/test005/jack/|com/android/jack/frontend/test006/jack/|com/android/jack/frontend/test007/jack/|com/android/jack/frontend/test007/jackduplicate/|com/android/jack/frontend/test008/jack/NoOuterContext.java|com/android/jack/frontend/test010/jack/UnusedLocalVar.java|com/android/jack/frontend/test013/jack/ExtendingInnerOnly.java|com/android/jack/frontend/test014/jack/ExtendingInnerInStaticContext.java|com/android/jack/frontend/test015/jack/WithOuterContextButStatic.java" kind="src" path="tests"/> + <classpathentry excluding="com/android/jack/classpath/test002/lib1override/|com/android/jack/compiletime/test*/**|com/android/jack/enums/test003/link/Other.java|com/android/jack/enums/test003/link/Values.java|com/android/jack/error/test001/jack/A.java|com/android/jack/error/test002/jack/A.java|com/android/jack/jarjar/test003/dontcompile/|com/android/jack/java7/boxing/|com/android/jack/java7/exceptions/|com/android/jack/java7/parser/|com/android/jack/java7/switches/|com/android/jack/java7/trywithresources/|com/android/jack/lookup/test001/liboverride/|com/android/jack/nopackage/test*/**|com/android/jack/frontend/test002/jack/PackageName/ClassInConflictingPackage.java|com/android/jack/frontend/test005/jack/|com/android/jack/frontend/test006/jack/|com/android/jack/frontend/test007/jack/|com/android/jack/frontend/test007/jackduplicate/|com/android/jack/frontend/test008/jack/NoOuterContext.java|com/android/jack/frontend/test010/jack/UnusedLocalVar.java|com/android/jack/frontend/test013/jack/ExtendingInnerOnly.java|com/android/jack/frontend/test014/jack/ExtendingInnerInStaticContext.java|com/android/jack/frontend/test015/jack/WithOuterContextButStatic.java|com/android/jack/frontend/test016/jack/WithDuplicated.java" kind="src" path="tests"/> <classpathentry kind="lib" path="libs/junit4.jar"/> <classpathentry kind="lib" path="libs/antlr-runtime-lib.jar"/> <classpathentry kind="lib" path="libs/dx-ref.jar"/> diff --git a/jack-tests/tests/com/android/jack/frontend/FrontEndTests.java b/jack-tests/tests/com/android/jack/frontend/FrontEndTests.java index 8018adea..a5692fbe 100644 --- a/jack-tests/tests/com/android/jack/frontend/FrontEndTests.java +++ b/jack-tests/tests/com/android/jack/frontend/FrontEndTests.java @@ -115,6 +115,37 @@ public class FrontEndTests { } /** + * Test that we do not crash and that we report the error. + */ + @Test + @Category(KnownBugs.class) + public void testDuplicated001() throws Exception { + File outDir = AbstractTestTools.createTempDir(); + + JackApiToolchainBase toolchain = + AbstractTestTools.getCandidateToolchain(JackApiToolchainBase.class); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + ByteArrayOutputStream err = new ByteArrayOutputStream(); + toolchain.setOutputStream(out); + toolchain.setErrorStream(err); + + try { + toolchain.addToClasspath(toolchain.getDefaultBootClasspath()) + .srcToLib( + outDir, + /* zipFiles= */ false, + AbstractTestTools.getTestRootDir("com.android.jack.frontend.test016.jack")); + Assert.fail(); + } catch (FrontendCompilationException e) { + Assert.assertEquals(0, out.size()); + String errString = err.toString(); + Assert.assertTrue(errString.contains("ERROR:")); + Assert.assertTrue(errString.contains("Duplicated")); + } + } + + + /** * Test that Jack is neither failing nor dropping warnings while ecj frontend is subject to skip * the local classes. */ diff --git a/jack-tests/tests/com/android/jack/frontend/test016/jack/Duplicated.java b/jack-tests/tests/com/android/jack/frontend/test016/jack/Duplicated.java new file mode 100644 index 00000000..41858c98 --- /dev/null +++ b/jack-tests/tests/com/android/jack/frontend/test016/jack/Duplicated.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2015 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.frontend.test016.jack; + +class Duplicated { + +} diff --git a/jack-tests/tests/com/android/jack/frontend/test016/jack/WithDuplicated.java b/jack-tests/tests/com/android/jack/frontend/test016/jack/WithDuplicated.java new file mode 100644 index 00000000..41858c98 --- /dev/null +++ b/jack-tests/tests/com/android/jack/frontend/test016/jack/WithDuplicated.java @@ -0,0 +1,21 @@ +/* + * Copyright (C) 2015 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.frontend.test016.jack; + +class Duplicated { + +} |