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

Fixed test data (+ renamed test)

Browse Source
This commit is contained in:
Valentin Kipyatkov
2015-01-14 22:26:19 +03:00
parent 2e420fc312
commit 2c60201832
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/testData/diagnostics/tests/scopes/Imports-hidden.kt → compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.kt
+2 -2
View File
@@ -1,8 +1,8 @@
//FILE:a.kt //FILE:a.kt
package a package a
import <!USELESS_HIDDEN_IMPORT!>b.O<!> import <!CONFLICTING_IMPORT!>b.O<!>
import c.O import <!CONFLICTING_IMPORT!>c.O<!>
//FILE:b.kt //FILE:b.kt
package b package b
compiler/testData/diagnostics/tests/scopes/Imports-hidden.txt → compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.txt
View File
compiler/tests/org/jetbrains/kotlin/checkers/JetDiagnosticsTestGenerated.java
+6 -6
View File
@@ -9444,6 +9444,12 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName); doTest(fileName);
} }
@TestMetadata("ClassImportsConflicting.kt")
public void testClassImportsConflicting() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/ClassImportsConflicting.kt");
doTest(fileName);
}
@TestMetadata("DontImportRootScope.kt") @TestMetadata("DontImportRootScope.kt")
public void testDontImportRootScope() throws Exception { public void testDontImportRootScope() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/DontImportRootScope.kt"); String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/DontImportRootScope.kt");
@@ -9504,12 +9510,6 @@ public class JetDiagnosticsTestGenerated extends AbstractJetDiagnosticsTest {
doTest(fileName); doTest(fileName);
} }
@TestMetadata("Imports-hidden.kt")
public void testImports_hidden() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/Imports-hidden.kt");
doTest(fileName);
}
@TestMetadata("initializerScopeOfExtensionProperty.kt") @TestMetadata("initializerScopeOfExtensionProperty.kt")
public void testInitializerScopeOfExtensionProperty() throws Exception { public void testInitializerScopeOfExtensionProperty() throws Exception {
String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.kt"); String fileName = JetTestUtils.navigationMetadata("compiler/testData/diagnostics/tests/scopes/initializerScopeOfExtensionProperty.kt");