diff --git a/compiler/testData/codegen/box/sam/comparator.kt b/compiler/testData/codegen/box/samConstructors/comparator.kt similarity index 100% rename from compiler/testData/codegen/box/sam/comparator.kt rename to compiler/testData/codegen/box/samConstructors/comparator.kt diff --git a/compiler/testData/codegen/box/sam/filenameFilter.kt b/compiler/testData/codegen/box/samConstructors/filenameFilter.kt similarity index 100% rename from compiler/testData/codegen/box/sam/filenameFilter.kt rename to compiler/testData/codegen/box/samConstructors/filenameFilter.kt diff --git a/compiler/testData/codegen/box/sam/nonLiteralComparator.kt b/compiler/testData/codegen/box/samConstructors/nonLiteralComparator.kt similarity index 100% rename from compiler/testData/codegen/box/sam/nonLiteralComparator.kt rename to compiler/testData/codegen/box/samConstructors/nonLiteralComparator.kt diff --git a/compiler/testData/codegen/box/sam/nonLiteralFilenameFilter.kt b/compiler/testData/codegen/box/samConstructors/nonLiteralFilenameFilter.kt similarity index 100% rename from compiler/testData/codegen/box/sam/nonLiteralFilenameFilter.kt rename to compiler/testData/codegen/box/samConstructors/nonLiteralFilenameFilter.kt diff --git a/compiler/testData/codegen/box/sam/nonLiteralRunnable.kt b/compiler/testData/codegen/box/samConstructors/nonLiteralRunnable.kt similarity index 100% rename from compiler/testData/codegen/box/sam/nonLiteralRunnable.kt rename to compiler/testData/codegen/box/samConstructors/nonLiteralRunnable.kt diff --git a/compiler/testData/codegen/box/sam/nonTrivialRunnable.kt b/compiler/testData/codegen/box/samConstructors/nonTrivialRunnable.kt similarity index 100% rename from compiler/testData/codegen/box/sam/nonTrivialRunnable.kt rename to compiler/testData/codegen/box/samConstructors/nonTrivialRunnable.kt diff --git a/compiler/testData/codegen/box/sam/runnable.kt b/compiler/testData/codegen/box/samConstructors/runnable.kt similarity index 100% rename from compiler/testData/codegen/box/sam/runnable.kt rename to compiler/testData/codegen/box/samConstructors/runnable.kt diff --git a/compiler/testData/codegen/box/sam/runnableAccessingClosure1.kt b/compiler/testData/codegen/box/samConstructors/runnableAccessingClosure1.kt similarity index 100% rename from compiler/testData/codegen/box/sam/runnableAccessingClosure1.kt rename to compiler/testData/codegen/box/samConstructors/runnableAccessingClosure1.kt diff --git a/compiler/testData/codegen/box/sam/runnableAccessingClosure2.kt b/compiler/testData/codegen/box/samConstructors/runnableAccessingClosure2.kt similarity index 100% rename from compiler/testData/codegen/box/sam/runnableAccessingClosure2.kt rename to compiler/testData/codegen/box/samConstructors/runnableAccessingClosure2.kt diff --git a/compiler/testData/codegen/box/sam/sameWrapperClass.kt b/compiler/testData/codegen/box/samConstructors/sameWrapperClass.kt similarity index 100% rename from compiler/testData/codegen/box/sam/sameWrapperClass.kt rename to compiler/testData/codegen/box/samConstructors/sameWrapperClass.kt diff --git a/compiler/testData/codegen/box/sam/syntheticVsReal.kt b/compiler/testData/codegen/box/samConstructors/syntheticVsReal.kt similarity index 100% rename from compiler/testData/codegen/box/sam/syntheticVsReal.kt rename to compiler/testData/codegen/box/samConstructors/syntheticVsReal.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/callAbstractAdapter.java b/compiler/testData/codegen/boxWithJava/sam/adapters/callAbstractAdapter.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/callAbstractAdapter.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/callAbstractAdapter.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/callAbstractAdapter.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/callAbstractAdapter.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/callAbstractAdapter.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/callAbstractAdapter.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/comparator.java b/compiler/testData/codegen/boxWithJava/sam/adapters/comparator.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/comparator.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/comparator.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/comparator.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/comparator.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/comparator.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/comparator.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/constructor.java b/compiler/testData/codegen/boxWithJava/sam/adapters/constructor.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/constructor.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/constructor.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/constructor.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/constructor.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/constructor.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/constructor.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/fileFilter.java b/compiler/testData/codegen/boxWithJava/sam/adapters/fileFilter.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/fileFilter.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/fileFilter.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/fileFilter.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/fileFilter.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/fileFilter.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/fileFilter.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/inheritedInKotlin.java b/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedInKotlin.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/inheritedInKotlin.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/inheritedInKotlin.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/inheritedInKotlin.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedInKotlin.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/inheritedInKotlin.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/inheritedInKotlin.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/inheritedOverriddenAdapter.java b/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/inheritedOverriddenAdapter.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/inheritedOverriddenAdapter.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/inheritedOverriddenAdapter.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/inheritedOverriddenAdapterInKotlin.java b/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapterInKotlin.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/inheritedOverriddenAdapterInKotlin.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapterInKotlin.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/inheritedOverriddenAdapterInKotlin.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapterInKotlin.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/inheritedOverriddenAdapterInKotlin.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapterInKotlin.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/inheritedSimple.java b/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedSimple.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/inheritedSimple.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/inheritedSimple.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/inheritedSimple.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/inheritedSimple.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/inheritedSimple.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/inheritedSimple.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralAndLiteralRunnable.java b/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralAndLiteralRunnable.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralAndLiteralRunnable.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralAndLiteralRunnable.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralAndLiteralRunnable.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralAndLiteralRunnable.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralAndLiteralRunnable.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralAndLiteralRunnable.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralComparator.java b/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralComparator.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralComparator.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralComparator.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralComparator.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralComparator.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralComparator.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralComparator.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralInConstructor.java b/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralInConstructor.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralInConstructor.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralInConstructor.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralInConstructor.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralInConstructor.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralInConstructor.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralInConstructor.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralNull.java b/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralNull.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralNull.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralNull.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralNull.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralNull.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralNull.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralNull.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralRunnable.java b/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralRunnable.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralRunnable.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralRunnable.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralRunnable.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralRunnable.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralRunnable.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralRunnable.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentAndSquareBrackets.java b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentAndSquareBrackets.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentAndSquareBrackets.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentAndSquareBrackets.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentAndSquareBrackets.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentPure.java b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentPure.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentPure.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentPure.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentPure.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentPure.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentPure.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentPure.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentViaSimpleBinary.java b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentViaSimpleBinary.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentViaSimpleBinary.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentViaSimpleBinary.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/binary.java b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/binary.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/binary.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/binary.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/binary.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/binary.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/binary.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/binary.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/compareTo.java b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/compareTo.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/compareTo.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/compareTo.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/compareTo.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/compareTo.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/compareTo.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/compareTo.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/contains.java b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/contains.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/contains.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/contains.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/contains.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/contains.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/contains.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/contains.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/get.java b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/get.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/get.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/get.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/get.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/get.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/get.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/get.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/infixCall.java b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/infixCall.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/infixCall.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/infixCall.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/infixCall.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/infixCall.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/infixCall.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/infixCall.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/invoke.java b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/invoke.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/invoke.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/invoke.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/invoke.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/invoke.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/invoke.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/invoke.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/multiGetSet.java b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiGetSet.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/multiGetSet.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiGetSet.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/multiGetSet.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiGetSet.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/multiGetSet.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiGetSet.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/multiInvoke.java b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiInvoke.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/multiInvoke.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiInvoke.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/multiInvoke.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiInvoke.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/multiInvoke.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiInvoke.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/set.java b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/set.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/set.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/set.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/operators/set.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/operators/set.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/operators/set.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/operators/set.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/severalSamParameters.java b/compiler/testData/codegen/boxWithJava/sam/adapters/severalSamParameters.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/severalSamParameters.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/severalSamParameters.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/severalSamParameters.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/severalSamParameters.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/severalSamParameters.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/severalSamParameters.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/simplest.java b/compiler/testData/codegen/boxWithJava/sam/adapters/simplest.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/simplest.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/simplest.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/simplest.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/simplest.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/simplest.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/simplest.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/superconstructor.java b/compiler/testData/codegen/boxWithJava/sam/adapters/superconstructor.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/superconstructor.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/superconstructor.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/superconstructor.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/superconstructor.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/superconstructor.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/superconstructor.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfClass.java b/compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfClass.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfClass.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfClass.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfClass.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfClass.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfMethod.java b/compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfMethod.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfMethod.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfMethod.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfMethod.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfMethod.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfMethod.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfMethod.kt diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfOuterClass.java b/compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfOuterClass.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfOuterClass.java rename to compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfOuterClass.java diff --git a/compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfOuterClass.kt b/compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfOuterClass.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfOuterClass.kt rename to compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfOuterClass.kt diff --git a/compiler/testData/codegen/boxWithJava/samWrappers/differentFqNames.java b/compiler/testData/codegen/boxWithJava/sam/differentFqNames.java similarity index 100% rename from compiler/testData/codegen/boxWithJava/samWrappers/differentFqNames.java rename to compiler/testData/codegen/boxWithJava/sam/differentFqNames.java diff --git a/compiler/testData/codegen/boxWithJava/samWrappers/differentFqNames.kt b/compiler/testData/codegen/boxWithJava/sam/differentFqNames.kt similarity index 100% rename from compiler/testData/codegen/boxWithJava/samWrappers/differentFqNames.kt rename to compiler/testData/codegen/boxWithJava/sam/differentFqNames.kt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/Comparator.java b/compiler/testData/loadJava/compiledJava/sam/Comparator.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/Comparator.java rename to compiler/testData/loadJava/compiledJava/sam/Comparator.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/Comparator.txt b/compiler/testData/loadJava/compiledJava/sam/Comparator.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/Comparator.txt rename to compiler/testData/loadJava/compiledJava/sam/Comparator.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/FilenameFilter.java b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/FilenameFilter.java rename to compiler/testData/loadJava/compiledJava/sam/FilenameFilter.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/FilenameFilter.txt b/compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/FilenameFilter.txt rename to compiler/testData/loadJava/compiledJava/sam/FilenameFilter.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericInterfaceParameterWithSelfBound.java b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericInterfaceParameterWithSelfBound.java rename to compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericInterfaceParameterWithSelfBound.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericInterfaceParameterWithSelfBound.txt rename to compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericInterfaceParametersWithBounds.java b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericInterfaceParametersWithBounds.java rename to compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericInterfaceParametersWithBounds.txt b/compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericInterfaceParametersWithBounds.txt rename to compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericMethodParameters.java b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericMethodParameters.java rename to compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericMethodParameters.txt b/compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericMethodParameters.txt rename to compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/InterfaceWithObjectMethod.java b/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/InterfaceWithObjectMethod.java rename to compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/InterfaceWithObjectMethod.txt b/compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/InterfaceWithObjectMethod.txt rename to compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/Nested.java b/compiler/testData/loadJava/compiledJava/sam/Nested.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/Nested.java rename to compiler/testData/loadJava/compiledJava/sam/Nested.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/Nested.txt b/compiler/testData/loadJava/compiledJava/sam/Nested.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/Nested.txt rename to compiler/testData/loadJava/compiledJava/sam/Nested.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/Runnable.java b/compiler/testData/loadJava/compiledJava/sam/Runnable.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/Runnable.java rename to compiler/testData/loadJava/compiledJava/sam/Runnable.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/Runnable.txt b/compiler/testData/loadJava/compiledJava/sam/Runnable.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/Runnable.txt rename to compiler/testData/loadJava/compiledJava/sam/Runnable.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/SamSubinterfaceOfTwo.java b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/SamSubinterfaceOfTwo.java rename to compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/SamSubinterfaceOfTwo.txt b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/SamSubinterfaceOfTwo.txt rename to compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/SamSubinterfaceOverridding.java b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/SamSubinterfaceOverridding.java rename to compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/SamSubinterfaceOverridding.txt b/compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/SamSubinterfaceOverridding.txt rename to compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterface.java b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterface.java rename to compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterface.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterface.txt rename to compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterfaceSubclassOfBuiltin.java b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterfaceSubclassOfBuiltin.java rename to compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterfaceSubclassOfBuiltin.txt b/compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterfaceSubclassOfBuiltin.txt rename to compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/VarargParameter.java b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/VarargParameter.java rename to compiler/testData/loadJava/compiledJava/sam/VarargParameter.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/VarargParameter.txt b/compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/VarargParameter.txt rename to compiler/testData/loadJava/compiledJava/sam/VarargParameter.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/AmbiguousAdapters.java b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/AmbiguousAdapters.java rename to compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/AmbiguousAdapters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/AmbiguousAdapters.txt rename to compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/Basic.java b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/Basic.java rename to compiler/testData/loadJava/compiledJava/sam/adapters/Basic.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/Basic.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/Basic.txt rename to compiler/testData/loadJava/compiledJava/sam/adapters/Basic.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/Constructor.java b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/Constructor.java rename to compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/Constructor.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/Constructor.txt rename to compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/DeepSamLoop.java b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/DeepSamLoop.java rename to compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/DeepSamLoop.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/DeepSamLoop.txt rename to compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverridden.java b/compiler/testData/loadJava/compiledJava/sam/adapters/InheritedOverridden.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverridden.java rename to compiler/testData/loadJava/compiledJava/sam/adapters/InheritedOverridden.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverridden.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/InheritedOverridden.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverridden.txt rename to compiler/testData/loadJava/compiledJava/sam/adapters/InheritedOverridden.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverriddenAdapter.java b/compiler/testData/loadJava/compiledJava/sam/adapters/InheritedOverriddenAdapter.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverriddenAdapter.java rename to compiler/testData/loadJava/compiledJava/sam/adapters/InheritedOverriddenAdapter.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverriddenAdapter.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/InheritedOverriddenAdapter.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverriddenAdapter.txt rename to compiler/testData/loadJava/compiledJava/sam/adapters/InheritedOverriddenAdapter.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedSimple.java b/compiler/testData/loadJava/compiledJava/sam/adapters/InheritedSimple.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedSimple.java rename to compiler/testData/loadJava/compiledJava/sam/adapters/InheritedSimple.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedSimple.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/InheritedSimple.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedSimple.txt rename to compiler/testData/loadJava/compiledJava/sam/adapters/InheritedSimple.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/NonTrivialFunctionType.java b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/NonTrivialFunctionType.java rename to compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/NonTrivialFunctionType.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/NonTrivialFunctionType.txt rename to compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SelfAsParameter.java b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SelfAsParameter.java rename to compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SelfAsParameter.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SelfAsParameter.txt rename to compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SeveralSamParameters.java b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SeveralSamParameters.java rename to compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SeveralSamParameters.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SeveralSamParameters.txt rename to compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfClass.java b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfClass.java rename to compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfClass.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfClass.txt rename to compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfMethod.java b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfMethod.java rename to compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfMethod.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfMethod.txt rename to compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.txt diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfOuterClass.java b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.java similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfOuterClass.java rename to compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.java diff --git a/compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfOuterClass.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt similarity index 100% rename from compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfOuterClass.txt rename to compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.txt diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java index ade9d8142e4..34ba0c8f1f2 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxCodegenTestGenerated.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/box") -@InnerTestClasses({BlackBoxCodegenTestGenerated.Arrays.class, BlackBoxCodegenTestGenerated.Bridges.class, BlackBoxCodegenTestGenerated.CallableReference.class, BlackBoxCodegenTestGenerated.Casts.class, BlackBoxCodegenTestGenerated.Classes.class, BlackBoxCodegenTestGenerated.Closures.class, BlackBoxCodegenTestGenerated.ControlStructures.class, BlackBoxCodegenTestGenerated.DefaultArguments.class, BlackBoxCodegenTestGenerated.DelegatedProperty.class, BlackBoxCodegenTestGenerated.Elvis.class, BlackBoxCodegenTestGenerated.Enum.class, BlackBoxCodegenTestGenerated.ExclExcl.class, BlackBoxCodegenTestGenerated.ExtensionFunctions.class, BlackBoxCodegenTestGenerated.ExtensionProperties.class, BlackBoxCodegenTestGenerated.FieldRename.class, BlackBoxCodegenTestGenerated.Functions.class, BlackBoxCodegenTestGenerated.InnerNested.class, BlackBoxCodegenTestGenerated.Instructions.class, BlackBoxCodegenTestGenerated.Intrinsics.class, BlackBoxCodegenTestGenerated.Labels.class, BlackBoxCodegenTestGenerated.LocalClasses.class, BlackBoxCodegenTestGenerated.MultiDecl.class, BlackBoxCodegenTestGenerated.Namespace.class, BlackBoxCodegenTestGenerated.Objects.class, BlackBoxCodegenTestGenerated.OperatorConventions.class, BlackBoxCodegenTestGenerated.PrimitiveTypes.class, BlackBoxCodegenTestGenerated.Properties.class, BlackBoxCodegenTestGenerated.Reflection.class, BlackBoxCodegenTestGenerated.SafeCall.class, BlackBoxCodegenTestGenerated.Sam.class, BlackBoxCodegenTestGenerated.Strings.class, BlackBoxCodegenTestGenerated.Super.class, BlackBoxCodegenTestGenerated.Traits.class, BlackBoxCodegenTestGenerated.TypeInfo.class, BlackBoxCodegenTestGenerated.Unit.class, BlackBoxCodegenTestGenerated.Vararg.class, BlackBoxCodegenTestGenerated.When.class}) +@InnerTestClasses({BlackBoxCodegenTestGenerated.Arrays.class, BlackBoxCodegenTestGenerated.Bridges.class, BlackBoxCodegenTestGenerated.CallableReference.class, BlackBoxCodegenTestGenerated.Casts.class, BlackBoxCodegenTestGenerated.Classes.class, BlackBoxCodegenTestGenerated.Closures.class, BlackBoxCodegenTestGenerated.ControlStructures.class, BlackBoxCodegenTestGenerated.DefaultArguments.class, BlackBoxCodegenTestGenerated.DelegatedProperty.class, BlackBoxCodegenTestGenerated.Elvis.class, BlackBoxCodegenTestGenerated.Enum.class, BlackBoxCodegenTestGenerated.ExclExcl.class, BlackBoxCodegenTestGenerated.ExtensionFunctions.class, BlackBoxCodegenTestGenerated.ExtensionProperties.class, BlackBoxCodegenTestGenerated.FieldRename.class, BlackBoxCodegenTestGenerated.Functions.class, BlackBoxCodegenTestGenerated.InnerNested.class, BlackBoxCodegenTestGenerated.Instructions.class, BlackBoxCodegenTestGenerated.Intrinsics.class, BlackBoxCodegenTestGenerated.Labels.class, BlackBoxCodegenTestGenerated.LocalClasses.class, BlackBoxCodegenTestGenerated.MultiDecl.class, BlackBoxCodegenTestGenerated.Namespace.class, BlackBoxCodegenTestGenerated.Objects.class, BlackBoxCodegenTestGenerated.OperatorConventions.class, BlackBoxCodegenTestGenerated.PrimitiveTypes.class, BlackBoxCodegenTestGenerated.Properties.class, BlackBoxCodegenTestGenerated.Reflection.class, BlackBoxCodegenTestGenerated.SafeCall.class, BlackBoxCodegenTestGenerated.SamConstructors.class, BlackBoxCodegenTestGenerated.Strings.class, BlackBoxCodegenTestGenerated.Super.class, BlackBoxCodegenTestGenerated.Traits.class, BlackBoxCodegenTestGenerated.TypeInfo.class, BlackBoxCodegenTestGenerated.Unit.class, BlackBoxCodegenTestGenerated.Vararg.class, BlackBoxCodegenTestGenerated.When.class}) public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { public void testAllFilesPresentInBox() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box"), Pattern.compile("^(.+)\\.kt$"), true); @@ -3705,65 +3705,65 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { } - @TestMetadata("compiler/testData/codegen/box/sam") - public static class Sam extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInSam() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/sam"), Pattern.compile("^(.+)\\.kt$"), true); + @TestMetadata("compiler/testData/codegen/box/samConstructors") + public static class SamConstructors extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInSamConstructors() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/box/samConstructors"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("comparator.kt") public void testComparator() throws Exception { - doTest("compiler/testData/codegen/box/sam/comparator.kt"); + doTest("compiler/testData/codegen/box/samConstructors/comparator.kt"); } @TestMetadata("filenameFilter.kt") public void testFilenameFilter() throws Exception { - doTest("compiler/testData/codegen/box/sam/filenameFilter.kt"); + doTest("compiler/testData/codegen/box/samConstructors/filenameFilter.kt"); } @TestMetadata("nonLiteralComparator.kt") public void testNonLiteralComparator() throws Exception { - doTest("compiler/testData/codegen/box/sam/nonLiteralComparator.kt"); + doTest("compiler/testData/codegen/box/samConstructors/nonLiteralComparator.kt"); } @TestMetadata("nonLiteralFilenameFilter.kt") public void testNonLiteralFilenameFilter() throws Exception { - doTest("compiler/testData/codegen/box/sam/nonLiteralFilenameFilter.kt"); + doTest("compiler/testData/codegen/box/samConstructors/nonLiteralFilenameFilter.kt"); } @TestMetadata("nonLiteralRunnable.kt") public void testNonLiteralRunnable() throws Exception { - doTest("compiler/testData/codegen/box/sam/nonLiteralRunnable.kt"); + doTest("compiler/testData/codegen/box/samConstructors/nonLiteralRunnable.kt"); } @TestMetadata("nonTrivialRunnable.kt") public void testNonTrivialRunnable() throws Exception { - doTest("compiler/testData/codegen/box/sam/nonTrivialRunnable.kt"); + doTest("compiler/testData/codegen/box/samConstructors/nonTrivialRunnable.kt"); } @TestMetadata("runnable.kt") public void testRunnable() throws Exception { - doTest("compiler/testData/codegen/box/sam/runnable.kt"); + doTest("compiler/testData/codegen/box/samConstructors/runnable.kt"); } @TestMetadata("runnableAccessingClosure1.kt") public void testRunnableAccessingClosure1() throws Exception { - doTest("compiler/testData/codegen/box/sam/runnableAccessingClosure1.kt"); + doTest("compiler/testData/codegen/box/samConstructors/runnableAccessingClosure1.kt"); } @TestMetadata("runnableAccessingClosure2.kt") public void testRunnableAccessingClosure2() throws Exception { - doTest("compiler/testData/codegen/box/sam/runnableAccessingClosure2.kt"); + doTest("compiler/testData/codegen/box/samConstructors/runnableAccessingClosure2.kt"); } @TestMetadata("sameWrapperClass.kt") public void testSameWrapperClass() throws Exception { - doTest("compiler/testData/codegen/box/sam/sameWrapperClass.kt"); + doTest("compiler/testData/codegen/box/samConstructors/sameWrapperClass.kt"); } @TestMetadata("syntheticVsReal.kt") public void testSyntheticVsReal() throws Exception { - doTest("compiler/testData/codegen/box/sam/syntheticVsReal.kt"); + doTest("compiler/testData/codegen/box/samConstructors/syntheticVsReal.kt"); } } @@ -4186,7 +4186,7 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { suite.addTestSuite(Properties.class); suite.addTestSuite(Reflection.class); suite.addTestSuite(SafeCall.class); - suite.addTestSuite(Sam.class); + suite.addTestSuite(SamConstructors.class); suite.addTestSuite(Strings.class); suite.addTestSuite(Super.class); suite.addTestSuite(Traits.class); diff --git a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java index 5bd761ff775..d51be1ac644 100644 --- a/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/codegen/generated/BlackBoxWithJavaCodegenTestGenerated.java @@ -31,7 +31,7 @@ import org.jetbrains.jet.codegen.generated.AbstractBlackBoxCodegenTest; /** This class is generated by {@link org.jetbrains.jet.generators.tests.GenerateTests}. DO NOT MODIFY MANUALLY */ @SuppressWarnings("all") @TestMetadata("compiler/testData/codegen/boxWithJava") -@InnerTestClasses({BlackBoxWithJavaCodegenTestGenerated.CallableReference.class, BlackBoxWithJavaCodegenTestGenerated.Enum.class, BlackBoxWithJavaCodegenTestGenerated.Functions.class, BlackBoxWithJavaCodegenTestGenerated.Property.class, BlackBoxWithJavaCodegenTestGenerated.SamAdapters.class, BlackBoxWithJavaCodegenTestGenerated.SamWrappers.class, BlackBoxWithJavaCodegenTestGenerated.StaticFun.class, BlackBoxWithJavaCodegenTestGenerated.Visibility.class}) +@InnerTestClasses({BlackBoxWithJavaCodegenTestGenerated.CallableReference.class, BlackBoxWithJavaCodegenTestGenerated.Enum.class, BlackBoxWithJavaCodegenTestGenerated.Functions.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.GenerateTests", new File("compiler/testData/codegen/boxWithJava"), Pattern.compile("^(.+)\\.kt$"), true); @@ -129,195 +129,202 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege } - @TestMetadata("compiler/testData/codegen/boxWithJava/samAdapters") - @InnerTestClasses({SamAdapters.Operators.class}) - public static class SamAdapters extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInSamAdapters() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/samAdapters"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("callAbstractAdapter.kt") - public void testCallAbstractAdapter() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/callAbstractAdapter.kt"); - } - - @TestMetadata("comparator.kt") - public void testComparator() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/comparator.kt"); - } - - @TestMetadata("constructor.kt") - public void testConstructor() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/constructor.kt"); - } - - @TestMetadata("fileFilter.kt") - public void testFileFilter() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/fileFilter.kt"); - } - - @TestMetadata("inheritedInKotlin.kt") - public void testInheritedInKotlin() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/inheritedInKotlin.kt"); - } - - @TestMetadata("inheritedOverriddenAdapter.kt") - public void testInheritedOverriddenAdapter() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/inheritedOverriddenAdapter.kt"); - } - - @TestMetadata("inheritedOverriddenAdapterInKotlin.kt") - public void testInheritedOverriddenAdapterInKotlin() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/inheritedOverriddenAdapterInKotlin.kt"); - } - - @TestMetadata("inheritedSimple.kt") - public void testInheritedSimple() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/inheritedSimple.kt"); - } - - @TestMetadata("nonLiteralAndLiteralRunnable.kt") - public void testNonLiteralAndLiteralRunnable() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralAndLiteralRunnable.kt"); - } - - @TestMetadata("nonLiteralComparator.kt") - public void testNonLiteralComparator() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralComparator.kt"); - } - - @TestMetadata("nonLiteralInConstructor.kt") - public void testNonLiteralInConstructor() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralInConstructor.kt"); - } - - @TestMetadata("nonLiteralNull.kt") - public void testNonLiteralNull() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralNull.kt"); - } - - @TestMetadata("nonLiteralRunnable.kt") - public void testNonLiteralRunnable() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/nonLiteralRunnable.kt"); - } - - @TestMetadata("severalSamParameters.kt") - public void testSeveralSamParameters() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/severalSamParameters.kt"); - } - - @TestMetadata("simplest.kt") - public void testSimplest() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/simplest.kt"); - } - - @TestMetadata("superconstructor.kt") - public void testSuperconstructor() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/superconstructor.kt"); - } - - @TestMetadata("typeParameterOfClass.kt") - public void testTypeParameterOfClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfClass.kt"); - } - - @TestMetadata("typeParameterOfMethod.kt") - public void testTypeParameterOfMethod() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfMethod.kt"); - } - - @TestMetadata("typeParameterOfOuterClass.kt") - public void testTypeParameterOfOuterClass() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/typeParameterOfOuterClass.kt"); - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/samAdapters/operators") - public static class Operators extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInOperators() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/samAdapters/operators"), Pattern.compile("^(.+)\\.kt$"), true); - } - - @TestMetadata("augmentedAssignmentAndSquareBrackets.kt") - public void testAugmentedAssignmentAndSquareBrackets() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentAndSquareBrackets.kt"); - } - - @TestMetadata("augmentedAssignmentPure.kt") - public void testAugmentedAssignmentPure() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentPure.kt"); - } - - @TestMetadata("augmentedAssignmentViaSimpleBinary.kt") - public void testAugmentedAssignmentViaSimpleBinary() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/augmentedAssignmentViaSimpleBinary.kt"); - } - - @TestMetadata("binary.kt") - public void testBinary() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/binary.kt"); - } - - @TestMetadata("compareTo.kt") - public void testCompareTo() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/compareTo.kt"); - } - - @TestMetadata("contains.kt") - public void testContains() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/contains.kt"); - } - - @TestMetadata("get.kt") - public void testGet() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/get.kt"); - } - - @TestMetadata("infixCall.kt") - public void testInfixCall() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/infixCall.kt"); - } - - @TestMetadata("invoke.kt") - public void testInvoke() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/invoke.kt"); - } - - @TestMetadata("multiGetSet.kt") - public void testMultiGetSet() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/multiGetSet.kt"); - } - - @TestMetadata("multiInvoke.kt") - public void testMultiInvoke() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/multiInvoke.kt"); - } - - @TestMetadata("set.kt") - public void testSet() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samAdapters/operators/set.kt"); - } - - } - - public static Test innerSuite() { - TestSuite suite = new TestSuite("SamAdapters"); - suite.addTestSuite(SamAdapters.class); - suite.addTestSuite(Operators.class); - return suite; - } - } - - @TestMetadata("compiler/testData/codegen/boxWithJava/samWrappers") - public static class SamWrappers extends AbstractBlackBoxCodegenTest { - public void testAllFilesPresentInSamWrappers() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/samWrappers"), Pattern.compile("^(.+)\\.kt$"), true); + @TestMetadata("compiler/testData/codegen/boxWithJava/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.GenerateTests", new File("compiler/testData/codegen/boxWithJava/sam"), Pattern.compile("^(.+)\\.kt$"), true); } @TestMetadata("differentFqNames.kt") public void testDifferentFqNames() throws Exception { - doTestWithJava("compiler/testData/codegen/boxWithJava/samWrappers/differentFqNames.kt"); + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/differentFqNames.kt"); } + @TestMetadata("compiler/testData/codegen/boxWithJava/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.GenerateTests", new File("compiler/testData/codegen/boxWithJava/sam/adapters"), Pattern.compile("^(.+)\\.kt$"), true); + } + + @TestMetadata("callAbstractAdapter.kt") + public void testCallAbstractAdapter() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/callAbstractAdapter.kt"); + } + + @TestMetadata("comparator.kt") + public void testComparator() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/comparator.kt"); + } + + @TestMetadata("constructor.kt") + public void testConstructor() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/constructor.kt"); + } + + @TestMetadata("fileFilter.kt") + public void testFileFilter() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/fileFilter.kt"); + } + + @TestMetadata("inheritedInKotlin.kt") + public void testInheritedInKotlin() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/inheritedInKotlin.kt"); + } + + @TestMetadata("inheritedOverriddenAdapter.kt") + public void testInheritedOverriddenAdapter() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapter.kt"); + } + + @TestMetadata("inheritedOverriddenAdapterInKotlin.kt") + public void testInheritedOverriddenAdapterInKotlin() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/inheritedOverriddenAdapterInKotlin.kt"); + } + + @TestMetadata("inheritedSimple.kt") + public void testInheritedSimple() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/inheritedSimple.kt"); + } + + @TestMetadata("nonLiteralAndLiteralRunnable.kt") + public void testNonLiteralAndLiteralRunnable() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralAndLiteralRunnable.kt"); + } + + @TestMetadata("nonLiteralComparator.kt") + public void testNonLiteralComparator() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralComparator.kt"); + } + + @TestMetadata("nonLiteralInConstructor.kt") + public void testNonLiteralInConstructor() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralInConstructor.kt"); + } + + @TestMetadata("nonLiteralNull.kt") + public void testNonLiteralNull() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralNull.kt"); + } + + @TestMetadata("nonLiteralRunnable.kt") + public void testNonLiteralRunnable() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/nonLiteralRunnable.kt"); + } + + @TestMetadata("severalSamParameters.kt") + public void testSeveralSamParameters() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/severalSamParameters.kt"); + } + + @TestMetadata("simplest.kt") + public void testSimplest() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/simplest.kt"); + } + + @TestMetadata("superconstructor.kt") + public void testSuperconstructor() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/superconstructor.kt"); + } + + @TestMetadata("typeParameterOfClass.kt") + public void testTypeParameterOfClass() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfClass.kt"); + } + + @TestMetadata("typeParameterOfMethod.kt") + public void testTypeParameterOfMethod() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfMethod.kt"); + } + + @TestMetadata("typeParameterOfOuterClass.kt") + public void testTypeParameterOfOuterClass() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/typeParameterOfOuterClass.kt"); + } + + @TestMetadata("compiler/testData/codegen/boxWithJava/sam/adapters/operators") + public static class Operators extends AbstractBlackBoxCodegenTest { + public void testAllFilesPresentInOperators() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/codegen/boxWithJava/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"); + } + + @TestMetadata("augmentedAssignmentPure.kt") + public void testAugmentedAssignmentPure() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentPure.kt"); + } + + @TestMetadata("augmentedAssignmentViaSimpleBinary.kt") + public void testAugmentedAssignmentViaSimpleBinary() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/augmentedAssignmentViaSimpleBinary.kt"); + } + + @TestMetadata("binary.kt") + public void testBinary() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/binary.kt"); + } + + @TestMetadata("compareTo.kt") + public void testCompareTo() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/compareTo.kt"); + } + + @TestMetadata("contains.kt") + public void testContains() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/contains.kt"); + } + + @TestMetadata("get.kt") + public void testGet() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/get.kt"); + } + + @TestMetadata("infixCall.kt") + public void testInfixCall() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/infixCall.kt"); + } + + @TestMetadata("invoke.kt") + public void testInvoke() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/invoke.kt"); + } + + @TestMetadata("multiGetSet.kt") + public void testMultiGetSet() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiGetSet.kt"); + } + + @TestMetadata("multiInvoke.kt") + public void testMultiInvoke() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/multiInvoke.kt"); + } + + @TestMetadata("set.kt") + public void testSet() throws Exception { + doTestWithJava("compiler/testData/codegen/boxWithJava/sam/adapters/operators/set.kt"); + } + + } + + public static Test innerSuite() { + TestSuite suite = new TestSuite("Adapters"); + suite.addTestSuite(Adapters.class); + suite.addTestSuite(Operators.class); + return suite; + } + } + + public static Test innerSuite() { + TestSuite suite = new TestSuite("Sam"); + suite.addTestSuite(Sam.class); + suite.addTest(Adapters.innerSuite()); + return suite; + } } @TestMetadata("compiler/testData/codegen/boxWithJava/staticFun") @@ -481,8 +488,7 @@ public class BlackBoxWithJavaCodegenTestGenerated extends AbstractBlackBoxCodege suite.addTestSuite(Enum.class); suite.addTestSuite(Functions.class); suite.addTestSuite(Property.class); - suite.addTest(SamAdapters.innerSuite()); - suite.addTestSuite(SamWrappers.class); + suite.addTest(Sam.innerSuite()); suite.addTestSuite(StaticFun.class); suite.addTest(Visibility.innerSuite()); return suite; diff --git a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java index cecefb2837e..1a3b36ce16c 100644 --- a/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java +++ b/compiler/tests/org/jetbrains/jet/jvm/compiler/LoadJavaTestGenerated.java @@ -1018,7 +1018,7 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } @TestMetadata("compiler/testData/loadJava/compiledJava") - @InnerTestClasses({CompiledJava.Annotations.class, CompiledJava.ProtectedPackage.class, CompiledJava.ProtectedStatic.class, CompiledJava.SignaturePropagation.class, CompiledJava.SingleAbstractMethod.class, CompiledJava.Static.class}) + @InnerTestClasses({CompiledJava.Annotations.class, CompiledJava.ProtectedPackage.class, CompiledJava.ProtectedStatic.class, CompiledJava.Sam.class, CompiledJava.SignaturePropagation.class, CompiledJava.Static.class}) public static class CompiledJava extends AbstractLoadJavaTest { public void testAllFilesPresentInCompiledJava() throws Exception { JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJava"), Pattern.compile("^(.+)\\.java$"), true); @@ -1128,6 +1128,159 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } + @TestMetadata("compiler/testData/loadJava/compiledJava/sam") + @InnerTestClasses({Sam.Adapters.class}) + public static class Sam extends AbstractLoadJavaTest { + public void testAllFilesPresentInSam() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJava/sam"), Pattern.compile("^(.+)\\.java$"), true); + } + + @TestMetadata("Comparator.java") + public void testComparator() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/Comparator.java"); + } + + @TestMetadata("FilenameFilter.java") + public void testFilenameFilter() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/FilenameFilter.java"); + } + + @TestMetadata("GenericInterfaceParameterWithSelfBound.java") + public void testGenericInterfaceParameterWithSelfBound() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParameterWithSelfBound.java"); + } + + @TestMetadata("GenericInterfaceParametersWithBounds.java") + public void testGenericInterfaceParametersWithBounds() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/GenericInterfaceParametersWithBounds.java"); + } + + @TestMetadata("GenericMethodParameters.java") + public void testGenericMethodParameters() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/GenericMethodParameters.java"); + } + + @TestMetadata("InterfaceWithObjectMethod.java") + public void testInterfaceWithObjectMethod() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/InterfaceWithObjectMethod.java"); + } + + @TestMetadata("Nested.java") + public void testNested() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/Nested.java"); + } + + @TestMetadata("Runnable.java") + public void testRunnable() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/Runnable.java"); + } + + @TestMetadata("SamSubinterfaceOfTwo.java") + public void testSamSubinterfaceOfTwo() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOfTwo.java"); + } + + @TestMetadata("SamSubinterfaceOverridding.java") + public void testSamSubinterfaceOverridding() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/SamSubinterfaceOverridding.java"); + } + + @TestMetadata("SubstitutedSamInterface.java") + public void testSubstitutedSamInterface() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterface.java"); + } + + @TestMetadata("SubstitutedSamInterfaceSubclassOfBuiltin.java") + public void testSubstitutedSamInterfaceSubclassOfBuiltin() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/SubstitutedSamInterfaceSubclassOfBuiltin.java"); + } + + @TestMetadata("VarargParameter.java") + public void testVarargParameter() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/VarargParameter.java"); + } + + @TestMetadata("compiler/testData/loadJava/compiledJava/sam/adapters") + public static class Adapters extends AbstractLoadJavaTest { + public void testAllFilesPresentInAdapters() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJava/sam/adapters"), Pattern.compile("^(.+)\\.java$"), true); + } + + @TestMetadata("AmbiguousAdapters.java") + public void testAmbiguousAdapters() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.java"); + } + + @TestMetadata("Basic.java") + public void testBasic() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/Basic.java"); + } + + @TestMetadata("Constructor.java") + public void testConstructor() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/Constructor.java"); + } + + @TestMetadata("DeepSamLoop.java") + public void testDeepSamLoop() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/DeepSamLoop.java"); + } + + @TestMetadata("InheritedOverridden.java") + public void testInheritedOverridden() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/InheritedOverridden.java"); + } + + @TestMetadata("InheritedOverriddenAdapter.java") + public void testInheritedOverriddenAdapter() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/InheritedOverriddenAdapter.java"); + } + + @TestMetadata("InheritedSimple.java") + public void testInheritedSimple() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/InheritedSimple.java"); + } + + @TestMetadata("NonTrivialFunctionType.java") + public void testNonTrivialFunctionType() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.java"); + } + + @TestMetadata("SelfAsParameter.java") + public void testSelfAsParameter() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/SelfAsParameter.java"); + } + + @TestMetadata("SeveralSamParameters.java") + public void testSeveralSamParameters() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.java"); + } + + @TestMetadata("TypeParameterOfClass.java") + public void testTypeParameterOfClass() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.java"); + } + + @TestMetadata("TypeParameterOfMethod.java") + public void testTypeParameterOfMethod() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.java"); + } + + @TestMetadata("TypeParameterOfOuterClass.java") + public void testTypeParameterOfOuterClass() throws Exception { + doTestCompiledJava("compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.java"); + } + + } + + public static Test innerSuite() { + TestSuite suite = new TestSuite("Sam"); + suite.addTestSuite(Sam.class); + suite.addTestSuite(Adapters.class); + return suite; + } + } + @TestMetadata("compiler/testData/loadJava/compiledJava/signaturePropagation") public static class SignaturePropagation extends AbstractLoadJavaTest { public void testAllFilesPresentInSignaturePropagation() throws Exception { @@ -1171,159 +1324,6 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { } - @TestMetadata("compiler/testData/loadJava/compiledJava/singleAbstractMethod") - @InnerTestClasses({SingleAbstractMethod.Adapter.class}) - public static class SingleAbstractMethod extends AbstractLoadJavaTest { - public void testAllFilesPresentInSingleAbstractMethod() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJava/singleAbstractMethod"), Pattern.compile("^(.+)\\.java$"), true); - } - - @TestMetadata("Comparator.java") - public void testComparator() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/Comparator.java"); - } - - @TestMetadata("FilenameFilter.java") - public void testFilenameFilter() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/FilenameFilter.java"); - } - - @TestMetadata("GenericInterfaceParameterWithSelfBound.java") - public void testGenericInterfaceParameterWithSelfBound() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericInterfaceParameterWithSelfBound.java"); - } - - @TestMetadata("GenericInterfaceParametersWithBounds.java") - public void testGenericInterfaceParametersWithBounds() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericInterfaceParametersWithBounds.java"); - } - - @TestMetadata("GenericMethodParameters.java") - public void testGenericMethodParameters() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/GenericMethodParameters.java"); - } - - @TestMetadata("InterfaceWithObjectMethod.java") - public void testInterfaceWithObjectMethod() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/InterfaceWithObjectMethod.java"); - } - - @TestMetadata("Nested.java") - public void testNested() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/Nested.java"); - } - - @TestMetadata("Runnable.java") - public void testRunnable() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/Runnable.java"); - } - - @TestMetadata("SamSubinterfaceOfTwo.java") - public void testSamSubinterfaceOfTwo() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/SamSubinterfaceOfTwo.java"); - } - - @TestMetadata("SamSubinterfaceOverridding.java") - public void testSamSubinterfaceOverridding() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/SamSubinterfaceOverridding.java"); - } - - @TestMetadata("SubstitutedSamInterface.java") - public void testSubstitutedSamInterface() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterface.java"); - } - - @TestMetadata("SubstitutedSamInterfaceSubclassOfBuiltin.java") - public void testSubstitutedSamInterfaceSubclassOfBuiltin() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/SubstitutedSamInterfaceSubclassOfBuiltin.java"); - } - - @TestMetadata("VarargParameter.java") - public void testVarargParameter() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/VarargParameter.java"); - } - - @TestMetadata("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter") - public static class Adapter extends AbstractLoadJavaTest { - public void testAllFilesPresentInAdapter() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), "org.jetbrains.jet.generators.tests.GenerateTests", new File("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter"), Pattern.compile("^(.+)\\.java$"), true); - } - - @TestMetadata("AmbiguousAdapters.java") - public void testAmbiguousAdapters() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/AmbiguousAdapters.java"); - } - - @TestMetadata("Basic.java") - public void testBasic() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/Basic.java"); - } - - @TestMetadata("Constructor.java") - public void testConstructor() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/Constructor.java"); - } - - @TestMetadata("DeepSamLoop.java") - public void testDeepSamLoop() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/DeepSamLoop.java"); - } - - @TestMetadata("InheritedOverridden.java") - public void testInheritedOverridden() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverridden.java"); - } - - @TestMetadata("InheritedOverriddenAdapter.java") - public void testInheritedOverriddenAdapter() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedOverriddenAdapter.java"); - } - - @TestMetadata("InheritedSimple.java") - public void testInheritedSimple() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/InheritedSimple.java"); - } - - @TestMetadata("NonTrivialFunctionType.java") - public void testNonTrivialFunctionType() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/NonTrivialFunctionType.java"); - } - - @TestMetadata("SelfAsParameter.java") - public void testSelfAsParameter() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SelfAsParameter.java"); - } - - @TestMetadata("SeveralSamParameters.java") - public void testSeveralSamParameters() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/SeveralSamParameters.java"); - } - - @TestMetadata("TypeParameterOfClass.java") - public void testTypeParameterOfClass() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfClass.java"); - } - - @TestMetadata("TypeParameterOfMethod.java") - public void testTypeParameterOfMethod() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfMethod.java"); - } - - @TestMetadata("TypeParameterOfOuterClass.java") - public void testTypeParameterOfOuterClass() throws Exception { - doTestCompiledJava("compiler/testData/loadJava/compiledJava/singleAbstractMethod/adapter/TypeParameterOfOuterClass.java"); - } - - } - - public static Test innerSuite() { - TestSuite suite = new TestSuite("SingleAbstractMethod"); - suite.addTestSuite(SingleAbstractMethod.class); - suite.addTestSuite(Adapter.class); - return suite; - } - } - @TestMetadata("compiler/testData/loadJava/compiledJava/static") public static class Static extends AbstractLoadJavaTest { public void testAllFilesPresentInStatic() throws Exception { @@ -1373,8 +1373,8 @@ public class LoadJavaTestGenerated extends AbstractLoadJavaTest { suite.addTestSuite(Annotations.class); suite.addTestSuite(ProtectedPackage.class); suite.addTestSuite(ProtectedStatic.class); + suite.addTest(Sam.innerSuite()); suite.addTestSuite(SignaturePropagation.class); - suite.addTest(SingleAbstractMethod.innerSuite()); suite.addTestSuite(Static.class); return suite; }