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

correct access flags for package private (coming from java) #KT-2781 fixed

Browse Source
This commit is contained in:
Alex Tkachman
2012-09-16 10:08:36 +03:00
parent 99196c187b
commit e317764a88
8 changed files with 74 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/codegen/CodegenTestCase.java
+29 -5
View File
@@ -156,8 +156,12 @@ public abstract class CodegenTestCase extends UsefulTestCase {
}
protected void blackBoxFile(String filename, String expected) {
blackBoxFile(filename, expected, false);
}
protected void blackBoxFile(String filename, String expected, boolean classPathInTheSameClassLoader) {
loadFile(filename);
blackBox(expected);
blackBox(expected, classPathInTheSameClassLoader);
}
protected void blackBoxFileByFullPath(String filename) {
@@ -214,9 +218,13 @@ public abstract class CodegenTestCase extends UsefulTestCase {
}
protected void blackBox(String expected) {
blackBox(expected, false);
}
protected void blackBox(String expected, boolean classPathInTheSameClassLoader) {
GenerationState state = generateClassesInFileGetState();
GeneratedClassLoader loader = createClassLoader(state.getFactory());
GeneratedClassLoader loader = createClassLoader(state.getFactory(), classPathInTheSameClassLoader);
String r;
@@ -275,6 +283,10 @@ public abstract class CodegenTestCase extends UsefulTestCase {
}
protected void blackBoxFileWithJava(@NotNull String ktFile) throws Exception {
blackBoxFileWithJava(ktFile, false);
}
protected void blackBoxFileWithJava(@NotNull String ktFile, boolean classPathInTheSameClassLoader) throws Exception {
File javaClassesTempDirectory = new File(FileUtil.getTempDirectory(), "java-classes");
JetTestUtils.mkdirs(javaClassesTempDirectory);
List<String> options = Arrays.asList(
@@ -287,10 +299,14 @@ public abstract class CodegenTestCase extends UsefulTestCase {
myEnvironment = new JetCoreEnvironment(getTestRootDisposable(), CompileCompilerDependenciesTest.compilerConfigurationForTests(
ConfigurationKind.JDK_ONLY, TestJdkKind.MOCK_JDK, JetTestUtils.getAnnotationsJar(), javaClassesTempDirectory));
blackBoxFile(ktFile);
blackBoxFile(ktFile, "OK", classPathInTheSameClassLoader);
}
protected GeneratedClassLoader createClassLoader(ClassFileFactory codegens) {
return createClassLoader(codegens, false);
}
protected GeneratedClassLoader createClassLoader(ClassFileFactory codegens, boolean classPathInTheSameClassLoader) {
List<URL> urls = Lists.newArrayList();
for (File file : myEnvironment.getConfiguration().getList(JVMConfigurationKeys.CLASSPATH_KEY)) {
try {
@@ -299,8 +315,16 @@ public abstract class CodegenTestCase extends UsefulTestCase {
throw new RuntimeException(e);
}
}
ClassLoader parentClassLoader = new URLClassLoader(urls.toArray(new URL[0]), CodegenTestCase.class.getClassLoader());
return new GeneratedClassLoader(codegens, parentClassLoader);
final URL[] urlsArray = urls.toArray(new URL[0]);
if (!classPathInTheSameClassLoader) {
ClassLoader parentClassLoader = new URLClassLoader(urlsArray, CodegenTestCase.class.getClassLoader());
return new GeneratedClassLoader(codegens, parentClassLoader);
}
else {
return new GeneratedClassLoader(codegens, CodegenTestCase.class.getClassLoader(), urlsArray);
}
}
protected String generateToText() {