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

Moved class object case to namespace comparing test.

Browse Source
This commit is contained in:
Evgeny Gerashchenko
2012-12-26 22:25:16 +04:00
parent 0ce1c56999
commit 862a6ffbbc
7 changed files with 65 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/lazyResolve/descriptorRenderer/ClassObject.kt
-8
View File
@@ -1,8 +0,0 @@
trait TheTrait {
class object {
}
}
//internal trait TheTrait defined in root package
//internal class object defined in TheTrait
//private constructor <class-object-for-TheTrait>() defined in TheTrait.<class-object-for-TheTrait>
compiler/testData/lazyResolve/descriptorRenderer/ClassObject.txt
-7
View File
@@ -1,7 +0,0 @@
namespace <root>
internal abstract trait TheTrait : jet.Any {
internal final object TheTrait.<no name provided> : jet.Any {
internal final /*constructor*/ fun <init>(): TheTrait.<no name provided>
}
}
compiler/testData/lazyResolve/namespaceComparator/ClassObject.kt
+6
View File
@@ -0,0 +1,6 @@
package test
trait TheTrait {
class object {
}
}
compiler/testData/lazyResolve/namespaceComparator/classObject.txt
+8
View File
@@ -0,0 +1,8 @@
package test
internal trait TheTrait {
internal class object <class-object-for-TheTrait> {
/*primary*/ private constructor <class-object-for-TheTrait>()
}
}
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveDescriptorRendererTestGenerated.java
+45 -68
View File
@@ -27,78 +27,55 @@ import org.jetbrains.jet.test.TestMetadata;
import org.jetbrains.jet.lang.resolve.lazy.AbstractLazyResolveDescriptorRendererTest;
/** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */
@InnerTestClasses({LazyResolveDescriptorRendererTestGenerated.Renderer.class, LazyResolveDescriptorRendererTestGenerated.DescriptorRenderer.class})
@TestMetadata("compiler/testData/renderer")
public class LazyResolveDescriptorRendererTestGenerated extends AbstractLazyResolveDescriptorRendererTest {
@TestMetadata("compiler/testData/renderer")
public static class Renderer extends AbstractLazyResolveDescriptorRendererTest {
public void testAllFilesPresentInRenderer() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/renderer"), "kt", true);
}
@TestMetadata("Classes.kt")
public void testClasses() throws Exception {
doTest("compiler/testData/renderer/Classes.kt");
}
@TestMetadata("Enum.kt")
public void testEnum() throws Exception {
doTest("compiler/testData/renderer/Enum.kt");
}
@TestMetadata("ErrorType.kt")
public void testErrorType() throws Exception {
doTest("compiler/testData/renderer/ErrorType.kt");
}
@TestMetadata("FunctionTypes.kt")
public void testFunctionTypes() throws Exception {
doTest("compiler/testData/renderer/FunctionTypes.kt");
}
@TestMetadata("GlobalFunctions.kt")
public void testGlobalFunctions() throws Exception {
doTest("compiler/testData/renderer/GlobalFunctions.kt");
}
@TestMetadata("GlobalProperties.kt")
public void testGlobalProperties() throws Exception {
doTest("compiler/testData/renderer/GlobalProperties.kt");
}
@TestMetadata("InheritedMembersVisibility.kt")
public void testInheritedMembersVisibility() throws Exception {
doTest("compiler/testData/renderer/InheritedMembersVisibility.kt");
}
@TestMetadata("KeywordsInNames.kt")
public void testKeywordsInNames() throws Exception {
doTest("compiler/testData/renderer/KeywordsInNames.kt");
}
@TestMetadata("TupleTypes.kt")
public void testTupleTypes() throws Exception {
doTest("compiler/testData/renderer/TupleTypes.kt");
}
public void testAllFilesPresentInRenderer() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/renderer"), "kt", true);
}
@TestMetadata("compiler/testData/lazyResolve/descriptorRenderer")
public static class DescriptorRenderer extends AbstractLazyResolveDescriptorRendererTest {
public void testAllFilesPresentInDescriptorRenderer() throws Exception {
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/lazyResolve/descriptorRenderer"), "kt", true);
}
@TestMetadata("ClassObject.kt")
public void testClassObject() throws Exception {
doTest("compiler/testData/lazyResolve/descriptorRenderer/ClassObject.kt");
}
@TestMetadata("Classes.kt")
public void testClasses() throws Exception {
doTest("compiler/testData/renderer/Classes.kt");
}
public static Test suite() {
TestSuite suite = new TestSuite("LazyResolveDescriptorRendererTestGenerated");
suite.addTestSuite(Renderer.class);
suite.addTestSuite(DescriptorRenderer.class);
return suite;
@TestMetadata("Enum.kt")
public void testEnum() throws Exception {
doTest("compiler/testData/renderer/Enum.kt");
}
@TestMetadata("ErrorType.kt")
public void testErrorType() throws Exception {
doTest("compiler/testData/renderer/ErrorType.kt");
}
@TestMetadata("FunctionTypes.kt")
public void testFunctionTypes() throws Exception {
doTest("compiler/testData/renderer/FunctionTypes.kt");
}
@TestMetadata("GlobalFunctions.kt")
public void testGlobalFunctions() throws Exception {
doTest("compiler/testData/renderer/GlobalFunctions.kt");
}
@TestMetadata("GlobalProperties.kt")
public void testGlobalProperties() throws Exception {
doTest("compiler/testData/renderer/GlobalProperties.kt");
}
@TestMetadata("InheritedMembersVisibility.kt")
public void testInheritedMembersVisibility() throws Exception {
doTest("compiler/testData/renderer/InheritedMembersVisibility.kt");
}
@TestMetadata("KeywordsInNames.kt")
public void testKeywordsInNames() throws Exception {
doTest("compiler/testData/renderer/KeywordsInNames.kt");
}
@TestMetadata("TupleTypes.kt")
public void testTupleTypes() throws Exception {
doTest("compiler/testData/renderer/TupleTypes.kt");
}
}
compiler/tests/org/jetbrains/jet/lang/resolve/lazy/LazyResolveNamespaceComparingTestGenerated.java
+5
View File
@@ -1816,6 +1816,11 @@ public class LazyResolveNamespaceComparingTestGenerated extends AbstractLazyReso
JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/lazyResolve/namespaceComparator"), "kt", true);
}
@TestMetadata("classObject.kt")
public void testClassObject() throws Exception {
doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/classObject.kt");
}
@TestMetadata("classObjectAnnotation.kt")
public void testClassObjectAnnotation() throws Exception {
doTestCheckingPrimaryConstructors("compiler/testData/lazyResolve/namespaceComparator/classObjectAnnotation.kt");
generators/org/jetbrains/jet/generators/tests/GenerateTests.java
+1 -2
View File
@@ -170,8 +170,7 @@ public class GenerateTests {
"compiler/tests/",
"LazyResolveDescriptorRendererTestGenerated",
AbstractLazyResolveDescriptorRendererTest.class,
testModel("compiler/testData/renderer"),
testModel("compiler/testData/lazyResolve/descriptorRenderer")
testModel("compiler/testData/renderer")
);
// TODO test is temporarily disabled