Extracted OutputFileFactory interface.
This commit is contained in:
@@ -69,7 +69,7 @@ public abstract class AbstractCheckLocalVariablesTableTest extends TestCaseWithT
|
||||
|
||||
String modifiedTestName = ktFile.getName().replace(".kt", ".class");
|
||||
boolean isClassFound = false;
|
||||
for (String filename : factory.files()) {
|
||||
for (String filename : factory.getOutputFiles()) {
|
||||
if (filename.equals(modifiedTestName)) {
|
||||
isClassFound = true;
|
||||
ClassReader cr = new ClassReader(factory.asBytes(filename));
|
||||
|
||||
@@ -40,7 +40,7 @@ public class DxChecker {
|
||||
array[0] = "testArgs";
|
||||
arguments.parse(array);
|
||||
|
||||
for (String file : factory.files()) {
|
||||
for (String file : factory.getOutputFiles()) {
|
||||
try {
|
||||
CfTranslator.translate(file, factory.asBytes(file), arguments.cfOptions, arguments.dexOptions);
|
||||
}
|
||||
|
||||
@@ -39,7 +39,7 @@ public class KotlinPackageFragmentAnnotationTest extends CodegenTestCase {
|
||||
String facadeFileName = JvmClassName.byFqNameWithoutInnerClasses(PackageClassUtils.getPackageClassFqName(NAMESPACE_NAME)).getInternalName() + ".class";
|
||||
|
||||
ClassFileFactory factory = generateClassesInFile();
|
||||
for (String fileName : factory.files()) {
|
||||
for (String fileName : factory.getOutputFiles()) {
|
||||
if (!fileName.equals(facadeFileName)) {
|
||||
// The file which is not a facade is a package fragment
|
||||
String fqName = fileName.substring(0, fileName.length() - ".class".length()).replace('/', '.');
|
||||
@@ -60,6 +60,6 @@ public class KotlinPackageFragmentAnnotationTest extends CodegenTestCase {
|
||||
}
|
||||
}
|
||||
|
||||
fail("No package fragment was found: " + factory.files());
|
||||
fail("No package fragment was found: " + factory.getOutputFiles());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -112,7 +112,7 @@ public class LineNumberTest extends TestCaseWithTmpdir {
|
||||
private static List<Integer> extractActualLineNumbersFromBytecode(@NotNull GenerationState state, boolean testFunInvoke) {
|
||||
ClassFileFactory factory = state.getFactory();
|
||||
List<Integer> actualLineNumbers = Lists.newArrayList();
|
||||
for (String filename : factory.files()) {
|
||||
for (String filename : factory.getOutputFiles()) {
|
||||
if (PackageClassUtils.isPackageClassFqName(new FqName(FileUtil.getNameWithoutExtension(filename)))) {
|
||||
// Don't test line numbers in *Package facade classes
|
||||
continue;
|
||||
|
||||
+1
-1
@@ -51,7 +51,7 @@ public class SyntheticMethodForAnnotatedPropertyGenTest extends CodegenTestCase
|
||||
public void testTopLevel() {
|
||||
loadFile();
|
||||
String packageClassName = PackageClassUtils.getPackageClassName(FqName.ROOT);
|
||||
for (String fileName : generateClassesInFile().files()) {
|
||||
for (String fileName : generateClassesInFile().getOutputFiles()) {
|
||||
if (fileName.startsWith(packageClassName) && !fileName.equals(packageClassName + ".class")) {
|
||||
// This should be package$src class
|
||||
Class<?> a = generateClass(fileName.substring(0, fileName.length() - ".class".length()));
|
||||
|
||||
@@ -82,7 +82,7 @@ public abstract class AbstractWriteFlagsTest extends UsefulTestCase {
|
||||
List<TestedObject> testedObjects = parseExpectedTestedObject(fileText);
|
||||
for (TestedObject testedObject : testedObjects) {
|
||||
String className = null;
|
||||
for (String filename : factory.files()) {
|
||||
for (String filename : factory.getOutputFiles()) {
|
||||
if (testedObject.isFullContainingClassName && filename.equals(testedObject.containingClass + ".class")) {
|
||||
className = filename;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user