From b1aa820d32da74afdbd987518b70796bd89dc51c Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Sat, 16 Sep 2023 14:37:14 +0200 Subject: [PATCH] Move only remaining test from pde.ui.tests.smartimport into pde.ui.tests And delete the now empty o.e.pde.ui.tests.smartimport. --- .../.classpath | 11 - .../.options | 4 - .../.project | 28 -- .../org.eclipse.core.resources.prefs | 2 - .../.settings/org.eclipse.core.runtime.prefs | 2 - .../.settings/org.eclipse.jdt.core.prefs | 315 ------------------ .../.settings/org.eclipse.jdt.ui.prefs | 62 ---- .../META-INF/MANIFEST.MF | 24 -- .../META-INF/p2.inf | 3 - .../about.html | 22 -- .../build.properties | 19 -- .../test.xml | 49 --- .../pde/ui/tests/AllPDEMinimalTests.java | 35 +- .../smartimport/ProjectSmartImportTest.java} | 17 +- .../FeatureProject/build.properties | 0 .../smartImport}/FeatureProject/feature.xml | 0 .../JavaEclipseProject/.classpath | 0 .../JavaEclipseProject/.gitignore | 0 .../smartImport}/JavaEclipseProject/.project | 0 .../src/org/eclipse/pde/test/MyClass.java | 0 .../smartImport}/PlainEclipseProject/.project | 0 .../FileInEclipseProject.txt | 0 .../src/org/eclipse/pde/test/MyClass.java | 0 ui/pom.xml | 1 - 24 files changed, 31 insertions(+), 563 deletions(-) delete mode 100644 ui/org.eclipse.pde.ui.tests.smartimport/.classpath delete mode 100644 ui/org.eclipse.pde.ui.tests.smartimport/.options delete mode 100644 ui/org.eclipse.pde.ui.tests.smartimport/.project delete mode 100644 ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.core.resources.prefs delete mode 100644 ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.core.runtime.prefs delete mode 100644 ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.jdt.core.prefs delete mode 100644 ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.jdt.ui.prefs delete mode 100644 ui/org.eclipse.pde.ui.tests.smartimport/META-INF/MANIFEST.MF delete mode 100644 ui/org.eclipse.pde.ui.tests.smartimport/META-INF/p2.inf delete mode 100644 ui/org.eclipse.pde.ui.tests.smartimport/about.html delete mode 100644 ui/org.eclipse.pde.ui.tests.smartimport/build.properties delete mode 100644 ui/org.eclipse.pde.ui.tests.smartimport/test.xml rename ui/{org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/ProjectTestTemplate.java => org.eclipse.pde.ui.tests/src/org/eclipse/ui/tests/smartimport/ProjectSmartImportTest.java} (89%) rename ui/{org.eclipse.pde.ui.tests.smartimport/resources => org.eclipse.pde.ui.tests/tests/smartImport}/FeatureProject/build.properties (100%) rename ui/{org.eclipse.pde.ui.tests.smartimport/resources => org.eclipse.pde.ui.tests/tests/smartImport}/FeatureProject/feature.xml (100%) rename ui/{org.eclipse.pde.ui.tests.smartimport/resources => org.eclipse.pde.ui.tests/tests/smartImport}/JavaEclipseProject/.classpath (100%) rename ui/{org.eclipse.pde.ui.tests.smartimport/resources => org.eclipse.pde.ui.tests/tests/smartImport}/JavaEclipseProject/.gitignore (100%) rename ui/{org.eclipse.pde.ui.tests.smartimport/resources => org.eclipse.pde.ui.tests/tests/smartImport}/JavaEclipseProject/.project (100%) rename ui/{org.eclipse.pde.ui.tests.smartimport/resources => org.eclipse.pde.ui.tests/tests/smartImport}/JavaEclipseProject/src/org/eclipse/pde/test/MyClass.java (100%) rename ui/{org.eclipse.pde.ui.tests.smartimport/resources => org.eclipse.pde.ui.tests/tests/smartImport}/PlainEclipseProject/.project (100%) rename ui/{org.eclipse.pde.ui.tests.smartimport/resources => org.eclipse.pde.ui.tests/tests/smartImport}/PlainEclipseProject/FileInEclipseProject.txt (100%) rename ui/{org.eclipse.pde.ui.tests.smartimport/resources => org.eclipse.pde.ui.tests/tests/smartImport}/PlainJavaProject/src/org/eclipse/pde/test/MyClass.java (100%) diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/.classpath b/ui/org.eclipse.pde.ui.tests.smartimport/.classpath deleted file mode 100644 index 7f87f1ffe76..00000000000 --- a/ui/org.eclipse.pde.ui.tests.smartimport/.classpath +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/.options b/ui/org.eclipse.pde.ui.tests.smartimport/.options deleted file mode 100644 index 179424b2cae..00000000000 --- a/ui/org.eclipse.pde.ui.tests.smartimport/.options +++ /dev/null @@ -1,4 +0,0 @@ -# Debugging options for the org.eclipse.ui.smartimport plugin. - -# Turn on debugging for the org.eclipse.ui.smartimport plugin. -org.eclipse.ui.smartimport/debug=false diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/.project b/ui/org.eclipse.pde.ui.tests.smartimport/.project deleted file mode 100644 index c1c13c975bd..00000000000 --- a/ui/org.eclipse.pde.ui.tests.smartimport/.project +++ /dev/null @@ -1,28 +0,0 @@ - - - org.eclipse.pde.ui.tests.smartimport - - - - - - org.eclipse.jdt.core.javabuilder - - - - - org.eclipse.pde.ManifestBuilder - - - - - org.eclipse.pde.SchemaBuilder - - - - - - org.eclipse.jdt.core.javanature - org.eclipse.pde.PluginNature - - diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.core.resources.prefs b/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.core.resources.prefs deleted file mode 100644 index 99f26c0203a..00000000000 --- a/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.core.resources.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -encoding/=UTF-8 diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.core.runtime.prefs b/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.core.runtime.prefs deleted file mode 100644 index 5a0ad22d2a7..00000000000 --- a/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.core.runtime.prefs +++ /dev/null @@ -1,2 +0,0 @@ -eclipse.preferences.version=1 -line.separator=\n diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.jdt.core.prefs b/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.jdt.core.prefs deleted file mode 100644 index a57c61d2b66..00000000000 --- a/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,315 +0,0 @@ -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 -org.eclipse.jdt.core.formatter.align_type_members_on_columns=false -org.eclipse.jdt.core.formatter.alignment_for_additive_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_bitwise_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_logical_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_multiplicative_operator=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80 -org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_string_concatenation=16 -org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16 -org.eclipse.jdt.core.formatter.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=0 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=insert -org.eclipse.jdt.core.formatter.comment.line_length=80 -org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true -org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true -org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false -org.eclipse.jdt.core.formatter.compact_else_if=true -org.eclipse.jdt.core.formatter.continuation_indentation=2 -org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2 -org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off -org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on -org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false -org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true -org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true -org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_empty_lines=false -org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true -org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true -org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false -org.eclipse.jdt.core.formatter.indentation.size=4 -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_after_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert -org.eclipse.jdt.core.formatter.insert_space_after_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_additive_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_bitwise_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert -org.eclipse.jdt.core.formatter.insert_space_before_logical_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_multiplicative_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert -org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert -org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert -org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_relational_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert -org.eclipse.jdt.core.formatter.insert_space_before_shift_operator=insert -org.eclipse.jdt.core.formatter.insert_space_before_string_concatenation=insert -org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert -org.eclipse.jdt.core.formatter.join_lines_in_comments=true -org.eclipse.jdt.core.formatter.join_wrapped_lines=true -org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false -org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false -org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false -org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false -org.eclipse.jdt.core.formatter.lineSplit=120 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=tab -org.eclipse.jdt.core.formatter.tabulation.size=4 -org.eclipse.jdt.core.formatter.use_on_off_tags=false -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_additive_operator=true -org.eclipse.jdt.core.formatter.wrap_before_bitwise_operator=true -org.eclipse.jdt.core.formatter.wrap_before_logical_operator=true -org.eclipse.jdt.core.formatter.wrap_before_multiplicative_operator=true -org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=true -org.eclipse.jdt.core.formatter.wrap_before_string_concatenation=true -org.eclipse.jdt.core.formatter.wrap_outer_expressions_when_nested=true -org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.jdt.ui.prefs b/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.jdt.ui.prefs deleted file mode 100644 index d7de1c3d8a3..00000000000 --- a/ui/org.eclipse.pde.ui.tests.smartimport/.settings/org.eclipse.jdt.ui.prefs +++ /dev/null @@ -1,62 +0,0 @@ -eclipse.preferences.version=1 -editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true -formatter_profile=org.eclipse.jdt.ui.default.eclipse_profile -formatter_settings_version=12 -sp_cleanup.add_default_serial_version_id=true -sp_cleanup.add_generated_serial_version_id=false -sp_cleanup.add_missing_annotations=false -sp_cleanup.add_missing_deprecated_annotations=true -sp_cleanup.add_missing_methods=false -sp_cleanup.add_missing_nls_tags=false -sp_cleanup.add_missing_override_annotations=true -sp_cleanup.add_missing_override_annotations_interface_methods=true -sp_cleanup.add_serial_version_id=false -sp_cleanup.always_use_blocks=true -sp_cleanup.always_use_parentheses_in_expressions=false -sp_cleanup.always_use_this_for_non_static_field_access=false -sp_cleanup.always_use_this_for_non_static_method_access=false -sp_cleanup.convert_functional_interfaces=false -sp_cleanup.convert_to_enhanced_for_loop=false -sp_cleanup.correct_indentation=false -sp_cleanup.format_source_code=true -sp_cleanup.format_source_code_changes_only=true -sp_cleanup.insert_inferred_type_arguments=false -sp_cleanup.make_local_variable_final=true -sp_cleanup.make_parameters_final=false -sp_cleanup.make_private_fields_final=true -sp_cleanup.make_type_abstract_if_missing_method=false -sp_cleanup.make_variable_declarations_final=false -sp_cleanup.never_use_blocks=false -sp_cleanup.never_use_parentheses_in_expressions=true -sp_cleanup.on_save_use_additional_actions=true -sp_cleanup.organize_imports=true -sp_cleanup.qualify_static_field_accesses_with_declaring_class=false -sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true -sp_cleanup.qualify_static_member_accesses_with_declaring_class=false -sp_cleanup.qualify_static_method_accesses_with_declaring_class=false -sp_cleanup.remove_private_constructors=true -sp_cleanup.remove_redundant_type_arguments=true -sp_cleanup.remove_trailing_whitespaces=true -sp_cleanup.remove_trailing_whitespaces_all=true -sp_cleanup.remove_trailing_whitespaces_ignore_empty=false -sp_cleanup.remove_unnecessary_casts=false -sp_cleanup.remove_unnecessary_nls_tags=false -sp_cleanup.remove_unused_imports=false -sp_cleanup.remove_unused_local_variables=false -sp_cleanup.remove_unused_private_fields=true -sp_cleanup.remove_unused_private_members=false -sp_cleanup.remove_unused_private_methods=true -sp_cleanup.remove_unused_private_types=true -sp_cleanup.sort_members=false -sp_cleanup.sort_members_all=false -sp_cleanup.use_anonymous_class_creation=false -sp_cleanup.use_blocks=false -sp_cleanup.use_blocks_only_for_return_and_throw=false -sp_cleanup.use_lambda=true -sp_cleanup.use_parentheses_in_expressions=false -sp_cleanup.use_this_for_non_static_field_access=false -sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true -sp_cleanup.use_this_for_non_static_method_access=false -sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true -sp_cleanup.use_type_arguments=false diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/META-INF/MANIFEST.MF b/ui/org.eclipse.pde.ui.tests.smartimport/META-INF/MANIFEST.MF deleted file mode 100644 index d73d3d946f7..00000000000 --- a/ui/org.eclipse.pde.ui.tests.smartimport/META-INF/MANIFEST.MF +++ /dev/null @@ -1,24 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: Smart Import test for PDE -Bundle-SymbolicName: org.eclipse.pde.ui.tests.smartimport;singleton:=true -Bundle-Version: 1.2.0.qualifier -Bundle-Vendor: Eclipse.org -Export-Package: org.eclipse.ui.tests.smartimport -Require-Bundle: org.eclipse.core.resources, - org.eclipse.core.runtime, - org.eclipse.jface, - org.eclipse.swt, - org.eclipse.ui.ide, - org.eclipse.jdt.ui, - org.eclipse.pde.ui, - org.eclipse.pde.ui.tests, - assertj-core -Bundle-ActivationPolicy: lazy -Eclipse-BundleShape: dir -Bundle-RequiredExecutionEnvironment: JavaSE-17 -Automatic-Module-Name: org.eclipse.pde.ui.tests.smartimport -Import-Package: org.junit, - org.junit.rules, - org.junit.runner, - org.junit.runners diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/META-INF/p2.inf b/ui/org.eclipse.pde.ui.tests.smartimport/META-INF/p2.inf deleted file mode 100644 index 1aef271eacb..00000000000 --- a/ui/org.eclipse.pde.ui.tests.smartimport/META-INF/p2.inf +++ /dev/null @@ -1,3 +0,0 @@ -requires.0.namespace = org.eclipse.equinox.p2.iu -requires.0.name = org.eclipse.jdt.launching.macosx -requires.0.filter = (osgi.os=macosx) \ No newline at end of file diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/about.html b/ui/org.eclipse.pde.ui.tests.smartimport/about.html deleted file mode 100644 index 6f6b96c4c87..00000000000 --- a/ui/org.eclipse.pde.ui.tests.smartimport/about.html +++ /dev/null @@ -1,22 +0,0 @@ - - - -About - - - -

