azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move JdkAnnotationsTest to boxWithStdlib

Browse Source
This commit is contained in:
Alexander Udalov
2013-02-07 22:04:59 +04:00
committed by Alexander Udalov
parent f994c9924f
commit 31231fe18b
6 changed files with 30 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/codegen/jdk-annotations/arrayList.kt → compiler/testData/codegen/boxWithStdlib/jdkAnnotations/arrayList.kt
View File
compiler/testData/codegen/jdk-annotations/hashMap.kt → compiler/testData/codegen/boxWithStdlib/jdkAnnotations/hashMap.kt
View File
compiler/testData/codegen/jdk-annotations/iteratingOverHashMap.kt → compiler/testData/codegen/boxWithStdlib/jdkAnnotations/iteratingOverHashMap.kt
View File
compiler/testData/codegen/regressions/kt1397.kt → compiler/testData/codegen/boxWithStdlib/jdkAnnotations/kt1397.kt
View File
compiler/tests/org/jetbrains/jet/codegen/JdkAnnotationsTest.java
-48
View File
@@ -1,48 +0,0 @@
/*
* Copyright 2010-2013 JetBrains s.r.o.
*
* 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 org.jetbrains.jet.codegen;
import org.jetbrains.jet.ConfigurationKind;
/**
* Test correct code is generated for descriptors loaded with alt jdk annotations
*/
public class JdkAnnotationsTest extends CodegenTestCase {
@Override
protected void setUp() throws Exception {
super.setUp();
createEnvironmentWithMockJdkAndIdeaAnnotations(ConfigurationKind.JDK_AND_ANNOTATIONS);
}
public void testArrayList() {
blackBoxFile("jdk-annotations/arrayList.kt");
}
public void testHashMap() {
blackBoxFile("jdk-annotations/hashMap.kt");
}
//moved from PrimitiveTypesTest
public void testKt1397() {
blackBoxFile("regressions/kt1397.kt");
}
public void testIteratingOverHashMap() {
blackBoxFile("jdk-annotations/iteratingOverHashMap.kt");
}
}
compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithStdlibCodegenTestGenerated.java
+30 -1
View File
@@ -31,7 +31,7 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxWithStdlibCodegenTest
/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
@SuppressWarnings("all")
@TestMetadata("compiler/testData/codegen/boxWithStdlib")
@InnerTestClasses({BlackBoxWithStdlibCodegenTestGenerated.DataClasses.class, BlackBoxWithStdlibCodegenTestGenerated.FullJdk.class, BlackBoxWithStdlibCodegenTestGenerated.Ranges.class, BlackBoxWithStdlibCodegenTestGenerated.Regressions.class})
@InnerTestClasses({BlackBoxWithStdlibCodegenTestGenerated.DataClasses.class, BlackBoxWithStdlibCodegenTestGenerated.FullJdk.class, BlackBoxWithStdlibCodegenTestGenerated.JdkAnnotations.class, BlackBoxWithStdlibCodegenTestGenerated.Ranges.class, BlackBoxWithStdlibCodegenTestGenerated.Regressions.class})
public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxWithStdlibCodegenTest {
public void testAllFilesPresentInBoxWithStdlib() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithStdlib"), Pattern.compile("^(.+)\\.kt$"), true);
@@ -355,6 +355,34 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxWith
}
@TestMetadata("compiler/testData/codegen/boxWithStdlib/jdkAnnotations")
public static class JdkAnnotations extends AbstractBlackBoxWithStdlibCodegenTest {
public void testAllFilesPresentInJdkAnnotations() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithStdlib/jdkAnnotations"), Pattern.compile("^(.+)\\.kt$"), true);
}
@TestMetadata("arrayList.kt")
public void testArrayList() throws Exception {
blackBoxFileByFullPath("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/arrayList.kt");
}
@TestMetadata("hashMap.kt")
public void testHashMap() throws Exception {
blackBoxFileByFullPath("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/hashMap.kt");
}
@TestMetadata("iteratingOverHashMap.kt")
public void testIteratingOverHashMap() throws Exception {
blackBoxFileByFullPath("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/iteratingOverHashMap.kt");
}
@TestMetadata("kt1397.kt")
public void testKt1397() throws Exception {
blackBoxFileByFullPath("compiler/testData/codegen/boxWithStdlib/jdkAnnotations/kt1397.kt");
}
}
@TestMetadata("compiler/testData/codegen/boxWithStdlib/ranges")
@InnerTestClasses({Ranges.Expression.class, Ranges.Literal.class})
public static class Ranges extends AbstractBlackBoxWithStdlibCodegenTest {
@@ -670,6 +698,7 @@ public class BlackBoxWithStdlibCodegenTestGenerated extends AbstractBlackBoxWith
suite.addTestSuite(BlackBoxWithStdlibCodegenTestGenerated.class);
suite.addTest(DataClasses.innerSuite());
suite.addTestSuite(FullJdk.class);
suite.addTestSuite(JdkAnnotations.class);
suite.addTest(Ranges.innerSuite());
suite.addTestSuite(Regressions.class);
return suite;