diff options
Diffstat (limited to 'jack-tests')
11 files changed, 152 insertions, 12 deletions
diff --git a/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping b/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping index 0bc22a5..ce343bd 100644 --- a/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping +++ b/jack-tests/tests/com/android/jack/shrob/test036/proguard.flags001.mapping @@ -7,5 +7,5 @@ com.android.jack.shrob.test036.jack.E -> com.android.jack.shrob.test036.jack.Ren com.android.jack.shrob.test036.jack.E[] values() -> renamedValues void <clinit>() -> renamed<clinit> com.android.jack.shrob.test036.jack.Kept -> com.android.jack.shrob.test036.jack.Kept: - int[] -ESwitchesValues -> renamed-ESwitchesValues - int[] -getESwitchesValues() -> renamed-getESwitchesValues + int[] -com_android_jack_shrob_test036_jack_ESwitchesValues -> renamed-com_android_jack_shrob_test036_jack_ESwitchesValues + int[] -getcom_android_jack_shrob_test036_jack_ESwitchesValues() -> renamed-getcom_android_jack_shrob_test036_jack_ESwitchesValues diff --git a/jack-tests/tests/com/android/jack/shrob/test036/refsFlattenPackage/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test036/refsFlattenPackage/expected-001.txt index 2a374d2..31a420e 100644 --- a/jack-tests/tests/com/android/jack/shrob/test036/refsFlattenPackage/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test036/refsFlattenPackage/expected-001.txt @@ -7,7 +7,7 @@ com.android.jack.shrob.test036.jack.E -> com.android.jack.shrob.test036.jack.R: com.android.jack.shrob.test036.jack.E[] values() -> jnyirg__ void <clinit>() -> <clinit> com.android.jack.shrob.test036.jack.Kept -> com.android.jack.shrob.test036.jack.Kept: - int[] -ESwitchesValues -> -RGkvhpurgJnyirg:[V + int[] -com_android_jack_shrob_test036_jack_ESwitchesValues -> -pcz_nbqfcvq_wnpx_gufco_hrgh036_wnpx_RGkvhpurgJnyirg:[V void <init>() -> <init> int kept(com.android.jack.shrob.test036.jack.E) -> kept - int[] -getESwitchesValues() -> -trhRGkvhpurgJnyirg__ + int[] -getcom_android_jack_shrob_test036_jack_ESwitchesValues() -> -trhpcz_nbqfcvq_wnpx_gufco_hrgh036_wnpx_RGkvhpurgJnyirg__ diff --git a/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt index b37150c..ecfeb9e 100644 --- a/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithMapping/expected-001.txt @@ -7,7 +7,7 @@ com.android.jack.shrob.test036.jack.E -> com.android.jack.shrob.test036.jack.Ren com.android.jack.shrob.test036.jack.E[] values() -> renamedValues void <clinit>() -> <clinit> com.android.jack.shrob.test036.jack.Kept -> com.android.jack.shrob.test036.jack.Kept: - int[] -ESwitchesValues -> renamed-ESwitchesValues + int[] -com_android_jack_shrob_test036_jack_ESwitchesValues -> renamed-com_android_jack_shrob_test036_jack_ESwitchesValues void <init>() -> <init> int kept(com.android.jack.shrob.test036.jack.E) -> kept - int[] -getESwitchesValues() -> renamed-getESwitchesValues + int[] -getcom_android_jack_shrob_test036_jack_ESwitchesValues() -> renamed-getcom_android_jack_shrob_test036_jack_ESwitchesValues diff --git a/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithoutMapping/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithoutMapping/expected-001.txt index 2a374d2..31a420e 100644 --- a/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithoutMapping/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test036/refsObfuscationWithoutMapping/expected-001.txt @@ -7,7 +7,7 @@ com.android.jack.shrob.test036.jack.E -> com.android.jack.shrob.test036.jack.R: com.android.jack.shrob.test036.jack.E[] values() -> jnyirg__ void <clinit>() -> <clinit> com.android.jack.shrob.test036.jack.Kept -> com.android.jack.shrob.test036.jack.Kept: - int[] -ESwitchesValues -> -RGkvhpurgJnyirg:[V + int[] -com_android_jack_shrob_test036_jack_ESwitchesValues -> -pcz_nbqfcvq_wnpx_gufco_hrgh036_wnpx_RGkvhpurgJnyirg:[V void <init>() -> <init> int kept(com.android.jack.shrob.test036.jack.E) -> kept - int[] -getESwitchesValues() -> -trhRGkvhpurgJnyirg__ + int[] -getcom_android_jack_shrob_test036_jack_ESwitchesValues() -> -trhpcz_nbqfcvq_wnpx_gufco_hrgh036_wnpx_RGkvhpurgJnyirg__ diff --git a/jack-tests/tests/com/android/jack/shrob/test036/refsRepackageClasses/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test036/refsRepackageClasses/expected-001.txt index db22cbd..14bd40b 100644 --- a/jack-tests/tests/com/android/jack/shrob/test036/refsRepackageClasses/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test036/refsRepackageClasses/expected-001.txt @@ -7,7 +7,7 @@ com.android.jack.shrob.test036.jack.E -> R: com.android.jack.shrob.test036.jack.E[] values() -> jnyirg__ void <clinit>() -> <clinit> com.android.jack.shrob.test036.jack.Kept -> com.android.jack.shrob.test036.jack.Kept: - int[] -ESwitchesValues -> -RGkvhpurgJnyirg:[V + int[] -com_android_jack_shrob_test036_jack_ESwitchesValues -> -pcz_nbqfcvq_wnpx_gufco_hrgh036_wnpx_RGkvhpurgJnyirg:[V void <init>() -> <init> int kept(com.android.jack.shrob.test036.jack.E) -> kept - int[] -getESwitchesValues() -> -trhRGkvhpurgJnyirg__ + int[] -getcom_android_jack_shrob_test036_jack_ESwitchesValues() -> -trhpcz_nbqfcvq_wnpx_gufco_hrgh036_wnpx_RGkvhpurgJnyirg__ diff --git a/jack-tests/tests/com/android/jack/shrob/test036/refsShrinking/expected-001.txt b/jack-tests/tests/com/android/jack/shrob/test036/refsShrinking/expected-001.txt index 856fe45..7d37309 100644 --- a/jack-tests/tests/com/android/jack/shrob/test036/refsShrinking/expected-001.txt +++ b/jack-tests/tests/com/android/jack/shrob/test036/refsShrinking/expected-001.txt @@ -7,7 +7,7 @@ Lcom/android/jack/shrob/test036/jack/E; C values()[Lcom/android/jack/shrob/test036/jack/E; <clinit>()V Lcom/android/jack/shrob/test036/jack/Kept;: -[I -ESwitchesValues +[I -com_android_jack_shrob_test036_jack_ESwitchesValues <init>()V kept(Lcom/android/jack/shrob/test036/jack/E;)I --getESwitchesValues()[I +-getcom_android_jack_shrob_test036_jack_ESwitchesValues()[I diff --git a/jack-tests/tests/com/android/jack/switchstatement/SwitchstatementTests.java b/jack-tests/tests/com/android/jack/switchstatement/SwitchstatementTests.java index f3c37a0..59eed09 100644 --- a/jack-tests/tests/com/android/jack/switchstatement/SwitchstatementTests.java +++ b/jack-tests/tests/com/android/jack/switchstatement/SwitchstatementTests.java @@ -77,6 +77,10 @@ public class SwitchstatementTests extends RuntimeTest { AbstractTestTools.getTestRootDir("com.android.jack.switchstatement.test010"), "com.android.jack.switchstatement.test010.dx.Tests"); + private RuntimeTestInfo TEST011 = new RuntimeTestInfo( + AbstractTestTools.getTestRootDir("com.android.jack.switchstatement.test011"), + "com.android.jack.switchstatement.test011.dx.Tests"); + @BeforeClass public static void setUpClass() { SwitchstatementTests.class.getClassLoader().setDefaultAssertionStatus(true); @@ -190,6 +194,12 @@ public class SwitchstatementTests extends RuntimeTest { new RuntimeTestHelper(TEST010).compileAndRunTest(); } + @Test + @Category(RuntimeRegressionTest.class) + public void test011() throws Exception { + new RuntimeTestHelper(TEST011).compileAndRunTest(); + } + @Override protected void fillRtTestInfos() { rtTestInfos.add(TEST001); diff --git a/jack-tests/tests/com/android/jack/switchstatement/test011/dx/Tests.java b/jack-tests/tests/com/android/jack/switchstatement/test011/dx/Tests.java new file mode 100644 index 0000000..e5ce6b9 --- /dev/null +++ b/jack-tests/tests/com/android/jack/switchstatement/test011/dx/Tests.java @@ -0,0 +1,38 @@ +/* + * 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.switchstatement.test011.dx; + +import com.android.jack.switchstatement.test011.jack.Switch011; +import com.android.jack.switchstatement.test011.jack.sub.Token; + +import org.junit.Assert; +import org.junit.Test; + +/** + * Tests about switches. + */ +public class Tests { + + /** + * Test verifying that two enums with the same simple name can be used into the same class. + */ + @Test + public void test1() { + Assert.assertEquals(Token.ONE, Switch011.test(null)); + Assert.assertEquals(Token.ONE, Switch011.test(Token.ONE)); + } +} diff --git a/jack-tests/tests/com/android/jack/switchstatement/test011/jack/Switch011.java b/jack-tests/tests/com/android/jack/switchstatement/test011/jack/Switch011.java new file mode 100644 index 0000000..faba9cc --- /dev/null +++ b/jack-tests/tests/com/android/jack/switchstatement/test011/jack/Switch011.java @@ -0,0 +1,50 @@ +/* + * 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.switchstatement.test011.jack; + +import com.android.jack.switchstatement.test011.jack.sub.Token; + +public class Switch011 { + + public static com.android.jack.switchstatement.test011.jack.Token getToken() { + return com.android.jack.switchstatement.test011.jack.Token.UN; + } + + public static Token test(Token t) { + if (t != null) { + switch (t) { + case ONE: + return Token.ONE; + case TWO: + return Token.TWO; + case THREE: + return Token.THREE; + } + } + com.android.jack.switchstatement.test011.jack.Token token = getToken(); + switch (token) { + case UN: + return Token.ONE; + case DEUX: + return Token.TWO; + case TROIS: + return Token.THREE; + default: + throw new AssertionError(); + } + } +} diff --git a/jack-tests/tests/com/android/jack/switchstatement/test011/jack/Token.java b/jack-tests/tests/com/android/jack/switchstatement/test011/jack/Token.java new file mode 100644 index 0000000..2ebaa4a --- /dev/null +++ b/jack-tests/tests/com/android/jack/switchstatement/test011/jack/Token.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.switchstatement.test011.jack; + +public enum Token { + UN, DEUX, TROIS +} diff --git a/jack-tests/tests/com/android/jack/switchstatement/test011/jack/sub/Token.java b/jack-tests/tests/com/android/jack/switchstatement/test011/jack/sub/Token.java new file mode 100644 index 0000000..4e8445e --- /dev/null +++ b/jack-tests/tests/com/android/jack/switchstatement/test011/jack/sub/Token.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.switchstatement.test011.jack.sub; + +public enum Token { + ONE, TWO, THREE +} |