About This Content

- -

February 24, 2005

-

License

- -

The Eclipse Foundation makes available all content in this plug-in ("Content"). Unless otherwise indicated below, the Content is provided to you under the terms and conditions of the -Eclipse Public License Version 1.0 ("EPL"). A copy of the EPL is available at http://www.eclipse.org/legal/epl-v10.html. -For purposes of the EPL, "Program" will mean the Content.

- -

If you did not receive this Content directly from the Eclipse Foundation, the Content is being redistributed by another party ("Redistributor") and different terms and conditions may -apply to your use of any object code in the Content. Check the Redistributor's license that was provided with the Content. If no such license exists, contact the Redistributor. Unless otherwise -indicated below, the terms and conditions of the EPL still apply to any source code in the Content.

- - - \ No newline at end of file diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/build.properties b/ui/org.eclipse.pde.ui.tests.smartimport/build.properties deleted file mode 100644 index 6585eb9cbe2..00000000000 --- a/ui/org.eclipse.pde.ui.tests.smartimport/build.properties +++ /dev/null @@ -1,19 +0,0 @@ -############################################################################### -# Copyright (c) 2005 IBM Corporation and others. -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Eclipse Public License v1.0 -# which accompanies this distribution, and is available at -# http://www.eclipse.org/legal/epl-v10.html -# -# Contributors: -# IBM Corporation - initial API and implementation -############################################################################### -bin.includes = about.html,\ - .,\ - test.xml,\ - META-INF/,\ - resources/ -src.includes = about.html -source.. = src/ -pom.model.packaging = eclipse-test-plugin -pom.model.property.testClass = org.eclipse.ui.tests.smartimport.AllTests diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/test.xml b/ui/org.eclipse.pde.ui.tests.smartimport/test.xml deleted file mode 100644 index 47023ab4efe..00000000000 --- a/ui/org.eclipse.pde.ui.tests.smartimport/test.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDEMinimalTests.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDEMinimalTests.java index d7f7ecb091d..5ee26ec88d7 100644 --- a/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDEMinimalTests.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/pde/ui/tests/AllPDEMinimalTests.java @@ -32,6 +32,7 @@ import org.eclipse.pde.ui.tests.target.AllTargetMinimalTests; import org.eclipse.pde.ui.tests.views.log.AllLogViewTests; import org.eclipse.pde.ui.tests.wizards.AllNewProjectMinimalTests; +import org.eclipse.ui.tests.smartimport.ProjectSmartImportTest; import org.junit.runner.RunWith; import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @@ -43,19 +44,29 @@ */ @RunWith(Suite.class) -@SuiteClasses({ AllTargetMinimalTests.class, AllNewProjectMinimalTests.class, AllPreferenceTests.class, - // AllImportTests.class, - AllBundleModelTests.class, AllXMLModelTests.class, AllValidatorTests.class, AllNLSTests.class, - AllPDERuntimeTests.class, - // ExportBundleTests.class, - AllLauncherTests.class, AllLogViewTests.class, ProjectCreationTests.class, BundleRootTests.class, - PluginRegistryTestsMinimal.class, ClasspathResolverTest.class, PDESchemaHelperTest.class, +@SuiteClasses({ AllTargetMinimalTests.class, // + AllNewProjectMinimalTests.class, // + AllPreferenceTests.class, // + // AllImportTests.class, // + AllBundleModelTests.class, // + AllXMLModelTests.class, // + AllValidatorTests.class, // + AllNLSTests.class, // + AllPDERuntimeTests.class, // + // ExportBundleTests.class, // + AllLauncherTests.class, // + AllLogViewTests.class, // + ProjectCreationTests.class, // + BundleRootTests.class, // + PluginRegistryTestsMinimal.class, // + ClasspathResolverTest.class, // + PDESchemaHelperTest.class, // DynamicPluginProjectReferencesTest.class, - // ClasspathContributorTest.class - ClasspathResolutionTest.class, - BundleErrorReporterTest.class, - AllPDECoreTests.class -}) + // ClasspathContributorTest.class // + ClasspathResolutionTest.class, // + BundleErrorReporterTest.class, // + AllPDECoreTests.class, // + ProjectSmartImportTest.class }) public class AllPDEMinimalTests { } diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/ProjectTestTemplate.java b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/ui/tests/smartimport/ProjectSmartImportTest.java similarity index 89% rename from ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/ProjectTestTemplate.java rename to ui/org.eclipse.pde.ui.tests/src/org/eclipse/ui/tests/smartimport/ProjectSmartImportTest.java index 85c68796771..634d621bac6 100644 --- a/ui/org.eclipse.pde.ui.tests.smartimport/src/org/eclipse/ui/tests/smartimport/ProjectTestTemplate.java +++ b/ui/org.eclipse.pde.ui.tests/src/org/eclipse/ui/tests/smartimport/ProjectSmartImportTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2018, 2020 Red Hat, Inc. and others. + * Copyright (c) 2018, 2023 Red Hat, Inc. and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -46,15 +46,15 @@ import org.junit.runners.Parameterized.Parameters; @RunWith(Parameterized.class) -public class ProjectTestTemplate { +public class ProjectSmartImportTest { @Parameters(name = "{0}") public static Object[][] data() { return new Object[][] { // - { "JavaEclipseProject", List.of("org.eclipse.jdt.core.javanature") }, // - { "FeatureProject", List.of("org.eclipse.pde.FeatureNature") }, // - { "PlainEclipseProject", List.of() }, // - { "PlainJavaProject", List.of("org.eclipse.jdt.core.javanature") }, // + { "JavaEclipseProject", List.of("org.eclipse.jdt.core.javanature") }, // + { "FeatureProject", List.of("org.eclipse.pde.FeatureNature") }, // + { "PlainEclipseProject", List.of() }, // + { "PlainJavaProject", List.of("org.eclipse.jdt.core.javanature") }, // }; } @@ -70,7 +70,7 @@ public static Object[][] data() { @BeforeClass public static void setupClass() throws IOException, CoreException { // Copy imported projects to temp-directory to not pollute this project - Path source = Path.of("resources").toRealPath(); + Path source = Path.of("tests/smartImport").toRealPath(); Path target = workingDirectory.getRoot().toPath(); try (Stream files = Files.walk(source).filter(Files::isRegularFile)) { for (Path file : (Iterable) files::iterator) { @@ -94,7 +94,6 @@ private static Path getErrorLogFile() { } @Test - @SuppressWarnings("restriction") public void testImport() throws CoreException, InterruptedException { File projectPath = new File(workingDirectory.getRoot(), projectName); @@ -125,7 +124,7 @@ private void checkProblemsView(IProject project) throws CoreException { }).toList(); assertTrue( "There should be no errors in imported project: " + System.lineSeparator() + errorMarkers.stream() - .map(String::valueOf).collect(Collectors.joining(System.lineSeparator())), + .map(String::valueOf).collect(Collectors.joining(System.lineSeparator())), errorMarkers.isEmpty()); } diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/resources/FeatureProject/build.properties b/ui/org.eclipse.pde.ui.tests/tests/smartImport/FeatureProject/build.properties similarity index 100% rename from ui/org.eclipse.pde.ui.tests.smartimport/resources/FeatureProject/build.properties rename to ui/org.eclipse.pde.ui.tests/tests/smartImport/FeatureProject/build.properties diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/resources/FeatureProject/feature.xml b/ui/org.eclipse.pde.ui.tests/tests/smartImport/FeatureProject/feature.xml similarity index 100% rename from ui/org.eclipse.pde.ui.tests.smartimport/resources/FeatureProject/feature.xml rename to ui/org.eclipse.pde.ui.tests/tests/smartImport/FeatureProject/feature.xml diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/resources/JavaEclipseProject/.classpath b/ui/org.eclipse.pde.ui.tests/tests/smartImport/JavaEclipseProject/.classpath similarity index 100% rename from ui/org.eclipse.pde.ui.tests.smartimport/resources/JavaEclipseProject/.classpath rename to ui/org.eclipse.pde.ui.tests/tests/smartImport/JavaEclipseProject/.classpath diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/resources/JavaEclipseProject/.gitignore b/ui/org.eclipse.pde.ui.tests/tests/smartImport/JavaEclipseProject/.gitignore similarity index 100% rename from ui/org.eclipse.pde.ui.tests.smartimport/resources/JavaEclipseProject/.gitignore rename to ui/org.eclipse.pde.ui.tests/tests/smartImport/JavaEclipseProject/.gitignore diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/resources/JavaEclipseProject/.project b/ui/org.eclipse.pde.ui.tests/tests/smartImport/JavaEclipseProject/.project similarity index 100% rename from ui/org.eclipse.pde.ui.tests.smartimport/resources/JavaEclipseProject/.project rename to ui/org.eclipse.pde.ui.tests/tests/smartImport/JavaEclipseProject/.project diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/resources/JavaEclipseProject/src/org/eclipse/pde/test/MyClass.java b/ui/org.eclipse.pde.ui.tests/tests/smartImport/JavaEclipseProject/src/org/eclipse/pde/test/MyClass.java similarity index 100% rename from ui/org.eclipse.pde.ui.tests.smartimport/resources/JavaEclipseProject/src/org/eclipse/pde/test/MyClass.java rename to ui/org.eclipse.pde.ui.tests/tests/smartImport/JavaEclipseProject/src/org/eclipse/pde/test/MyClass.java diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/resources/PlainEclipseProject/.project b/ui/org.eclipse.pde.ui.tests/tests/smartImport/PlainEclipseProject/.project similarity index 100% rename from ui/org.eclipse.pde.ui.tests.smartimport/resources/PlainEclipseProject/.project rename to ui/org.eclipse.pde.ui.tests/tests/smartImport/PlainEclipseProject/.project diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/resources/PlainEclipseProject/FileInEclipseProject.txt b/ui/org.eclipse.pde.ui.tests/tests/smartImport/PlainEclipseProject/FileInEclipseProject.txt similarity index 100% rename from ui/org.eclipse.pde.ui.tests.smartimport/resources/PlainEclipseProject/FileInEclipseProject.txt rename to ui/org.eclipse.pde.ui.tests/tests/smartImport/PlainEclipseProject/FileInEclipseProject.txt diff --git a/ui/org.eclipse.pde.ui.tests.smartimport/resources/PlainJavaProject/src/org/eclipse/pde/test/MyClass.java b/ui/org.eclipse.pde.ui.tests/tests/smartImport/PlainJavaProject/src/org/eclipse/pde/test/MyClass.java similarity index 100% rename from ui/org.eclipse.pde.ui.tests.smartimport/resources/PlainJavaProject/src/org/eclipse/pde/test/MyClass.java rename to ui/org.eclipse.pde.ui.tests/tests/smartImport/PlainJavaProject/src/org/eclipse/pde/test/MyClass.java diff --git a/ui/pom.xml b/ui/pom.xml index f1e59ea1662..943c2dec2cb 100644 --- a/ui/pom.xml +++ b/ui/pom.xml @@ -29,7 +29,6 @@ org.eclipse.pde.ui org.eclipse.pde.ui.templates org.eclipse.pde.ui.tests - org.eclipse.pde.ui.tests.smartimport org.eclipse.pde.spy.core org.eclipse.pde.spy.bundle org.eclipse.pde.spy.event