diff --git a/compiler/testData/codegen/boxWithJava/annotations/javaAnnotationCall.java b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotations/javaAnnotationCall.java rename to compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.java diff --git a/compiler/testData/codegen/boxWithJava/annotations/javaAnnotationCall.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotations/javaAnnotationCall.kt rename to compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt diff --git a/compiler/testData/codegen/boxWithJava/annotations/javaAnnotationDefault.java b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotations/javaAnnotationDefault.java rename to compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.java diff --git a/compiler/testData/codegen/boxWithJava/annotations/javaAnnotationDefault.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotations/javaAnnotationDefault.kt rename to compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt diff --git a/compiler/testData/codegen/boxWithJava/annotations/javaNegativePropertyAsAnnotationParameter.java b/compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotations/javaNegativePropertyAsAnnotationParameter.java rename to compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.java diff --git a/compiler/testData/codegen/boxWithJava/annotations/javaNegativePropertyAsAnnotationParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotations/javaNegativePropertyAsAnnotationParameter.kt rename to compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt diff --git a/compiler/testData/codegen/boxWithJava/annotations/javaPropertyAsAnnotationParameter.java b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotations/javaPropertyAsAnnotationParameter.java rename to compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.java diff --git a/compiler/testData/codegen/boxWithJava/annotations/javaPropertyAsAnnotationParameter.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotations/javaPropertyAsAnnotationParameter.kt rename to compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt diff --git a/compiler/testData/codegen/boxWithJava/annotations/javaPropertyWithIntInitializer.java b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotations/javaPropertyWithIntInitializer.java rename to compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.java diff --git a/compiler/testData/codegen/boxWithJava/annotations/javaPropertyWithIntInitializer.kt b/compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotations/javaPropertyWithIntInitializer.kt rename to compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt diff --git a/compiler/testData/codegen/boxWithJava/annotations/RetentionInJava.java b/compiler/testData/codegen/boxAgainstJava/annotations/retentionInJava.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotations/RetentionInJava.java rename to compiler/testData/codegen/boxAgainstJava/annotations/retentionInJava.java diff --git a/compiler/testData/codegen/boxWithJava/annotations/RetentionInJava.kt b/compiler/testData/codegen/boxAgainstJava/annotations/retentionInJava.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/annotations/RetentionInJava.kt rename to compiler/testData/codegen/boxAgainstJava/annotations/retentionInJava.kt diff --git a/compiler/testData/codegen/boxWithJava/callableReference/constructor.java b/compiler/testData/codegen/boxAgainstJava/callableReference/constructor.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/callableReference/constructor.java rename to compiler/testData/codegen/boxAgainstJava/callableReference/constructor.java diff --git a/compiler/testData/codegen/boxWithJava/callableReference/constructor.kt b/compiler/testData/codegen/boxAgainstJava/callableReference/constructor.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/callableReference/constructor.kt rename to compiler/testData/codegen/boxAgainstJava/callableReference/constructor.kt diff --git a/compiler/testData/codegen/boxWithJava/constructor/genericConstructor.java b/compiler/testData/codegen/boxAgainstJava/constructor/genericConstructor.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/constructor/genericConstructor.java rename to compiler/testData/codegen/boxAgainstJava/constructor/genericConstructor.java diff --git a/compiler/testData/codegen/boxWithJava/constructor/genericConstructor.kt b/compiler/testData/codegen/boxAgainstJava/constructor/genericConstructor.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/constructor/genericConstructor.kt rename to compiler/testData/codegen/boxAgainstJava/constructor/genericConstructor.kt diff --git a/compiler/testData/codegen/boxWithJava/delegation/delegationAndInheritanceFromJava.java b/compiler/testData/codegen/boxAgainstJava/delegation/delegationAndInheritanceFromJava.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/delegation/delegationAndInheritanceFromJava.java rename to compiler/testData/codegen/boxAgainstJava/delegation/delegationAndInheritanceFromJava.java diff --git a/compiler/testData/codegen/boxWithJava/delegation/delegationAndInheritanceFromJava.kt b/compiler/testData/codegen/boxAgainstJava/delegation/delegationAndInheritanceFromJava.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/delegation/delegationAndInheritanceFromJava.kt rename to compiler/testData/codegen/boxAgainstJava/delegation/delegationAndInheritanceFromJava.kt diff --git a/compiler/testData/codegen/boxWithJava/enum/simpleJavaEnum.java b/compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnum.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/enum/simpleJavaEnum.java rename to compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnum.java diff --git a/compiler/testData/codegen/boxWithJava/enum/simpleJavaEnum.kt b/compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnum.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/enum/simpleJavaEnum.kt rename to compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnum.kt diff --git a/compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithFunction.java b/compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithFunction.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithFunction.java rename to compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithFunction.java diff --git a/compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithFunction.kt b/compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithFunction.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithFunction.kt rename to compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithFunction.kt diff --git a/compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithStaticImport.java b/compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithStaticImport.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithStaticImport.java rename to compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithStaticImport.java diff --git a/compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithStaticImport.kt b/compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithStaticImport.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithStaticImport.kt rename to compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithStaticImport.kt diff --git a/compiler/testData/codegen/boxWithJava/enum/simpleJavaInnerEnum.java b/compiler/testData/codegen/boxAgainstJava/enum/simpleJavaInnerEnum.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/enum/simpleJavaInnerEnum.java rename to compiler/testData/codegen/boxAgainstJava/enum/simpleJavaInnerEnum.java diff --git a/compiler/testData/codegen/boxWithJava/enum/simpleJavaInnerEnum.kt b/compiler/testData/codegen/boxAgainstJava/enum/simpleJavaInnerEnum.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/enum/simpleJavaInnerEnum.kt rename to compiler/testData/codegen/boxAgainstJava/enum/simpleJavaInnerEnum.kt diff --git a/compiler/testData/codegen/boxWithJava/enum/staticField.java b/compiler/testData/codegen/boxAgainstJava/enum/staticField.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/enum/staticField.java rename to compiler/testData/codegen/boxAgainstJava/enum/staticField.java diff --git a/compiler/testData/codegen/boxWithJava/enum/staticField.kt b/compiler/testData/codegen/boxAgainstJava/enum/staticField.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/enum/staticField.kt rename to compiler/testData/codegen/boxAgainstJava/enum/staticField.kt diff --git a/compiler/testData/codegen/boxWithJava/enum/staticMethod.java b/compiler/testData/codegen/boxAgainstJava/enum/staticMethod.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/enum/staticMethod.java rename to compiler/testData/codegen/boxAgainstJava/enum/staticMethod.java diff --git a/compiler/testData/codegen/boxWithJava/enum/staticMethod.kt b/compiler/testData/codegen/boxAgainstJava/enum/staticMethod.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/enum/staticMethod.kt rename to compiler/testData/codegen/boxAgainstJava/enum/staticMethod.kt diff --git a/compiler/testData/codegen/boxWithJava/functions/constructor.java b/compiler/testData/codegen/boxAgainstJava/functions/constructor.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/functions/constructor.java rename to compiler/testData/codegen/boxAgainstJava/functions/constructor.java diff --git a/compiler/testData/codegen/boxWithJava/functions/constructor.kt b/compiler/testData/codegen/boxAgainstJava/functions/constructor.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/functions/constructor.kt rename to compiler/testData/codegen/boxAgainstJava/functions/constructor.kt diff --git a/compiler/testData/codegen/boxWithJava/functions/max.java b/compiler/testData/codegen/boxAgainstJava/functions/max.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/functions/max.java rename to compiler/testData/codegen/boxAgainstJava/functions/max.java diff --git a/compiler/testData/codegen/boxWithJava/functions/max.kt b/compiler/testData/codegen/boxAgainstJava/functions/max.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/functions/max.kt rename to compiler/testData/codegen/boxAgainstJava/functions/max.kt diff --git a/compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethod.java b/compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethod.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethod.java rename to compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethod.java diff --git a/compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethod.kt b/compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethod.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethod.kt rename to compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethod.kt diff --git a/compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethodL2.java b/compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethodL2.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethodL2.java rename to compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethodL2.java diff --git a/compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethodL2.kt b/compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethodL2.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethodL2.kt rename to compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethodL2.kt diff --git a/compiler/testData/codegen/boxWithJava/functions/unrelatedUpperBounds.java b/compiler/testData/codegen/boxAgainstJava/functions/unrelatedUpperBounds.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/functions/unrelatedUpperBounds.java rename to compiler/testData/codegen/boxAgainstJava/functions/unrelatedUpperBounds.java diff --git a/compiler/testData/codegen/boxWithJava/functions/unrelatedUpperBounds.kt b/compiler/testData/codegen/boxAgainstJava/functions/unrelatedUpperBounds.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/functions/unrelatedUpperBounds.kt rename to compiler/testData/codegen/boxAgainstJava/functions/unrelatedUpperBounds.kt diff --git a/compiler/testData/codegen/boxWithJava/innerClass/kt3532.java b/compiler/testData/codegen/boxAgainstJava/innerClass/kt3532.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/innerClass/kt3532.java rename to compiler/testData/codegen/boxAgainstJava/innerClass/kt3532.java diff --git a/compiler/testData/codegen/boxWithJava/innerClass/kt3532.kt b/compiler/testData/codegen/boxAgainstJava/innerClass/kt3532.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/innerClass/kt3532.kt rename to compiler/testData/codegen/boxAgainstJava/innerClass/kt3532.kt diff --git a/compiler/testData/codegen/boxWithJava/innerClass/kt3812.java b/compiler/testData/codegen/boxAgainstJava/innerClass/kt3812.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/innerClass/kt3812.java rename to compiler/testData/codegen/boxAgainstJava/innerClass/kt3812.java diff --git a/compiler/testData/codegen/boxWithJava/innerClass/kt3812.kt b/compiler/testData/codegen/boxAgainstJava/innerClass/kt3812.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/innerClass/kt3812.kt rename to compiler/testData/codegen/boxAgainstJava/innerClass/kt3812.kt diff --git a/compiler/testData/codegen/boxWithJava/innerClass/kt4036.java b/compiler/testData/codegen/boxAgainstJava/innerClass/kt4036.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/innerClass/kt4036.java rename to compiler/testData/codegen/boxAgainstJava/innerClass/kt4036.java diff --git a/compiler/testData/codegen/boxWithJava/innerClass/kt4036.kt b/compiler/testData/codegen/boxAgainstJava/innerClass/kt4036.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/innerClass/kt4036.kt rename to compiler/testData/codegen/boxAgainstJava/innerClass/kt4036.kt diff --git a/compiler/testData/codegen/boxWithJava/property/fieldAccessFromExtensionInTraitImpl.java b/compiler/testData/codegen/boxAgainstJava/property/fieldAccessFromExtensionInTraitImpl.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/property/fieldAccessFromExtensionInTraitImpl.java rename to compiler/testData/codegen/boxAgainstJava/property/fieldAccessFromExtensionInTraitImpl.java diff --git a/compiler/testData/codegen/boxWithJava/property/fieldAccessFromExtensionInTraitImpl.kt b/compiler/testData/codegen/boxAgainstJava/property/fieldAccessFromExtensionInTraitImpl.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/property/fieldAccessFromExtensionInTraitImpl.kt rename to compiler/testData/codegen/boxAgainstJava/property/fieldAccessFromExtensionInTraitImpl.kt diff --git a/compiler/testData/codegen/boxWithJava/property/fieldAccessViaSubclass.java b/compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/property/fieldAccessViaSubclass.java rename to compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.java diff --git a/compiler/testData/codegen/boxWithJava/property/fieldAccessViaSubclass.kt b/compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/property/fieldAccessViaSubclass.kt rename to compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/callAbstractAdapter.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/callAbstractAdapter.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/callAbstractAdapter.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/callAbstractAdapter.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/callAbstractAdapter.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/callAbstractAdapter.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/callAbstractAdapter.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/callAbstractAdapter.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/comparator.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/comparator.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/comparator.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/comparator.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/comparator.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/comparator.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/comparator.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/comparator.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/constructor.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/constructor.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/constructor.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/constructor.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/constructor.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/constructor.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/constructor.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/constructor.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/fileFilter.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/fileFilter.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/fileFilter.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/fileFilter.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/fileFilter.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/fileFilter.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/fileFilter.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/fileFilter.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/genericSignature.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/genericSignature.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/genericSignature.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/genericSignature.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/genericSignature.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/genericSignature.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/genericSignature.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/genericSignature.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/implementAdapter.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/implementAdapter.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/implementAdapter.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/implementAdapter.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedInKotlin.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/inheritedInKotlin.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedInKotlin.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/inheritedInKotlin.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedSimple.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedSimple.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/inheritedSimple.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedSimple.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedSimple.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedSimple.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/inheritedSimple.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedSimple.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralAndLiteralRunnable.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralAndLiteralRunnable.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralAndLiteralRunnable.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralAndLiteralRunnable.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralAndLiteralRunnable.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralAndLiteralRunnable.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralAndLiteralRunnable.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralAndLiteralRunnable.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralComparator.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralComparator.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralComparator.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralComparator.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralComparator.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralComparator.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralComparator.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralComparator.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralInConstructor.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralInConstructor.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralInConstructor.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralInConstructor.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralInConstructor.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralInConstructor.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralInConstructor.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralInConstructor.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralNull.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralNull.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralNull.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralNull.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralNull.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralNull.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralNull.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralNull.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralRunnable.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralRunnable.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralRunnable.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralRunnable.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralRunnable.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralRunnable.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralRunnable.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralRunnable.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentPure.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentPure.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentPure.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentPure.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentPure.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentPure.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentPure.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentPure.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/binary.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/binary.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/binary.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/binary.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/binary.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/binary.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/binary.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/binary.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/compareTo.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/compareTo.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/compareTo.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/compareTo.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/compareTo.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/compareTo.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/compareTo.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/compareTo.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/contains.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/contains.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/contains.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/contains.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/contains.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/contains.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/contains.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/contains.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/get.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/get.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/get.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/get.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/get.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/get.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/get.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/get.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/infixCall.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/infixCall.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/infixCall.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/infixCall.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/infixCall.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/infixCall.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/infixCall.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/infixCall.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/invoke.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/invoke.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/invoke.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/invoke.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/invoke.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/invoke.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/invoke.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/invoke.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiGetSet.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiGetSet.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiGetSet.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiGetSet.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiGetSet.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiGetSet.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiGetSet.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiGetSet.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiInvoke.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiInvoke.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiInvoke.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiInvoke.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiInvoke.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiInvoke.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiInvoke.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiInvoke.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/set.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/set.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/set.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/set.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/operators/set.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/set.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/operators/set.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/set.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/severalSamParameters.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/severalSamParameters.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/severalSamParameters.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/severalSamParameters.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/simplest.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/simplest.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/simplest.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/simplest.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/simplest.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/simplest.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/simplest.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/simplest.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/superconstructor.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/superconstructor.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/superconstructor.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/superconstructor.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfClass.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfClass.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfClass.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfClass.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfMethod.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfMethod.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfMethod.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfMethod.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfOuterClass.java b/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfOuterClass.java rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.java diff --git a/compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfOuterClass.kt b/compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfOuterClass.kt rename to compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/differentFqNames.java b/compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/differentFqNames.java rename to compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.java diff --git a/compiler/testData/codegen/boxWithJava/sam/differentFqNames.kt b/compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/differentFqNames.kt rename to compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt diff --git a/compiler/testData/codegen/boxWithJava/sam/samConstructorGenericSignature.java b/compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/samConstructorGenericSignature.java rename to compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.java diff --git a/compiler/testData/codegen/boxWithJava/sam/samConstructorGenericSignature.kt b/compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/sam/samConstructorGenericSignature.kt rename to compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt diff --git a/compiler/testData/codegen/boxWithJava/staticFun/classWithNestedEnum.java b/compiler/testData/codegen/boxAgainstJava/staticFun/classWithNestedEnum.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/staticFun/classWithNestedEnum.java rename to compiler/testData/codegen/boxAgainstJava/staticFun/classWithNestedEnum.java diff --git a/compiler/testData/codegen/boxWithJava/staticFun/classWithNestedEnum.kt b/compiler/testData/codegen/boxAgainstJava/staticFun/classWithNestedEnum.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/staticFun/classWithNestedEnum.kt rename to compiler/testData/codegen/boxAgainstJava/staticFun/classWithNestedEnum.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/package/kt2781.java b/compiler/testData/codegen/boxAgainstJava/visibility/package/kt2781.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/package/kt2781.java rename to compiler/testData/codegen/boxAgainstJava/visibility/package/kt2781.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/package/kt2781.kt b/compiler/testData/codegen/boxAgainstJava/visibility/package/kt2781.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/package/kt2781.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/package/kt2781.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/package/packageClass.java b/compiler/testData/codegen/boxAgainstJava/visibility/package/packageClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/package/packageClass.java rename to compiler/testData/codegen/boxAgainstJava/visibility/package/packageClass.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/package/packageClass.kt b/compiler/testData/codegen/boxAgainstJava/visibility/package/packageClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/package/packageClass.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/package/packageClass.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/package/packageFun.java b/compiler/testData/codegen/boxAgainstJava/visibility/package/packageFun.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/package/packageFun.java rename to compiler/testData/codegen/boxAgainstJava/visibility/package/packageFun.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/package/packageFun.kt b/compiler/testData/codegen/boxAgainstJava/visibility/package/packageFun.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/package/packageFun.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/package/packageFun.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/package/packageProperty.java b/compiler/testData/codegen/boxAgainstJava/visibility/package/packageProperty.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/package/packageProperty.java rename to compiler/testData/codegen/boxAgainstJava/visibility/package/packageProperty.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/package/packageProperty.kt b/compiler/testData/codegen/boxAgainstJava/visibility/package/packageProperty.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/package/packageProperty.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/package/packageProperty.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedFunInPackage.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedFunInPackage.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedFunInPackage.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedFunInPackage.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedFunInPackage.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedFunInPackage.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedFunInPackage.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedFunInPackage.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedPropertyInPackage.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedPropertyInPackage.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedPropertyInPackage.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedPropertyInPackage.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedStaticClass.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedStaticClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedStaticClass.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedStaticClass.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedStaticClass.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedStaticClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedStaticClass.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedStaticClass.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funCallInConstructor.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funCallInConstructor.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funCallInConstructor.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funCallInConstructor.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funCallInConstructor.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funCallInConstructor.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funCallInConstructor.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funCallInConstructor.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funClassObject.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funClassObject.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funClassObject.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funClassObject.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funGenericClass.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funGenericClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funGenericClass.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funGenericClass.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funGenericClass.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funGenericClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funGenericClass.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funGenericClass.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass2.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass2.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass2.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass2.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass2.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass2.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass2.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass2.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticGenericClass.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticGenericClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticGenericClass.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticGenericClass.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticGenericClass.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticGenericClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticGenericClass.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticGenericClass.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNotDirectSuperClass.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNotDirectSuperClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNotDirectSuperClass.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNotDirectSuperClass.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNotDirectSuperClass.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNotDirectSuperClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNotDirectSuperClass.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNotDirectSuperClass.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funObject.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funObject.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funObject.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funObject.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funObject.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funObject.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funObject.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funObject.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass2.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass2.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass2.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass2.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass2.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass2.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass2.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass2.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleFun.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleFun.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleFun.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleFun.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleFun.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleFun.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleFun.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleFun.kt diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleProperty.java b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleProperty.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleProperty.java rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleProperty.java diff --git a/compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleProperty.kt b/compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleProperty.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleProperty.kt rename to compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleProperty.kt diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java b/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java index 16f021d68a9..446de328c4a 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/AbstractBlackBoxCodegenTest.java @@ -41,8 +41,8 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { blackBoxFileByFullPath(filename); } - public void doTestWithJava(@NotNull String filename) { - blackBoxFileWithJavaByFullPath(filename); + public void doTestAgainstJava(@NotNull String filename) { + blackBoxFileAgainstJavaByFullPath(filename); } public void doTestWithStdlib(@NotNull String filename) { @@ -75,7 +75,7 @@ public abstract class AbstractBlackBoxCodegenTest extends CodegenTestCase { InlineTestUtil.checkNoCallsToInline(initializedClassLoader.getAllGeneratedFiles()); } - private void blackBoxFileWithJavaByFullPath(@NotNull String ktFileFullPath) { + private void blackBoxFileAgainstJavaByFullPath(@NotNull String ktFileFullPath) { String ktFile = ktFileFullPath.substring("compiler/testData/codegen/".length()); File javaClassesTempDirectory = compileJava(ktFile.replaceFirst("\\.kt$", ".java")); diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java similarity index 59% rename from compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java rename to compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java index 178e38534cc..ba89e324887 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxAgainstJavaCodegenTestGenerated.java @@ -30,390 +30,390 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.TestsPackage}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") -@TestMetadata("compiler/testData/codegen/boxWithJava") -@InnerTestClasses({BlackBoxWithJavaCodegenTestGenerated.Annotations.class, BlackBoxWithJavaCodegenTestGenerated.CallableReference.class, BlackBoxWithJavaCodegenTestGenerated.Constructor.class, BlackBoxWithJavaCodegenTestGenerated.Delegation.class, BlackBoxWithJavaCodegenTestGenerated.Enum.class, BlackBoxWithJavaCodegenTestGenerated.Functions.class, BlackBoxWithJavaCodegenTestGenerated.InnerClass.class, BlackBoxWithJavaCodegenTestGenerated.Property.class, BlackBoxWithJavaCodegenTestGenerated.Sam.class, BlackBoxWithJavaCodegenTestGenerated.StaticFun.class, BlackBoxWithJavaCodegenTestGenerated.Visibility.class}) -public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInBoxWithJava() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava"), Pattern.compile("^(.+)\\.kt$"), true); +@TestMetadata("compiler/testData/codegen/boxAgainstJava") +@InnerTestClasses({BlackBoxAgainstJavaCodegenTestGenerated.Annotations.class, BlackBoxAgainstJavaCodegenTestGenerated.CallableReference.class, BlackBoxAgainstJavaCodegenTestGenerated.Constructor.class, BlackBoxAgainstJavaCodegenTestGenerated.Delegation.class, BlackBoxAgainstJavaCodegenTestGenerated.Enum.class, BlackBoxAgainstJavaCodegenTestGenerated.Functions.class, BlackBoxAgainstJavaCodegenTestGenerated.InnerClass.class, BlackBoxAgainstJavaCodegenTestGenerated.Property.class, BlackBoxAgainstJavaCodegenTestGenerated.Sam.class, BlackBoxAgainstJavaCodegenTestGenerated.StaticFun.class, BlackBoxAgainstJavaCodegenTestGenerated.Visibility.class}) +public class BlackBoxAgainstJavaCodegenTestGenerated extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInBoxAgainstJava() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("compiler/testData/codegen/boxWithJava/annotations") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/annotations") public static class Annotations extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAnnotations() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/annotations"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/annotations"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("javaAnnotationCall.kt") public void testJavaAnnotationCall() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/annotations/javaAnnotationCall.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationCall.kt"); } @TestMetadata("javaAnnotationDefault.kt") public void testJavaAnnotationDefault() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/annotations/javaAnnotationDefault.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaAnnotationDefault.kt"); } @TestMetadata("javaNegativePropertyAsAnnotationParameter.kt") public void testJavaNegativePropertyAsAnnotationParameter() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/annotations/javaNegativePropertyAsAnnotationParameter.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaNegativePropertyAsAnnotationParameter.kt"); } @TestMetadata("javaPropertyAsAnnotationParameter.kt") public void testJavaPropertyAsAnnotationParameter() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/annotations/javaPropertyAsAnnotationParameter.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyAsAnnotationParameter.kt"); } @TestMetadata("javaPropertyWithIntInitializer.kt") public void testJavaPropertyWithIntInitializer() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/annotations/javaPropertyWithIntInitializer.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/javaPropertyWithIntInitializer.kt"); } - @TestMetadata("RetentionInJava.kt") + @TestMetadata("retentionInJava.kt") public void testRetentionInJava() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/annotations/RetentionInJava.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/annotations/retentionInJava.kt"); } } - @TestMetadata("compiler/testData/codegen/boxWithJava/callableReference") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/callableReference") public static class CallableReference extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInCallableReference() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/callableReference"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/callableReference/constructor.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/callableReference/constructor.kt"); } } - @TestMetadata("compiler/testData/codegen/boxWithJava/constructor") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/constructor") public static class Constructor extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInConstructor() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/constructor"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/constructor"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("genericConstructor.kt") public void testGenericConstructor() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/constructor/genericConstructor.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/constructor/genericConstructor.kt"); } } - @TestMetadata("compiler/testData/codegen/boxWithJava/delegation") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/delegation") public static class Delegation extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInDelegation() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/delegation"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/delegation"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("delegationAndInheritanceFromJava.kt") public void testDelegationAndInheritanceFromJava() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/delegation/delegationAndInheritanceFromJava.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/delegation/delegationAndInheritanceFromJava.kt"); } } - @TestMetadata("compiler/testData/codegen/boxWithJava/enum") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/enum") public static class Enum extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInEnum() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/enum"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/enum"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("simpleJavaEnum.kt") public void testSimpleJavaEnum() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/enum/simpleJavaEnum.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnum.kt"); } @TestMetadata("simpleJavaEnumWithFunction.kt") public void testSimpleJavaEnumWithFunction() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithFunction.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithFunction.kt"); } @TestMetadata("simpleJavaEnumWithStaticImport.kt") public void testSimpleJavaEnumWithStaticImport() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/enum/simpleJavaEnumWithStaticImport.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaEnumWithStaticImport.kt"); } @TestMetadata("simpleJavaInnerEnum.kt") public void testSimpleJavaInnerEnum() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/enum/simpleJavaInnerEnum.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/simpleJavaInnerEnum.kt"); } @TestMetadata("staticField.kt") public void testStaticField() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/enum/staticField.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/staticField.kt"); } @TestMetadata("staticMethod.kt") public void testStaticMethod() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/enum/staticMethod.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/enum/staticMethod.kt"); } } - @TestMetadata("compiler/testData/codegen/boxWithJava/functions") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/functions") public static class Functions extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInFunctions() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/functions"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/functions"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/functions/constructor.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/constructor.kt"); } @TestMetadata("max.kt") public void testMax() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/functions/max.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/max.kt"); } @TestMetadata("referencesStaticInnerClassMethod.kt") public void testReferencesStaticInnerClassMethod() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethod.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethod.kt"); } @TestMetadata("referencesStaticInnerClassMethodL2.kt") public void testReferencesStaticInnerClassMethodL2() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/functions/referencesStaticInnerClassMethodL2.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/referencesStaticInnerClassMethodL2.kt"); } @TestMetadata("unrelatedUpperBounds.kt") public void testUnrelatedUpperBounds() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/functions/unrelatedUpperBounds.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/functions/unrelatedUpperBounds.kt"); } } - @TestMetadata("compiler/testData/codegen/boxWithJava/innerClass") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/innerClass") public static class InnerClass extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInInnerClass() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/innerClass"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/innerClass"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt3532.kt") public void testKt3532() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/innerClass/kt3532.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/innerClass/kt3532.kt"); } @TestMetadata("kt3812.kt") public void testKt3812() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/innerClass/kt3812.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/innerClass/kt3812.kt"); } @TestMetadata("kt4036.kt") public void testKt4036() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/innerClass/kt4036.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/innerClass/kt4036.kt"); } } - @TestMetadata("compiler/testData/codegen/boxWithJava/property") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/property") public static class Property extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProperty() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/property"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/property"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("fieldAccessFromExtensionInTraitImpl.kt") public void testFieldAccessFromExtensionInTraitImpl() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/property/fieldAccessFromExtensionInTraitImpl.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/property/fieldAccessFromExtensionInTraitImpl.kt"); } @TestMetadata("fieldAccessViaSubclass.kt") public void testFieldAccessViaSubclass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/property/fieldAccessViaSubclass.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/property/fieldAccessViaSubclass.kt"); } } - @TestMetadata("compiler/testData/codegen/boxWithJava/sam") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam") @InnerTestClasses({Sam.Adapters.class}) public static class Sam extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInSam() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/sam"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/sam"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("differentFqNames.kt") public void testDifferentFqNames() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/differentFqNames.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/differentFqNames.kt"); } @TestMetadata("samConstructorGenericSignature.kt") public void testSamConstructorGenericSignature() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/samConstructorGenericSignature.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/samConstructorGenericSignature.kt"); } - @TestMetadata("compiler/testData/codegen/boxWithJava/sam/adapters") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters") @InnerTestClasses({Adapters.Operators.class}) public static class Adapters extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInAdapters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/sam/adapters"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/sam/adapters"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("callAbstractAdapter.kt") public void testCallAbstractAdapter() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/callAbstractAdapter.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/callAbstractAdapter.kt"); } @TestMetadata("comparator.kt") public void testComparator() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/comparator.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/comparator.kt"); } @TestMetadata("constructor.kt") public void testConstructor() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/constructor.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/constructor.kt"); } @TestMetadata("fileFilter.kt") public void testFileFilter() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/fileFilter.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/fileFilter.kt"); } @TestMetadata("genericSignature.kt") public void testGenericSignature() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/genericSignature.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/genericSignature.kt"); } @TestMetadata("implementAdapter.kt") public void testImplementAdapter() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/implementAdapter.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/implementAdapter.kt"); } @TestMetadata("inheritedInKotlin.kt") public void testInheritedInKotlin() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/inheritedInKotlin.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedInKotlin.kt"); } @TestMetadata("inheritedOverriddenAdapter.kt") public void testInheritedOverriddenAdapter() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedOverriddenAdapter.kt"); } @TestMetadata("inheritedSimple.kt") public void testInheritedSimple() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/inheritedSimple.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/inheritedSimple.kt"); } @TestMetadata("nonLiteralAndLiteralRunnable.kt") public void testNonLiteralAndLiteralRunnable() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralAndLiteralRunnable.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralAndLiteralRunnable.kt"); } @TestMetadata("nonLiteralComparator.kt") public void testNonLiteralComparator() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralComparator.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralComparator.kt"); } @TestMetadata("nonLiteralInConstructor.kt") public void testNonLiteralInConstructor() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralInConstructor.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralInConstructor.kt"); } @TestMetadata("nonLiteralNull.kt") public void testNonLiteralNull() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralNull.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralNull.kt"); } @TestMetadata("nonLiteralRunnable.kt") public void testNonLiteralRunnable() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralRunnable.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/nonLiteralRunnable.kt"); } @TestMetadata("severalSamParameters.kt") public void testSeveralSamParameters() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/severalSamParameters.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/severalSamParameters.kt"); } @TestMetadata("simplest.kt") public void testSimplest() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/simplest.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/simplest.kt"); } @TestMetadata("superconstructor.kt") public void testSuperconstructor() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/superconstructor.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/superconstructor.kt"); } @TestMetadata("typeParameterOfClass.kt") public void testTypeParameterOfClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfClass.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfClass.kt"); } @TestMetadata("typeParameterOfMethod.kt") public void testTypeParameterOfMethod() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfMethod.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfMethod.kt"); } @TestMetadata("typeParameterOfOuterClass.kt") public void testTypeParameterOfOuterClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfOuterClass.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/typeParameterOfOuterClass.kt"); } - @TestMetadata("compiler/testData/codegen/boxWithJava/sam/adapters/operators") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators") public static class Operators extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInOperators() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/sam/adapters/operators"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("augmentedAssignmentAndSquareBrackets.kt") public void testAugmentedAssignmentAndSquareBrackets() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt"); } @TestMetadata("augmentedAssignmentPure.kt") public void testAugmentedAssignmentPure() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentPure.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentPure.kt"); } @TestMetadata("augmentedAssignmentViaSimpleBinary.kt") public void testAugmentedAssignmentViaSimpleBinary() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt"); } @TestMetadata("binary.kt") public void testBinary() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/binary.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/binary.kt"); } @TestMetadata("compareTo.kt") public void testCompareTo() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/compareTo.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/compareTo.kt"); } @TestMetadata("contains.kt") public void testContains() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/contains.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/contains.kt"); } @TestMetadata("get.kt") public void testGet() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/get.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/get.kt"); } @TestMetadata("infixCall.kt") public void testInfixCall() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/infixCall.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/infixCall.kt"); } @TestMetadata("invoke.kt") public void testInvoke() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/invoke.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/invoke.kt"); } @TestMetadata("multiGetSet.kt") public void testMultiGetSet() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiGetSet.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiGetSet.kt"); } @TestMetadata("multiInvoke.kt") public void testMultiInvoke() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiInvoke.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/multiInvoke.kt"); } @TestMetadata("set.kt") public void testSet() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/set.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/sam/adapters/operators/set.kt"); } } @@ -434,146 +434,146 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege } } - @TestMetadata("compiler/testData/codegen/boxWithJava/staticFun") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/staticFun") public static class StaticFun extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInStaticFun() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/staticFun"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/staticFun"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("classWithNestedEnum.kt") public void testClassWithNestedEnum() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/staticFun/classWithNestedEnum.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/staticFun/classWithNestedEnum.kt"); } } - @TestMetadata("compiler/testData/codegen/boxWithJava/visibility") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility") @InnerTestClasses({Visibility.Package.class, Visibility.ProtectedAndPackage.class, Visibility.ProtectedStatic.class}) public static class Visibility extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInVisibility() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/visibility"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/visibility"), Pattern.compile("^(.+)\\.kt$"), true); } - @TestMetadata("compiler/testData/codegen/boxWithJava/visibility/package") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility/package") public static class Package extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInPackage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/visibility/package"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/visibility/package"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("kt2781.kt") public void testKt2781() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/package/kt2781.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/package/kt2781.kt"); } @TestMetadata("packageClass.kt") public void testPackageClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/package/packageClass.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/package/packageClass.kt"); } @TestMetadata("packageFun.kt") public void testPackageFun() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/package/packageFun.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/package/packageFun.kt"); } @TestMetadata("packageProperty.kt") public void testPackageProperty() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/package/packageProperty.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/package/packageProperty.kt"); } } - @TestMetadata("compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage") public static class ProtectedAndPackage extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProtectedAndPackage() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("overrideProtectedFunInPackage.kt") public void testOverrideProtectedFunInPackage() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/overrideProtectedFunInPackage.kt"); } @TestMetadata("protectedFunInPackage.kt") public void testProtectedFunInPackage() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedFunInPackage.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedFunInPackage.kt"); } @TestMetadata("protectedPropertyInPackage.kt") public void testProtectedPropertyInPackage() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedPropertyInPackage.kt"); } @TestMetadata("protectedStaticClass.kt") public void testProtectedStaticClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedAndPackage/protectedStaticClass.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedAndPackage/protectedStaticClass.kt"); } } - @TestMetadata("compiler/testData/codegen/boxWithJava/visibility/protectedStatic") + @TestMetadata("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic") public static class ProtectedStatic extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInProtectedStatic() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxWithJava/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), true); + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.TestsPackage", new File("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("funCallInConstructor.kt") public void testFunCallInConstructor() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funCallInConstructor.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funCallInConstructor.kt"); } @TestMetadata("funClassObject.kt") public void testFunClassObject() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funClassObject.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funClassObject.kt"); } @TestMetadata("funGenericClass.kt") public void testFunGenericClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funGenericClass.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funGenericClass.kt"); } @TestMetadata("funNestedStaticClass.kt") public void testFunNestedStaticClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass.kt"); } @TestMetadata("funNestedStaticClass2.kt") public void testFunNestedStaticClass2() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticClass2.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticClass2.kt"); } @TestMetadata("funNestedStaticGenericClass.kt") public void testFunNestedStaticGenericClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNestedStaticGenericClass.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNestedStaticGenericClass.kt"); } @TestMetadata("funNotDirectSuperClass.kt") public void testFunNotDirectSuperClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funNotDirectSuperClass.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funNotDirectSuperClass.kt"); } @TestMetadata("funObject.kt") public void testFunObject() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/funObject.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/funObject.kt"); } @TestMetadata("simpleClass.kt") public void testSimpleClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass.kt"); } @TestMetadata("simpleClass2.kt") public void testSimpleClass2() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleClass2.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleClass2.kt"); } @TestMetadata("simpleFun.kt") public void testSimpleFun() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleFun.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleFun.kt"); } @TestMetadata("simpleProperty.kt") public void testSimpleProperty() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/visibility/protectedStatic/simpleProperty.kt"); + doTestAgainstJava("compiler/testData/codegen/boxAgainstJava/visibility/protectedStatic/simpleProperty.kt"); } } @@ -589,8 +589,8 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege } public static Test suite() { - TestSuite suite = new TestSuite("BlackBoxWithJavaCodegenTestGenerated"); - suite.addTestSuite(BlackBoxWithJavaCodegenTestGenerated.class); + TestSuite suite = new TestSuite("BlackBoxAgainstJavaCodegenTestGenerated"); + suite.addTestSuite(BlackBoxAgainstJavaCodegenTestGenerated.class); suite.addTestSuite(Annotations.class); suite.addTestSuite(CallableReference.class); suite.addTestSuite(Constructor.class); diff --git a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt index 835a0d55f15..68612b8466e 100644 --- a/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt +++ b/generators/src/org/jetbrains/jet/generators/tests/GenerateTests.kt @@ -168,8 +168,8 @@ fun main(args: Array) { model("codegen/boxMultiFile", extension = null, recursive = false, testMethod = "doTestMultiFile") } - testClass(javaClass(), "BlackBoxWithJavaCodegenTestGenerated") { - model("codegen/boxWithJava", testMethod = "doTestWithJava") + testClass(javaClass(), "BlackBoxAgainstJavaCodegenTestGenerated") { + model("codegen/boxAgainstJava", testMethod = "doTestAgainstJava") } testClass(javaClass(), "BlackBoxWithStdlibCodegenTestGenerated") {