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

Extract method

Browse Source
This commit is contained in:
Andrey Breslav
2013-06-11 16:02:36 +04:00
parent 23f91e4978
commit 4756e9fde3
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/jvm/compiler/AbstractLoadJavaTest.java
+7 -3
View File
@@ -65,7 +65,7 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
Assert.assertTrue("A java file expected: " + javaFileName, javaFileName.endsWith(".java")); Assert.assertTrue("A java file expected: " + javaFileName, javaFileName.endsWith(".java"));
File javaFile = new File(javaFileName); File javaFile = new File(javaFileName);
File ktFile = new File(javaFile.getPath().replaceFirst("\\.java$", ".kt")); File ktFile = new File(javaFile.getPath().replaceFirst("\\.java$", ".kt"));
File txtFile = new File(javaFile.getPath().replaceFirst("\\.java$", ".txt")); File txtFile = getTxtFile(javaFile.getPath());
Disposable tmpDisposable = Disposer.newDisposable(); Disposable tmpDisposable = Disposer.newDisposable();
try { try {
NamespaceDescriptor kotlinNamespace = analyzeKotlinAndLoadTestNamespace(ktFile, tmpDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS); NamespaceDescriptor kotlinNamespace = analyzeKotlinAndLoadTestNamespace(ktFile, tmpDisposable, ConfigurationKind.JDK_AND_ANNOTATIONS);
@@ -114,12 +114,12 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
Pair<NamespaceDescriptor, BindingContext> javaNamespaceAndContext = compileJavaAndLoadTestNamespaceAndBindingContextFromBinary( Pair<NamespaceDescriptor, BindingContext> javaNamespaceAndContext = compileJavaAndLoadTestNamespaceAndBindingContextFromBinary(
srcFiles, compiledDir, getTestRootDisposable(), ConfigurationKind.JDK_ONLY); srcFiles, compiledDir, getTestRootDisposable(), ConfigurationKind.JDK_ONLY);
checkJavaNamespace(new File(javaFileName.replaceFirst("\\.java$", ".txt")), javaNamespaceAndContext.first, javaNamespaceAndContext.second, configuration); checkJavaNamespace(getTxtFile(javaFileName), javaNamespaceAndContext.first, javaNamespaceAndContext.second, configuration);
} }
protected void doTestSourceJava(@NotNull String javaFileName) throws Exception { protected void doTestSourceJava(@NotNull String javaFileName) throws Exception {
File originalJavaFile = new File(javaFileName); File originalJavaFile = new File(javaFileName);
File expectedFile = new File(javaFileName.replaceFirst("\\.java$", ".txt")); File expectedFile = getTxtFile(javaFileName);
File testPackageDir = new File(tmpdir, "test"); File testPackageDir = new File(tmpdir, "test");
assertTrue(testPackageDir.mkdir()); assertTrue(testPackageDir.mkdir());
@@ -229,4 +229,8 @@ public abstract class AbstractLoadJavaTest extends TestCaseWithTmpdir {
} }
}); });
} }
private static File getTxtFile(String javaFileName) {
return new File(javaFileName.replaceFirst("\\.java$", ".txt"));
}
} }