Move files with mappings #11

jmix-projects · Jul 1, 2021 · f70ba2a · f70ba2a
1 parent 1225ccb
commit f70ba2a
Show file tree

Hide file tree

Showing 15 changed files with 17 additions and 17 deletions.
diff --git a/search/src/test/java/index_definition/AnnotatedIndexDefinitionTestCaseProvider.java b/search/src/test/java/index_definition/AnnotatedIndexDefinitionTestCaseProvider.java
@@ -40,55 +40,55 @@ public static Stream<Arguments> provideCommonTestCases() {
                         .expectedEntityName("test_SimpleRootEntity")
                         .expectedIndexName("search_index_test_simplerootentity")
                         .expectedEntityClass(TestSimpleRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/common/test_mapping_include_all_local_properties")
+                        .pathToFileWithExpectedMapping("index_definition/common/test_mapping_include_all_local_properties")
                         .build()
                 ),
                 Arguments.of(AnnotatedIndexDefinitionProcessorTestCase.builder("Specified properties are included to mapping if supported")
                         .indexDefinitionClass(TestIncludeSpecificLocalPropertiesIndexDefinition.class)
                         .expectedEntityName("test_SimpleRootEntity")
                         .expectedIndexName("search_index_test_simplerootentity")
                         .expectedEntityClass(TestSimpleRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/common/test_mapping_include_specific_local_properties")
+                        .pathToFileWithExpectedMapping("index_definition/common/test_mapping_include_specific_local_properties")
                         .build()
                 ),
                 Arguments.of(AnnotatedIndexDefinitionProcessorTestCase.builder("It's possible to exclude some properties from wildcard coverage")
                         .indexDefinitionClass(TestIncludeAllLocalPropertiesWithExclusionIndexDefinition.class)
                         .expectedEntityName("test_SimpleRootEntity")
                         .expectedIndexName("search_index_test_simplerootentity")
                         .expectedEntityClass(TestSimpleRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/common/test_mapping_include_all_local_properties_with_exclusion")
+                        .pathToFileWithExpectedMapping("index_definition/common/test_mapping_include_all_local_properties_with_exclusion")
                         .build()
                 ),
                 Arguments.of(AnnotatedIndexDefinitionProcessorTestCase.builder("Multiple annotation on a single method are supported")
                         .indexDefinitionClass(TestMultiAnnotationInclusionIndexDefinition.class)
                         .expectedEntityName("test_SimpleRootEntity")
                         .expectedIndexName("search_index_test_simplerootentity")
                         .expectedEntityClass(TestSimpleRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/common/test_mapping_multi_inclusion")
+                        .pathToFileWithExpectedMapping("index_definition/common/test_mapping_multi_inclusion")
                         .build()
                 ),
                 Arguments.of(AnnotatedIndexDefinitionProcessorTestCase.builder("Multiple annotated methods are supported")
                         .indexDefinitionClass(TestMultiMethodInclusionIndexDefinition.class)
                         .expectedEntityName("test_SimpleRootEntity")
                         .expectedIndexName("search_index_test_simplerootentity")
                         .expectedEntityClass(TestSimpleRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/common/test_mapping_multi_inclusion")
+                        .pathToFileWithExpectedMapping("index_definition/common/test_mapping_multi_inclusion")
                         .build()
                 ),
                 Arguments.of(AnnotatedIndexDefinitionProcessorTestCase.builder("Programmatic mapping is correct")
                         .indexDefinitionClass(TestProgrammaticMappingIndexDefinition.class)
                         .expectedEntityName("test_SimpleRootEntity")
                         .expectedIndexName("search_index_test_simplerootentity")
                         .expectedEntityClass(TestSimpleRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/common/test_mapping_programmatic")
+                        .pathToFileWithExpectedMapping("index_definition/common/test_mapping_programmatic")
                         .build()
                 ),
                 Arguments.of(AnnotatedIndexDefinitionProcessorTestCase.builder("Programmatic mapping ignores annotations")
                         .indexDefinitionClass(TestProgrammaticMappingWithAnnotationsIndexDefinition.class)
                         .expectedEntityName("test_SimpleRootEntity")
                         .expectedIndexName("search_index_test_simplerootentity")
                         .expectedEntityClass(TestSimpleRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/common/test_mapping_programmatic_with_annotations")
+                        .pathToFileWithExpectedMapping("index_definition/common/test_mapping_programmatic_with_annotations")
                         .build()
                 )
         );
@@ -101,39 +101,39 @@ public static Stream<Arguments> provideReferenceTestCases() {
                         .expectedEntityName("test_RootEntity")
                         .expectedIndexName("search_index_test_rootentity")
                         .expectedEntityClass(TestRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/reference/test_mapping_include_one_to_one_reference_property")
+                        .pathToFileWithExpectedMapping("index_definition/reference/test_mapping_include_one_to_one_reference_property")
                         .build()
                 ),
                 Arguments.of(AnnotatedIndexDefinitionProcessorTestCase.builder("Nested wildcard includes all supported nested properties")
                         .indexDefinitionClass(TestIncludeAllOneToOneRefNestedPropertiesIndexDefinition.class)
                         .expectedEntityName("test_RootEntity")
                         .expectedIndexName("search_index_test_rootentity")
                         .expectedEntityClass(TestRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/reference/test_mapping_include_all_one_to_one_ref_nested_properties")
+                        .pathToFileWithExpectedMapping("index_definition/reference/test_mapping_include_all_one_to_one_ref_nested_properties")
                         .build()
                 ),
                 Arguments.of(AnnotatedIndexDefinitionProcessorTestCase.builder("Specified nested properties are included to mapping if supported")
                         .indexDefinitionClass(TestIncludeSpecificOneToOneRefNestedPropertiesIndexDefinition.class)
                         .expectedEntityName("test_RootEntity")
                         .expectedIndexName("search_index_test_rootentity")
                         .expectedEntityClass(TestRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/reference/test_mapping_include_specific_one_to_one_ref_nested_properties")
+                        .pathToFileWithExpectedMapping("index_definition/reference/test_mapping_include_specific_one_to_one_ref_nested_properties")
                         .build()
                 ),
                 Arguments.of(AnnotatedIndexDefinitionProcessorTestCase.builder("Sub-nested wildcard includes all supported sub-nested properties")
                         .indexDefinitionClass(TestIncludeAllOneToOneSubRefNestedPropertiesIndexDefinition.class)
                         .expectedEntityName("test_RootEntity")
                         .expectedIndexName("search_index_test_rootentity")
                         .expectedEntityClass(TestRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/reference/test_mapping_include_all_one_to_one_sub_ref_nested_properties")
+                        .pathToFileWithExpectedMapping("index_definition/reference/test_mapping_include_all_one_to_one_sub_ref_nested_properties")
                         .build()
                 ),
                 Arguments.of(AnnotatedIndexDefinitionProcessorTestCase.builder("Specified sub-nested properties are included to mapping if supported")
                         .indexDefinitionClass(TestIncludeSpecificOneToOneSubRefNestedPropertiesIndexDefinition.class)
                         .expectedEntityName("test_RootEntity")
                         .expectedIndexName("search_index_test_rootentity")
                         .expectedEntityClass(TestRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/reference/test_mapping_include_specific_one_to_one_sub_ref_nested_properties")
+                        .pathToFileWithExpectedMapping("index_definition/reference/test_mapping_include_specific_one_to_one_sub_ref_nested_properties")
                         .build()
                 )
         );
@@ -146,15 +146,15 @@ public static Stream<Arguments> provideFileTestCases() {
                         .expectedEntityName("test_FileRootEntity")
                         .expectedIndexName("search_index_test_filerootentity")
                         .expectedEntityClass(TestFileRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/file/test_mapping_include_local_file_property")
+                        .pathToFileWithExpectedMapping("index_definition/file/test_mapping_include_local_file_property")
                         .build()
                 ),
                 Arguments.of(AnnotatedIndexDefinitionProcessorTestCase.builder("File content field is still present in mapping with disabled content indexing")
                         .indexDefinitionClass(TestIncludeLocalFilePropertyWithoutContentIndexDefinition.class)
                         .expectedEntityName("test_FileRootEntity")
                         .expectedIndexName("search_index_test_filerootentity")
                         .expectedEntityClass(TestFileRootEntity.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/file/test_mapping_include_local_file_property")
+                        .pathToFileWithExpectedMapping("index_definition/file/test_mapping_include_local_file_property")
                         .build()
                 )
         );
@@ -167,23 +167,23 @@ public static Stream<Arguments> provideEmbeddedTestCases() {
                         .expectedEntityName("test_RootEntityWithEmbedded")
                         .expectedIndexName("search_index_test_rootentitywithembedded")
                         .expectedEntityClass(TestRootEntityWithEmbedded.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/embedded/test_mapping_include_all_embeddable_properties")
+                        .pathToFileWithExpectedMapping("index_definition/embedded/test_mapping_include_all_embeddable_properties")
                         .build()
                 ),
                 Arguments.of(AnnotatedIndexDefinitionProcessorTestCase.builder("Embedded-level wildcard includes all supported embeddable properties")
                         .indexDefinitionClass(TestIncludeAllEmbeddablePropertiesIndexDefinition.class)
                         .expectedEntityName("test_RootEntityWithEmbedded")
                         .expectedIndexName("search_index_test_rootentitywithembedded")
                         .expectedEntityClass(TestRootEntityWithEmbedded.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/embedded/test_mapping_include_all_embeddable_properties")
+                        .pathToFileWithExpectedMapping("index_definition/embedded/test_mapping_include_all_embeddable_properties")
                         .build()
                 ),
                 Arguments.of(AnnotatedIndexDefinitionProcessorTestCase.builder("Specified embeddable properties are included to mapping if supported")
                         .indexDefinitionClass(TestIncludeSpecificEmbeddablePropertyIndexDefinition.class)
                         .expectedEntityName("test_RootEntityWithEmbedded")
                         .expectedIndexName("search_index_test_rootentitywithembedded")
                         .expectedEntityClass(TestRootEntityWithEmbedded.class)
-                        .pathToFileWithExpectedMapping("test_support/index_definition/embedded/test_mapping_include_specific_embeddable_property")
+                        .pathToFileWithExpectedMapping("index_definition/embedded/test_mapping_include_specific_embeddable_property")
                         .build()
                 )
         );

diff --git a/...test_mapping_include_all_local_properties → ...test_mapping_include_all_local_properties b/...test_mapping_include_all_local_properties → ...test_mapping_include_all_local_properties
diff --git a/...clude_all_local_properties_with_exclusion → ...clude_all_local_properties_with_exclusion b/...clude_all_local_properties_with_exclusion → ...clude_all_local_properties_with_exclusion
diff --git a/...mapping_include_specific_local_properties → ...mapping_include_specific_local_properties b/...mapping_include_specific_local_properties → ...mapping_include_specific_local_properties
diff --git a/...ition/common/test_mapping_multi_inclusion → ...ition/common/test_mapping_multi_inclusion b/...ition/common/test_mapping_multi_inclusion → ...ition/common/test_mapping_multi_inclusion
diff --git a/...finition/common/test_mapping_programmatic → ...finition/common/test_mapping_programmatic b/...finition/common/test_mapping_programmatic → ...finition/common/test_mapping_programmatic
diff --git a/...est_mapping_programmatic_with_annotations → ...est_mapping_programmatic_with_annotations b/...est_mapping_programmatic_with_annotations → ...est_mapping_programmatic_with_annotations
diff --git a/...mapping_include_all_embeddable_properties → ...mapping_include_all_embeddable_properties b/...mapping_include_all_embeddable_properties → ...mapping_include_all_embeddable_properties
diff --git a/...ping_include_specific_embeddable_property → ...ping_include_specific_embeddable_property b/...ping_include_specific_embeddable_property → ...ping_include_specific_embeddable_property
diff --git a/.../test_mapping_include_local_file_property → .../test_mapping_include_local_file_property b/.../test_mapping_include_local_file_property → .../test_mapping_include_local_file_property
diff --git a/...lude_all_one_to_one_ref_nested_properties → ...lude_all_one_to_one_ref_nested_properties b/...lude_all_one_to_one_ref_nested_properties → ...lude_all_one_to_one_ref_nested_properties
diff --git a/..._all_one_to_one_sub_ref_nested_properties → ..._all_one_to_one_sub_ref_nested_properties b/..._all_one_to_one_sub_ref_nested_properties → ..._all_one_to_one_sub_ref_nested_properties
diff --git a/...ing_include_one_to_one_reference_property → ...ing_include_one_to_one_reference_property b/...ing_include_one_to_one_reference_property → ...ing_include_one_to_one_reference_property
diff --git a/...specific_one_to_one_ref_nested_properties → ...specific_one_to_one_ref_nested_properties b/...specific_one_to_one_ref_nested_properties → ...specific_one_to_one_ref_nested_properties
diff --git a/...ific_one_to_one_sub_ref_nested_properties → ...ific_one_to_one_sub_ref_nested_properties b/...ific_one_to_one_sub_ref_nested_properties → ...ific_one_to_one_sub_ref_nested_properties