From c8b6db4e57859ef10bdb36b8b333baffbd6f8715 Mon Sep 17 00:00:00 2001 From: Valentin Kipyatkov Date: Wed, 23 Sep 2015 16:08:30 +0300 Subject: [PATCH] Renamed test data folder --- .../AccessInGetterWithThis.java | 0 .../AccessInGetterWithThis.kt | 0 .../AccessorsImplementInterface.java | 0 .../AccessorsImplementInterface.kt | 0 .../AnonymousClass.java | 0 .../AnonymousClass.kt | 0 .../CannotDropOnlySetter.java | 0 .../CannotDropOnlySetter.kt | 0 .../DataClass.java | 0 .../DataClass.kt | 0 .../DataClassWithMutableField.java | 0 .../DataClassWithMutableField.kt | 0 .../DifferentFieldName.java | 0 .../DifferentFieldName.kt | 0 ...rentFieldNameAndDefaultParameterValue.java | 0 ...ferentFieldNameAndDefaultParameterValue.kt | 0 .../DifferentFieldNameAndSuperClass.java | 0 .../DifferentFieldNameAndSuperClass.kt | 0 .../DifferentProtectedFieldName.java | 0 .../DifferentProtectedFieldName.kt | 0 .../DropGetter.java | 0 .../DropGetter.kt | 0 .../DropGetterAndSetter.java | 0 .../DropGetterAndSetter.kt | 0 .../DropGetterForMutable.java | 0 .../DropGetterForMutable.kt | 0 .../FalseGetter.java | 0 .../FalseGetter.kt | 0 .../FalseSetter.java | 0 .../FalseSetter.kt | 0 .../FieldUsagesInFactoryMethods.java | 0 .../FieldUsagesInFactoryMethods.kt | 0 .../GetterAndSetterNamesDifferent.java | 0 .../GetterAndSetterNamesDifferent.kt | 0 .../GetterSetterUsages.java | 0 .../GetterSetterUsages.kt | 0 .../GetterTypeNotMatch.java | 0 .../GetterTypeNotMatch.kt | 0 .../InCompanionObject.java | 0 .../InCompanionObject.kt | 0 .../InInterface.java | 0 .../InInterface.kt | 0 .../InObject.java | 0 .../InObject.kt | 0 .../JavaKeywordPropertyName.java | 0 .../JavaKeywordPropertyName.kt | 0 .../KeywordPropertyName.java | 0 .../KeywordPropertyName.kt | 0 .../Overrides.java | 0 .../Overrides.kt | 0 .../OverridesOfExternalCode.java | 0 .../OverridesOfExternalCode.kt | 0 .../QualifyFieldUsagesOnRename.java.todo | 0 .../SetterTypeNotMatch.java | 0 .../SetterTypeNotMatch.kt | 0 ...otlinConverterForWebDemoTestGenerated.java | 342 +++++++++--------- ...otlinConverterSingleFileTestGenerated.java | 342 +++++++++--------- 57 files changed, 342 insertions(+), 342 deletions(-) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/AccessInGetterWithThis.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/AccessInGetterWithThis.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/AccessorsImplementInterface.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/AccessorsImplementInterface.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/AnonymousClass.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/AnonymousClass.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/CannotDropOnlySetter.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/CannotDropOnlySetter.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DataClass.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DataClass.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DataClassWithMutableField.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DataClassWithMutableField.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DifferentFieldName.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DifferentFieldName.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DifferentFieldNameAndDefaultParameterValue.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DifferentFieldNameAndDefaultParameterValue.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DifferentFieldNameAndSuperClass.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DifferentFieldNameAndSuperClass.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DifferentProtectedFieldName.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DifferentProtectedFieldName.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DropGetter.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DropGetter.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DropGetterAndSetter.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DropGetterAndSetter.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DropGetterForMutable.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/DropGetterForMutable.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/FalseGetter.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/FalseGetter.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/FalseSetter.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/FalseSetter.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/FieldUsagesInFactoryMethods.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/FieldUsagesInFactoryMethods.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/GetterAndSetterNamesDifferent.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/GetterAndSetterNamesDifferent.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/GetterSetterUsages.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/GetterSetterUsages.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/GetterTypeNotMatch.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/GetterTypeNotMatch.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/InCompanionObject.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/InCompanionObject.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/InInterface.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/InInterface.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/InObject.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/InObject.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/JavaKeywordPropertyName.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/JavaKeywordPropertyName.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/KeywordPropertyName.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/KeywordPropertyName.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/Overrides.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/Overrides.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/OverridesOfExternalCode.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/OverridesOfExternalCode.kt (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/QualifyFieldUsagesOnRename.java.todo (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/SetterTypeNotMatch.java (100%) rename j2k/testData/fileOrElement/{dropAccessors => detectProperties}/SetterTypeNotMatch.kt (100%) diff --git a/j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.java b/j2k/testData/fileOrElement/detectProperties/AccessInGetterWithThis.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.java rename to j2k/testData/fileOrElement/detectProperties/AccessInGetterWithThis.java diff --git a/j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.kt b/j2k/testData/fileOrElement/detectProperties/AccessInGetterWithThis.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.kt rename to j2k/testData/fileOrElement/detectProperties/AccessInGetterWithThis.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/AccessorsImplementInterface.java b/j2k/testData/fileOrElement/detectProperties/AccessorsImplementInterface.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/AccessorsImplementInterface.java rename to j2k/testData/fileOrElement/detectProperties/AccessorsImplementInterface.java diff --git a/j2k/testData/fileOrElement/dropAccessors/AccessorsImplementInterface.kt b/j2k/testData/fileOrElement/detectProperties/AccessorsImplementInterface.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/AccessorsImplementInterface.kt rename to j2k/testData/fileOrElement/detectProperties/AccessorsImplementInterface.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/AnonymousClass.java b/j2k/testData/fileOrElement/detectProperties/AnonymousClass.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/AnonymousClass.java rename to j2k/testData/fileOrElement/detectProperties/AnonymousClass.java diff --git a/j2k/testData/fileOrElement/dropAccessors/AnonymousClass.kt b/j2k/testData/fileOrElement/detectProperties/AnonymousClass.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/AnonymousClass.kt rename to j2k/testData/fileOrElement/detectProperties/AnonymousClass.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.java b/j2k/testData/fileOrElement/detectProperties/CannotDropOnlySetter.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.java rename to j2k/testData/fileOrElement/detectProperties/CannotDropOnlySetter.java diff --git a/j2k/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.kt b/j2k/testData/fileOrElement/detectProperties/CannotDropOnlySetter.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.kt rename to j2k/testData/fileOrElement/detectProperties/CannotDropOnlySetter.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/DataClass.java b/j2k/testData/fileOrElement/detectProperties/DataClass.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DataClass.java rename to j2k/testData/fileOrElement/detectProperties/DataClass.java diff --git a/j2k/testData/fileOrElement/dropAccessors/DataClass.kt b/j2k/testData/fileOrElement/detectProperties/DataClass.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DataClass.kt rename to j2k/testData/fileOrElement/detectProperties/DataClass.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.java b/j2k/testData/fileOrElement/detectProperties/DataClassWithMutableField.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.java rename to j2k/testData/fileOrElement/detectProperties/DataClassWithMutableField.java diff --git a/j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.kt b/j2k/testData/fileOrElement/detectProperties/DataClassWithMutableField.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.kt rename to j2k/testData/fileOrElement/detectProperties/DataClassWithMutableField.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.java b/j2k/testData/fileOrElement/detectProperties/DifferentFieldName.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.java rename to j2k/testData/fileOrElement/detectProperties/DifferentFieldName.java diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt b/j2k/testData/fileOrElement/detectProperties/DifferentFieldName.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.kt rename to j2k/testData/fileOrElement/detectProperties/DifferentFieldName.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.java b/j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndDefaultParameterValue.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.java rename to j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndDefaultParameterValue.java diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt b/j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndDefaultParameterValue.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.kt rename to j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndDefaultParameterValue.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.java b/j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndSuperClass.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.java rename to j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndSuperClass.java diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt b/j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndSuperClass.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.kt rename to j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndSuperClass.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.java b/j2k/testData/fileOrElement/detectProperties/DifferentProtectedFieldName.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.java rename to j2k/testData/fileOrElement/detectProperties/DifferentProtectedFieldName.java diff --git a/j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt b/j2k/testData/fileOrElement/detectProperties/DifferentProtectedFieldName.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.kt rename to j2k/testData/fileOrElement/detectProperties/DifferentProtectedFieldName.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/DropGetter.java b/j2k/testData/fileOrElement/detectProperties/DropGetter.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DropGetter.java rename to j2k/testData/fileOrElement/detectProperties/DropGetter.java diff --git a/j2k/testData/fileOrElement/dropAccessors/DropGetter.kt b/j2k/testData/fileOrElement/detectProperties/DropGetter.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DropGetter.kt rename to j2k/testData/fileOrElement/detectProperties/DropGetter.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.java b/j2k/testData/fileOrElement/detectProperties/DropGetterAndSetter.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.java rename to j2k/testData/fileOrElement/detectProperties/DropGetterAndSetter.java diff --git a/j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.kt b/j2k/testData/fileOrElement/detectProperties/DropGetterAndSetter.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.kt rename to j2k/testData/fileOrElement/detectProperties/DropGetterAndSetter.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.java b/j2k/testData/fileOrElement/detectProperties/DropGetterForMutable.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.java rename to j2k/testData/fileOrElement/detectProperties/DropGetterForMutable.java diff --git a/j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.kt b/j2k/testData/fileOrElement/detectProperties/DropGetterForMutable.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.kt rename to j2k/testData/fileOrElement/detectProperties/DropGetterForMutable.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/FalseGetter.java b/j2k/testData/fileOrElement/detectProperties/FalseGetter.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/FalseGetter.java rename to j2k/testData/fileOrElement/detectProperties/FalseGetter.java diff --git a/j2k/testData/fileOrElement/dropAccessors/FalseGetter.kt b/j2k/testData/fileOrElement/detectProperties/FalseGetter.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/FalseGetter.kt rename to j2k/testData/fileOrElement/detectProperties/FalseGetter.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/FalseSetter.java b/j2k/testData/fileOrElement/detectProperties/FalseSetter.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/FalseSetter.java rename to j2k/testData/fileOrElement/detectProperties/FalseSetter.java diff --git a/j2k/testData/fileOrElement/dropAccessors/FalseSetter.kt b/j2k/testData/fileOrElement/detectProperties/FalseSetter.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/FalseSetter.kt rename to j2k/testData/fileOrElement/detectProperties/FalseSetter.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.java b/j2k/testData/fileOrElement/detectProperties/FieldUsagesInFactoryMethods.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.java rename to j2k/testData/fileOrElement/detectProperties/FieldUsagesInFactoryMethods.java diff --git a/j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt b/j2k/testData/fileOrElement/detectProperties/FieldUsagesInFactoryMethods.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.kt rename to j2k/testData/fileOrElement/detectProperties/FieldUsagesInFactoryMethods.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.java b/j2k/testData/fileOrElement/detectProperties/GetterAndSetterNamesDifferent.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.java rename to j2k/testData/fileOrElement/detectProperties/GetterAndSetterNamesDifferent.java diff --git a/j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.kt b/j2k/testData/fileOrElement/detectProperties/GetterAndSetterNamesDifferent.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.kt rename to j2k/testData/fileOrElement/detectProperties/GetterAndSetterNamesDifferent.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.java b/j2k/testData/fileOrElement/detectProperties/GetterSetterUsages.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.java rename to j2k/testData/fileOrElement/detectProperties/GetterSetterUsages.java diff --git a/j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt b/j2k/testData/fileOrElement/detectProperties/GetterSetterUsages.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.kt rename to j2k/testData/fileOrElement/detectProperties/GetterSetterUsages.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/GetterTypeNotMatch.java b/j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/GetterTypeNotMatch.java rename to j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.java diff --git a/j2k/testData/fileOrElement/dropAccessors/GetterTypeNotMatch.kt b/j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/GetterTypeNotMatch.kt rename to j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/InCompanionObject.java b/j2k/testData/fileOrElement/detectProperties/InCompanionObject.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/InCompanionObject.java rename to j2k/testData/fileOrElement/detectProperties/InCompanionObject.java diff --git a/j2k/testData/fileOrElement/dropAccessors/InCompanionObject.kt b/j2k/testData/fileOrElement/detectProperties/InCompanionObject.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/InCompanionObject.kt rename to j2k/testData/fileOrElement/detectProperties/InCompanionObject.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/InInterface.java b/j2k/testData/fileOrElement/detectProperties/InInterface.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/InInterface.java rename to j2k/testData/fileOrElement/detectProperties/InInterface.java diff --git a/j2k/testData/fileOrElement/dropAccessors/InInterface.kt b/j2k/testData/fileOrElement/detectProperties/InInterface.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/InInterface.kt rename to j2k/testData/fileOrElement/detectProperties/InInterface.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/InObject.java b/j2k/testData/fileOrElement/detectProperties/InObject.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/InObject.java rename to j2k/testData/fileOrElement/detectProperties/InObject.java diff --git a/j2k/testData/fileOrElement/dropAccessors/InObject.kt b/j2k/testData/fileOrElement/detectProperties/InObject.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/InObject.kt rename to j2k/testData/fileOrElement/detectProperties/InObject.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.java b/j2k/testData/fileOrElement/detectProperties/JavaKeywordPropertyName.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.java rename to j2k/testData/fileOrElement/detectProperties/JavaKeywordPropertyName.java diff --git a/j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt b/j2k/testData/fileOrElement/detectProperties/JavaKeywordPropertyName.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.kt rename to j2k/testData/fileOrElement/detectProperties/JavaKeywordPropertyName.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.java b/j2k/testData/fileOrElement/detectProperties/KeywordPropertyName.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.java rename to j2k/testData/fileOrElement/detectProperties/KeywordPropertyName.java diff --git a/j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt b/j2k/testData/fileOrElement/detectProperties/KeywordPropertyName.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.kt rename to j2k/testData/fileOrElement/detectProperties/KeywordPropertyName.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/Overrides.java b/j2k/testData/fileOrElement/detectProperties/Overrides.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/Overrides.java rename to j2k/testData/fileOrElement/detectProperties/Overrides.java diff --git a/j2k/testData/fileOrElement/dropAccessors/Overrides.kt b/j2k/testData/fileOrElement/detectProperties/Overrides.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/Overrides.kt rename to j2k/testData/fileOrElement/detectProperties/Overrides.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/OverridesOfExternalCode.java b/j2k/testData/fileOrElement/detectProperties/OverridesOfExternalCode.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/OverridesOfExternalCode.java rename to j2k/testData/fileOrElement/detectProperties/OverridesOfExternalCode.java diff --git a/j2k/testData/fileOrElement/dropAccessors/OverridesOfExternalCode.kt b/j2k/testData/fileOrElement/detectProperties/OverridesOfExternalCode.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/OverridesOfExternalCode.kt rename to j2k/testData/fileOrElement/detectProperties/OverridesOfExternalCode.kt diff --git a/j2k/testData/fileOrElement/dropAccessors/QualifyFieldUsagesOnRename.java.todo b/j2k/testData/fileOrElement/detectProperties/QualifyFieldUsagesOnRename.java.todo similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/QualifyFieldUsagesOnRename.java.todo rename to j2k/testData/fileOrElement/detectProperties/QualifyFieldUsagesOnRename.java.todo diff --git a/j2k/testData/fileOrElement/dropAccessors/SetterTypeNotMatch.java b/j2k/testData/fileOrElement/detectProperties/SetterTypeNotMatch.java similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/SetterTypeNotMatch.java rename to j2k/testData/fileOrElement/detectProperties/SetterTypeNotMatch.java diff --git a/j2k/testData/fileOrElement/dropAccessors/SetterTypeNotMatch.kt b/j2k/testData/fileOrElement/detectProperties/SetterTypeNotMatch.kt similarity index 100% rename from j2k/testData/fileOrElement/dropAccessors/SetterTypeNotMatch.kt rename to j2k/testData/fileOrElement/detectProperties/SetterTypeNotMatch.kt diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java index b61e644fbfd..e5b004a2509 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterForWebDemoTestGenerated.java @@ -1379,6 +1379,177 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo } } + @TestMetadata("j2k/testData/fileOrElement/detectProperties") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class DetectProperties extends AbstractJavaToKotlinConverterForWebDemoTest { + @TestMetadata("AccessInGetterWithThis.java") + public void testAccessInGetterWithThis() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AccessInGetterWithThis.java"); + doTest(fileName); + } + + @TestMetadata("AccessorsImplementInterface.java") + public void testAccessorsImplementInterface() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AccessorsImplementInterface.java"); + doTest(fileName); + } + + public void testAllFilesPresentInDetectProperties() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/detectProperties"), Pattern.compile("^(.+)\\.java$"), true); + } + + @TestMetadata("AnonymousClass.java") + public void testAnonymousClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AnonymousClass.java"); + doTest(fileName); + } + + @TestMetadata("CannotDropOnlySetter.java") + public void testCannotDropOnlySetter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/CannotDropOnlySetter.java"); + doTest(fileName); + } + + @TestMetadata("DataClass.java") + public void testDataClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DataClass.java"); + doTest(fileName); + } + + @TestMetadata("DataClassWithMutableField.java") + public void testDataClassWithMutableField() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DataClassWithMutableField.java"); + doTest(fileName); + } + + @TestMetadata("DifferentFieldName.java") + public void testDifferentFieldName() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldName.java"); + doTest(fileName); + } + + @TestMetadata("DifferentFieldNameAndDefaultParameterValue.java") + public void testDifferentFieldNameAndDefaultParameterValue() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndDefaultParameterValue.java"); + doTest(fileName); + } + + @TestMetadata("DifferentFieldNameAndSuperClass.java") + public void testDifferentFieldNameAndSuperClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndSuperClass.java"); + doTest(fileName); + } + + @TestMetadata("DifferentProtectedFieldName.java") + public void testDifferentProtectedFieldName() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentProtectedFieldName.java"); + doTest(fileName); + } + + @TestMetadata("DropGetter.java") + public void testDropGetter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetter.java"); + doTest(fileName); + } + + @TestMetadata("DropGetterAndSetter.java") + public void testDropGetterAndSetter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetterAndSetter.java"); + doTest(fileName); + } + + @TestMetadata("DropGetterForMutable.java") + public void testDropGetterForMutable() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetterForMutable.java"); + doTest(fileName); + } + + @TestMetadata("FalseGetter.java") + public void testFalseGetter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FalseGetter.java"); + doTest(fileName); + } + + @TestMetadata("FalseSetter.java") + public void testFalseSetter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FalseSetter.java"); + doTest(fileName); + } + + @TestMetadata("FieldUsagesInFactoryMethods.java") + public void testFieldUsagesInFactoryMethods() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FieldUsagesInFactoryMethods.java"); + doTest(fileName); + } + + @TestMetadata("GetterAndSetterNamesDifferent.java") + public void testGetterAndSetterNamesDifferent() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterAndSetterNamesDifferent.java"); + doTest(fileName); + } + + @TestMetadata("GetterSetterUsages.java") + public void testGetterSetterUsages() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterSetterUsages.java"); + doTest(fileName); + } + + @TestMetadata("GetterTypeNotMatch.java") + public void testGetterTypeNotMatch() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.java"); + doTest(fileName); + } + + @TestMetadata("InCompanionObject.java") + public void testInCompanionObject() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InCompanionObject.java"); + doTest(fileName); + } + + @TestMetadata("InInterface.java") + public void testInInterface() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InInterface.java"); + doTest(fileName); + } + + @TestMetadata("InObject.java") + public void testInObject() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InObject.java"); + doTest(fileName); + } + + @TestMetadata("JavaKeywordPropertyName.java") + public void testJavaKeywordPropertyName() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/JavaKeywordPropertyName.java"); + doTest(fileName); + } + + @TestMetadata("KeywordPropertyName.java") + public void testKeywordPropertyName() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/KeywordPropertyName.java"); + doTest(fileName); + } + + @TestMetadata("Overrides.java") + public void testOverrides() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/Overrides.java"); + doTest(fileName); + } + + @TestMetadata("OverridesOfExternalCode.java") + public void testOverridesOfExternalCode() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/OverridesOfExternalCode.java"); + doTest(fileName); + } + + @TestMetadata("SetterTypeNotMatch.java") + public void testSetterTypeNotMatch() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/SetterTypeNotMatch.java"); + doTest(fileName); + } + } + @TestMetadata("j2k/testData/fileOrElement/doWhileStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -1469,177 +1640,6 @@ public class JavaToKotlinConverterForWebDemoTestGenerated extends AbstractJavaTo } } - @TestMetadata("j2k/testData/fileOrElement/dropAccessors") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class DropAccessors extends AbstractJavaToKotlinConverterForWebDemoTest { - @TestMetadata("AccessInGetterWithThis.java") - public void testAccessInGetterWithThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.java"); - doTest(fileName); - } - - @TestMetadata("AccessorsImplementInterface.java") - public void testAccessorsImplementInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/AccessorsImplementInterface.java"); - doTest(fileName); - } - - public void testAllFilesPresentInDropAccessors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/dropAccessors"), Pattern.compile("^(.+)\\.java$"), true); - } - - @TestMetadata("AnonymousClass.java") - public void testAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/AnonymousClass.java"); - doTest(fileName); - } - - @TestMetadata("CannotDropOnlySetter.java") - public void testCannotDropOnlySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.java"); - doTest(fileName); - } - - @TestMetadata("DataClass.java") - public void testDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DataClass.java"); - doTest(fileName); - } - - @TestMetadata("DataClassWithMutableField.java") - public void testDataClassWithMutableField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.java"); - doTest(fileName); - } - - @TestMetadata("DifferentFieldName.java") - public void testDifferentFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.java"); - doTest(fileName); - } - - @TestMetadata("DifferentFieldNameAndDefaultParameterValue.java") - public void testDifferentFieldNameAndDefaultParameterValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.java"); - doTest(fileName); - } - - @TestMetadata("DifferentFieldNameAndSuperClass.java") - public void testDifferentFieldNameAndSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.java"); - doTest(fileName); - } - - @TestMetadata("DifferentProtectedFieldName.java") - public void testDifferentProtectedFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.java"); - doTest(fileName); - } - - @TestMetadata("DropGetter.java") - public void testDropGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DropGetter.java"); - doTest(fileName); - } - - @TestMetadata("DropGetterAndSetter.java") - public void testDropGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.java"); - doTest(fileName); - } - - @TestMetadata("DropGetterForMutable.java") - public void testDropGetterForMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.java"); - doTest(fileName); - } - - @TestMetadata("FalseGetter.java") - public void testFalseGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/FalseGetter.java"); - doTest(fileName); - } - - @TestMetadata("FalseSetter.java") - public void testFalseSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/FalseSetter.java"); - doTest(fileName); - } - - @TestMetadata("FieldUsagesInFactoryMethods.java") - public void testFieldUsagesInFactoryMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.java"); - doTest(fileName); - } - - @TestMetadata("GetterAndSetterNamesDifferent.java") - public void testGetterAndSetterNamesDifferent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.java"); - doTest(fileName); - } - - @TestMetadata("GetterSetterUsages.java") - public void testGetterSetterUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.java"); - doTest(fileName); - } - - @TestMetadata("GetterTypeNotMatch.java") - public void testGetterTypeNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/GetterTypeNotMatch.java"); - doTest(fileName); - } - - @TestMetadata("InCompanionObject.java") - public void testInCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/InCompanionObject.java"); - doTest(fileName); - } - - @TestMetadata("InInterface.java") - public void testInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/InInterface.java"); - doTest(fileName); - } - - @TestMetadata("InObject.java") - public void testInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/InObject.java"); - doTest(fileName); - } - - @TestMetadata("JavaKeywordPropertyName.java") - public void testJavaKeywordPropertyName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.java"); - doTest(fileName); - } - - @TestMetadata("KeywordPropertyName.java") - public void testKeywordPropertyName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.java"); - doTest(fileName); - } - - @TestMetadata("Overrides.java") - public void testOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/Overrides.java"); - doTest(fileName); - } - - @TestMetadata("OverridesOfExternalCode.java") - public void testOverridesOfExternalCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/OverridesOfExternalCode.java"); - doTest(fileName); - } - - @TestMetadata("SetterTypeNotMatch.java") - public void testSetterTypeNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/SetterTypeNotMatch.java"); - doTest(fileName); - } - } - @TestMetadata("j2k/testData/fileOrElement/enum") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) diff --git a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java index 6965d974518..0607e876e69 100644 --- a/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java +++ b/j2k/tests/org/jetbrains/kotlin/j2k/JavaToKotlinConverterSingleFileTestGenerated.java @@ -1379,6 +1379,177 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo } } + @TestMetadata("j2k/testData/fileOrElement/detectProperties") + @TestDataPath("$PROJECT_ROOT") + @RunWith(JUnit3RunnerWithInners.class) + public static class DetectProperties extends AbstractJavaToKotlinConverterSingleFileTest { + @TestMetadata("AccessInGetterWithThis.java") + public void testAccessInGetterWithThis() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AccessInGetterWithThis.java"); + doTest(fileName); + } + + @TestMetadata("AccessorsImplementInterface.java") + public void testAccessorsImplementInterface() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AccessorsImplementInterface.java"); + doTest(fileName); + } + + public void testAllFilesPresentInDetectProperties() throws Exception { + JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/detectProperties"), Pattern.compile("^(.+)\\.java$"), true); + } + + @TestMetadata("AnonymousClass.java") + public void testAnonymousClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/AnonymousClass.java"); + doTest(fileName); + } + + @TestMetadata("CannotDropOnlySetter.java") + public void testCannotDropOnlySetter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/CannotDropOnlySetter.java"); + doTest(fileName); + } + + @TestMetadata("DataClass.java") + public void testDataClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DataClass.java"); + doTest(fileName); + } + + @TestMetadata("DataClassWithMutableField.java") + public void testDataClassWithMutableField() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DataClassWithMutableField.java"); + doTest(fileName); + } + + @TestMetadata("DifferentFieldName.java") + public void testDifferentFieldName() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldName.java"); + doTest(fileName); + } + + @TestMetadata("DifferentFieldNameAndDefaultParameterValue.java") + public void testDifferentFieldNameAndDefaultParameterValue() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndDefaultParameterValue.java"); + doTest(fileName); + } + + @TestMetadata("DifferentFieldNameAndSuperClass.java") + public void testDifferentFieldNameAndSuperClass() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentFieldNameAndSuperClass.java"); + doTest(fileName); + } + + @TestMetadata("DifferentProtectedFieldName.java") + public void testDifferentProtectedFieldName() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DifferentProtectedFieldName.java"); + doTest(fileName); + } + + @TestMetadata("DropGetter.java") + public void testDropGetter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetter.java"); + doTest(fileName); + } + + @TestMetadata("DropGetterAndSetter.java") + public void testDropGetterAndSetter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetterAndSetter.java"); + doTest(fileName); + } + + @TestMetadata("DropGetterForMutable.java") + public void testDropGetterForMutable() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/DropGetterForMutable.java"); + doTest(fileName); + } + + @TestMetadata("FalseGetter.java") + public void testFalseGetter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FalseGetter.java"); + doTest(fileName); + } + + @TestMetadata("FalseSetter.java") + public void testFalseSetter() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FalseSetter.java"); + doTest(fileName); + } + + @TestMetadata("FieldUsagesInFactoryMethods.java") + public void testFieldUsagesInFactoryMethods() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/FieldUsagesInFactoryMethods.java"); + doTest(fileName); + } + + @TestMetadata("GetterAndSetterNamesDifferent.java") + public void testGetterAndSetterNamesDifferent() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterAndSetterNamesDifferent.java"); + doTest(fileName); + } + + @TestMetadata("GetterSetterUsages.java") + public void testGetterSetterUsages() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterSetterUsages.java"); + doTest(fileName); + } + + @TestMetadata("GetterTypeNotMatch.java") + public void testGetterTypeNotMatch() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/GetterTypeNotMatch.java"); + doTest(fileName); + } + + @TestMetadata("InCompanionObject.java") + public void testInCompanionObject() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InCompanionObject.java"); + doTest(fileName); + } + + @TestMetadata("InInterface.java") + public void testInInterface() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InInterface.java"); + doTest(fileName); + } + + @TestMetadata("InObject.java") + public void testInObject() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/InObject.java"); + doTest(fileName); + } + + @TestMetadata("JavaKeywordPropertyName.java") + public void testJavaKeywordPropertyName() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/JavaKeywordPropertyName.java"); + doTest(fileName); + } + + @TestMetadata("KeywordPropertyName.java") + public void testKeywordPropertyName() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/KeywordPropertyName.java"); + doTest(fileName); + } + + @TestMetadata("Overrides.java") + public void testOverrides() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/Overrides.java"); + doTest(fileName); + } + + @TestMetadata("OverridesOfExternalCode.java") + public void testOverridesOfExternalCode() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/OverridesOfExternalCode.java"); + doTest(fileName); + } + + @TestMetadata("SetterTypeNotMatch.java") + public void testSetterTypeNotMatch() throws Exception { + String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/detectProperties/SetterTypeNotMatch.java"); + doTest(fileName); + } + } + @TestMetadata("j2k/testData/fileOrElement/doWhileStatement") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class) @@ -1469,177 +1640,6 @@ public class JavaToKotlinConverterSingleFileTestGenerated extends AbstractJavaTo } } - @TestMetadata("j2k/testData/fileOrElement/dropAccessors") - @TestDataPath("$PROJECT_ROOT") - @RunWith(JUnit3RunnerWithInners.class) - public static class DropAccessors extends AbstractJavaToKotlinConverterSingleFileTest { - @TestMetadata("AccessInGetterWithThis.java") - public void testAccessInGetterWithThis() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/AccessInGetterWithThis.java"); - doTest(fileName); - } - - @TestMetadata("AccessorsImplementInterface.java") - public void testAccessorsImplementInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/AccessorsImplementInterface.java"); - doTest(fileName); - } - - public void testAllFilesPresentInDropAccessors() throws Exception { - JetTestUtils.assertAllTestsPresentByMetadata(this.getClass(), new File("j2k/testData/fileOrElement/dropAccessors"), Pattern.compile("^(.+)\\.java$"), true); - } - - @TestMetadata("AnonymousClass.java") - public void testAnonymousClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/AnonymousClass.java"); - doTest(fileName); - } - - @TestMetadata("CannotDropOnlySetter.java") - public void testCannotDropOnlySetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/CannotDropOnlySetter.java"); - doTest(fileName); - } - - @TestMetadata("DataClass.java") - public void testDataClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DataClass.java"); - doTest(fileName); - } - - @TestMetadata("DataClassWithMutableField.java") - public void testDataClassWithMutableField() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DataClassWithMutableField.java"); - doTest(fileName); - } - - @TestMetadata("DifferentFieldName.java") - public void testDifferentFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DifferentFieldName.java"); - doTest(fileName); - } - - @TestMetadata("DifferentFieldNameAndDefaultParameterValue.java") - public void testDifferentFieldNameAndDefaultParameterValue() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndDefaultParameterValue.java"); - doTest(fileName); - } - - @TestMetadata("DifferentFieldNameAndSuperClass.java") - public void testDifferentFieldNameAndSuperClass() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DifferentFieldNameAndSuperClass.java"); - doTest(fileName); - } - - @TestMetadata("DifferentProtectedFieldName.java") - public void testDifferentProtectedFieldName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DifferentProtectedFieldName.java"); - doTest(fileName); - } - - @TestMetadata("DropGetter.java") - public void testDropGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DropGetter.java"); - doTest(fileName); - } - - @TestMetadata("DropGetterAndSetter.java") - public void testDropGetterAndSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DropGetterAndSetter.java"); - doTest(fileName); - } - - @TestMetadata("DropGetterForMutable.java") - public void testDropGetterForMutable() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/DropGetterForMutable.java"); - doTest(fileName); - } - - @TestMetadata("FalseGetter.java") - public void testFalseGetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/FalseGetter.java"); - doTest(fileName); - } - - @TestMetadata("FalseSetter.java") - public void testFalseSetter() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/FalseSetter.java"); - doTest(fileName); - } - - @TestMetadata("FieldUsagesInFactoryMethods.java") - public void testFieldUsagesInFactoryMethods() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/FieldUsagesInFactoryMethods.java"); - doTest(fileName); - } - - @TestMetadata("GetterAndSetterNamesDifferent.java") - public void testGetterAndSetterNamesDifferent() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/GetterAndSetterNamesDifferent.java"); - doTest(fileName); - } - - @TestMetadata("GetterSetterUsages.java") - public void testGetterSetterUsages() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/GetterSetterUsages.java"); - doTest(fileName); - } - - @TestMetadata("GetterTypeNotMatch.java") - public void testGetterTypeNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/GetterTypeNotMatch.java"); - doTest(fileName); - } - - @TestMetadata("InCompanionObject.java") - public void testInCompanionObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/InCompanionObject.java"); - doTest(fileName); - } - - @TestMetadata("InInterface.java") - public void testInInterface() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/InInterface.java"); - doTest(fileName); - } - - @TestMetadata("InObject.java") - public void testInObject() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/InObject.java"); - doTest(fileName); - } - - @TestMetadata("JavaKeywordPropertyName.java") - public void testJavaKeywordPropertyName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/JavaKeywordPropertyName.java"); - doTest(fileName); - } - - @TestMetadata("KeywordPropertyName.java") - public void testKeywordPropertyName() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/KeywordPropertyName.java"); - doTest(fileName); - } - - @TestMetadata("Overrides.java") - public void testOverrides() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/Overrides.java"); - doTest(fileName); - } - - @TestMetadata("OverridesOfExternalCode.java") - public void testOverridesOfExternalCode() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/OverridesOfExternalCode.java"); - doTest(fileName); - } - - @TestMetadata("SetterTypeNotMatch.java") - public void testSetterTypeNotMatch() throws Exception { - String fileName = JetTestUtils.navigationMetadata("j2k/testData/fileOrElement/dropAccessors/SetterTypeNotMatch.java"); - doTest(fileName); - } - } - @TestMetadata("j2k/testData/fileOrElement/enum") @TestDataPath("$PROJECT_ROOT") @RunWith(JUnit3RunnerWithInners.class)