Bug 452765 - [Tests] Delete obsolete org.eclipse.e4.ui.menu.tests test
suite
Menu and toolbar tests have been migrated a long time ago to
org.eclipse.e4.ui.tests.
See MMenuItemTest.java and MToolItemTest
Change-Id: I67775409023a118dc5c03576ecded146978d0b20
Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
diff --git a/tests/org.eclipse.e4.ui.menu.tests/.classpath b/tests/org.eclipse.e4.ui.menu.tests/.classpath
deleted file mode 100644
index 4f83b23..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/tests/org.eclipse.e4.ui.menu.tests/.gitignore b/tests/org.eclipse.e4.ui.menu.tests/.gitignore
deleted file mode 100644
index 0cbdc4f..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/
-*~
-*.rej
-*.bak
-core
-*.so
-*.patch
-javacore.*
-heapdump.*
-core.*
-Snap.*
diff --git a/tests/org.eclipse.e4.ui.menu.tests/.project b/tests/org.eclipse.e4.ui.menu.tests/.project
deleted file mode 100644
index 251ee5d..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>org.eclipse.e4.ui.menu.tests</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.ManifestBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- <buildCommand>
- <name>org.eclipse.pde.SchemaBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.eclipse.pde.PluginNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/tests/org.eclipse.e4.ui.menu.tests/.settings/org.eclipse.core.runtime.prefs b/tests/org.eclipse.e4.ui.menu.tests/.settings/org.eclipse.core.runtime.prefs
deleted file mode 100644
index c522e1f..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/.settings/org.eclipse.core.runtime.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-line.separator=\n
diff --git a/tests/org.eclipse.e4.ui.menu.tests/.settings/org.eclipse.jdt.core.prefs b/tests/org.eclipse.e4.ui.menu.tests/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index af3bf44..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,307 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.codeComplete.argumentPrefixes=
-org.eclipse.jdt.core.codeComplete.argumentSuffixes=
-org.eclipse.jdt.core.codeComplete.fieldPrefixes=
-org.eclipse.jdt.core.codeComplete.fieldSuffixes=
-org.eclipse.jdt.core.codeComplete.localPrefixes=
-org.eclipse.jdt.core.codeComplete.localSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFieldSuffixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldPrefixes=
-org.eclipse.jdt.core.codeComplete.staticFinalFieldSuffixes=
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.8
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
-org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
-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_binary_expression=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_method_declaration=0
-org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=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_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_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_binary_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_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_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_unary_operator=do not 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_binary_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_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_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_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_binary_operator=true
-org.eclipse.jdt.core.formatter.wrap_before_or_operator_multicatch=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/tests/org.eclipse.e4.ui.menu.tests/.settings/org.eclipse.jdt.ui.prefs b/tests/org.eclipse.e4.ui.menu.tests/.settings/org.eclipse.jdt.ui.prefs
deleted file mode 100644
index 92671a6..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/.settings/org.eclipse.jdt.ui.prefs
+++ /dev/null
@@ -1,119 +0,0 @@
-cleanup.add_default_serial_version_id=true
-cleanup.add_generated_serial_version_id=false
-cleanup.add_missing_annotations=true
-cleanup.add_missing_deprecated_annotations=true
-cleanup.add_missing_methods=false
-cleanup.add_missing_nls_tags=false
-cleanup.add_missing_override_annotations=true
-cleanup.add_missing_override_annotations_interface_methods=true
-cleanup.add_serial_version_id=false
-cleanup.always_use_blocks=true
-cleanup.always_use_parentheses_in_expressions=false
-cleanup.always_use_this_for_non_static_field_access=false
-cleanup.always_use_this_for_non_static_method_access=false
-cleanup.convert_to_enhanced_for_loop=false
-cleanup.correct_indentation=false
-cleanup.format_source_code=false
-cleanup.format_source_code_changes_only=false
-cleanup.make_local_variable_final=true
-cleanup.make_parameters_final=false
-cleanup.make_private_fields_final=true
-cleanup.make_type_abstract_if_missing_method=false
-cleanup.make_variable_declarations_final=false
-cleanup.never_use_blocks=false
-cleanup.never_use_parentheses_in_expressions=true
-cleanup.organize_imports=false
-cleanup.qualify_static_field_accesses_with_declaring_class=false
-cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true
-cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true
-cleanup.qualify_static_member_accesses_with_declaring_class=true
-cleanup.qualify_static_method_accesses_with_declaring_class=false
-cleanup.remove_private_constructors=true
-cleanup.remove_trailing_whitespaces=false
-cleanup.remove_trailing_whitespaces_all=true
-cleanup.remove_trailing_whitespaces_ignore_empty=false
-cleanup.remove_unnecessary_casts=true
-cleanup.remove_unnecessary_nls_tags=true
-cleanup.remove_unused_imports=true
-cleanup.remove_unused_local_variables=false
-cleanup.remove_unused_private_fields=true
-cleanup.remove_unused_private_members=false
-cleanup.remove_unused_private_methods=true
-cleanup.remove_unused_private_types=true
-cleanup.sort_members=false
-cleanup.sort_members_all=false
-cleanup.use_blocks=false
-cleanup.use_blocks_only_for_return_and_throw=false
-cleanup.use_parentheses_in_expressions=false
-cleanup.use_this_for_non_static_field_access=false
-cleanup.use_this_for_non_static_field_access_only_if_necessary=true
-cleanup.use_this_for_non_static_method_access=false
-cleanup.use_this_for_non_static_method_access_only_if_necessary=true
-cleanup_profile=org.eclipse.jdt.ui.default.eclipse_clean_up_profile
-cleanup_settings_version=2
-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
-org.eclipse.jdt.ui.exception.name=e
-org.eclipse.jdt.ui.gettersetter.use.is=true
-org.eclipse.jdt.ui.keywordthis=false
-org.eclipse.jdt.ui.overrideannotation=true
-sp_cleanup.add_default_serial_version_id=true
-sp_cleanup.add_generated_serial_version_id=false
-sp_cleanup.add_missing_annotations=true
-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=false
-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=true
-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=false
-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=false
-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=true
-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=true
-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=false
-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/tests/org.eclipse.e4.ui.menu.tests/E4 Ui Menu Tests.launch b/tests/org.eclipse.e4.ui.menu.tests/E4 Ui Menu Tests.launch
deleted file mode 100644
index 5ad81d7..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/E4 Ui Menu Tests.launch
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-<stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-<booleanAttribute key="askclear" value="false"/>
-<booleanAttribute key="automaticAdd" value="true"/>
-<booleanAttribute key="automaticValidate" value="false"/>
-<stringAttribute key="bootstrap" value=""/>
-<stringAttribute key="checked" value="[NONE]"/>
-<booleanAttribute key="clearConfig" value="true"/>
-<booleanAttribute key="clearws" value="true"/>
-<booleanAttribute key="clearwslog" value="false"/>
-<stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-<booleanAttribute key="default" value="true"/>
-<booleanAttribute key="includeOptional" value="true"/>
-<stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/MenuTestSuite.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>
-<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.e4.ui.menu.tests.MenuTestSuite"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.e4.ui.menu.tests"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-<stringAttribute key="pde.version" value="3.3"/>
-<stringAttribute key="product" value=""/>
-<booleanAttribute key="run_in_ui_thread" value="true"/>
-<booleanAttribute key="show_selected_only" value="false"/>
-<booleanAttribute key="tracing" value="false"/>
-<booleanAttribute key="useCustomFeatures" value="false"/>
-<booleanAttribute key="useDefaultConfig" value="true"/>
-<booleanAttribute key="useDefaultConfigArea" value="false"/>
-<booleanAttribute key="useProduct" value="false"/>
-</launchConfiguration>
diff --git a/tests/org.eclipse.e4.ui.menu.tests/META-INF/MANIFEST.MF b/tests/org.eclipse.e4.ui.menu.tests/META-INF/MANIFEST.MF
deleted file mode 100644
index f59f725..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Menu Contribution Tests
-Bundle-SymbolicName: org.eclipse.e4.ui.menu.tests;singleton:=true
-Bundle-Version: 0.12.100.qualifier
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.e4.core.commands;bundle-version="0.9.0",
- org.eclipse.e4.core.contexts;bundle-version="0.9.0",
- org.eclipse.e4.core.di;bundle-version="0.9.0",
- org.eclipse.e4.core.services;bundle-version="0.9.1",
- org.eclipse.e4.ui.bindings;bundle-version="0.9.0",
- org.eclipse.e4.ui.di;bundle-version="0.9.0",
- org.eclipse.e4.ui.model.workbench;bundle-version="0.9.1",
- org.eclipse.e4.ui.services;bundle-version="0.9.1",
- org.eclipse.e4.ui.workbench;bundle-version="0.9.1",
- org.eclipse.e4.ui.workbench.addons.swt;bundle-version="0.9.0",
- org.eclipse.e4.ui.workbench.renderers.swt;bundle-version="0.9.1",
- org.eclipse.e4.ui.workbench.swt;bundle-version="0.9.1",
- org.junit,
- org.eclipse.emf.ecore;bundle-version="2.7.0"
-Bundle-RequiredExecutionEnvironment: JavaSE-1.7
-Bundle-ActivationPolicy: lazy
-Import-Package: javax.annotation,
- javax.inject;version="1.0.0"
diff --git a/tests/org.eclipse.e4.ui.menu.tests/README.md b/tests/org.eclipse.e4.ui.menu.tests/README.md
deleted file mode 100644
index 97fd83e..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-org.eclipse.e4.ui.menu.tests
-============================
-
-Contains the tests for the e4 menu and tool items.
diff --git a/tests/org.eclipse.e4.ui.menu.tests/build.properties b/tests/org.eclipse.e4.ui.menu.tests/build.properties
deleted file mode 100644
index 65b9e88..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
- .,\
- plugin.xml,\
- test.xml
diff --git a/tests/org.eclipse.e4.ui.menu.tests/forceQualifierUpdate.txt b/tests/org.eclipse.e4.ui.menu.tests/forceQualifierUpdate.txt
deleted file mode 100644
index 56f1032..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/forceQualifierUpdate.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-# To force a version qualifier update add the bug here
-Bug 403352 - Update all parent versions to match our build stream
diff --git a/tests/org.eclipse.e4.ui.menu.tests/plugin.xml b/tests/org.eclipse.e4.ui.menu.tests/plugin.xml
deleted file mode 100644
index 545cf88..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/plugin.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
- <extension
- point="org.eclipse.ui.commands">
- <command
- categoryId="org.eclipse.e4.ui.menu.tests.category"
- id="org.eclipse.e4.ui.menu.tests.commandOne"
- name="Command One">
- </command>
- <command
- categoryId="org.eclipse.e4.ui.menu.tests.category"
- id="org.eclipse.e4.ui.menu.tests.commandTwo"
- name="Command Two">
- </command>
- <command
- categoryId="org.eclipse.e4.ui.menu.tests.category"
- id="org.eclipse.e4.ui.menu.tests.commandThree"
- name="Command Three">
- </command>
- <command
- categoryId="org.eclipse.e4.ui.menu.tests.category"
- id="org.eclipse.e4.ui.menu.tests.commandFour"
- name="Command Four">
- </command>
- <command
- categoryId="org.eclipse.e4.ui.menu.tests.category"
- id="org.eclipse.e4.ui.menu.tests.commandFive"
- name="Command Five">
- </command>
- <category
- id="org.eclipse.e4.ui.menu.tests.category"
- name="Test Category">
- </category>
- </extension>
-
-
-</plugin>
diff --git a/tests/org.eclipse.e4.ui.menu.tests/pom.xml b/tests/org.eclipse.e4.ui.menu.tests/pom.xml
deleted file mode 100644
index a7bc699..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Copyright (c) 2012, 2016 Eclipse Foundation and others.
- All rights reserved. This program and the accompanying materials
- are made available under the terms of the Eclipse Distribution License v1.0
- which accompanies this distribution, and is available at
- http://www.eclipse.org/org/documents/edl-v10.php
-
- Contributors:
- Igor Fedorenko - initial implementation
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <artifactId>eclipse.platform.ui.tests</artifactId>
- <groupId>eclipse.platform.ui</groupId>
- <version>4.7.0-SNAPSHOT</version>
- </parent>
- <groupId>org.eclipse.e4</groupId>
- <artifactId>org.eclipse.e4.ui.menu.tests</artifactId>
- <version>0.12.100-SNAPSHOT</version>
- <packaging>eclipse-test-plugin</packaging>
-
-</project>
diff --git a/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/CmdService.java b/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/CmdService.java
deleted file mode 100644
index 83a1980..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/CmdService.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 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
- *******************************************************************************/
-
-package org.eclipse.e4.ui.menu.tests;
-
-import java.util.Collection;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-import javax.inject.Inject;
-
-import org.eclipse.core.commands.Category;
-import org.eclipse.core.commands.Command;
-import org.eclipse.core.commands.CommandManager;
-import org.eclipse.core.commands.IExecutionListener;
-import org.eclipse.core.commands.IHandler;
-import org.eclipse.core.commands.ParameterType;
-import org.eclipse.core.commands.ParameterizedCommand;
-import org.eclipse.core.commands.SerializationException;
-import org.eclipse.core.commands.common.NotDefinedException;
-import org.eclipse.ui.commands.ICommandService;
-import org.eclipse.ui.commands.IElementReference;
-import org.eclipse.ui.menus.UIElement;
-
-class CmdService implements ICommandService {
-
- private Category category;
-
- @Inject
- private CommandManager manager;
-
- @Override
- public void addExecutionListener(IExecutionListener listener) {
- }
-
- @Override
- public void defineUncategorizedCategory(String name, String description) {
- }
-
- @Override
- public ParameterizedCommand deserialize(
- String serializedParameterizedCommand) throws NotDefinedException,
- SerializationException {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void dispose() {
- }
-
- @Override
- public Category getCategory(String categoryId) {
- return manager.getCategory(categoryId);
- }
-
- @Override
- public Command getCommand(String commandId) {
- Command cmd = manager.getCommand(commandId);
- if (!cmd.isDefined()) {
- cmd.define(commandId, null, category);
- }
- return cmd;
- }
-
- @Override
- public Category[] getDefinedCategories() {
- return manager.getDefinedCategories();
- }
-
- @Override
- public Collection getDefinedCategoryIds() {
- return manager.getDefinedCategoryIds();
- }
-
- @Override
- public Collection getDefinedCommandIds() {
- return manager.getDefinedCommandIds();
- }
-
- @Override
- public Command[] getDefinedCommands() {
- return manager.getDefinedCommands();
- }
-
- @Override
- public Collection getDefinedParameterTypeIds() {
- return manager.getDefinedParameterTypeIds();
- }
-
- @Override
- public ParameterType[] getDefinedParameterTypes() {
- return manager.getDefinedParameterTypes();
- }
-
- @Override
- public String getHelpContextId(Command command) throws NotDefinedException {
- return null;
- }
-
- @Override
- public String getHelpContextId(String commandId) throws NotDefinedException {
- return null;
- }
-
- @Override
- public ParameterType getParameterType(String parameterTypeId) {
- return manager.getParameterType(parameterTypeId);
- }
-
- @PostConstruct
- public void init() {
- category = manager.getCategory("fake.category");
- category.define("Fake Cat", null);
- }
-
- @Override
- public void readRegistry() {
- }
-
- @Override
- public void refreshElements(String commandId, Map filter) {
- }
-
- @Override
- public void registerElement(IElementReference elementReference) {
- }
-
- @Override
- public IElementReference registerElementForCommand(
- ParameterizedCommand command, UIElement element)
- throws NotDefinedException {
- return null;
- }
-
- @Override
- public void removeExecutionListener(IExecutionListener listener) {
- }
-
- @Override
- public void setHelpContextId(IHandler handler, String helpContextId) {
- }
-
- @Override
- public void unregisterElement(IElementReference elementReference) {
- }
-
-}
\ No newline at end of file
diff --git a/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/MMenuItemTest.java b/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/MMenuItemTest.java
deleted file mode 100644
index e745ce5..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/MMenuItemTest.java
+++ /dev/null
@@ -1,1059 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 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
- * Thibault Le Ouay <thibaultleouay@gmail.com> - Bug 452764
- *******************************************************************************/
-
-package org.eclipse.e4.ui.menu.tests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import org.eclipse.e4.core.commands.CommandServiceAddon;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.ui.bindings.BindingServiceAddon;
-import org.eclipse.e4.ui.internal.workbench.E4Workbench;
-import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
-import org.eclipse.e4.ui.internal.workbench.swt.E4Application;
-import org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine;
-import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.commands.MCommand;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
-import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
-import org.eclipse.e4.ui.model.application.ui.MCoreExpression;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
-import org.eclipse.e4.ui.model.application.ui.basic.MWindow;
-import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl;
-import org.eclipse.e4.ui.model.application.ui.impl.UiFactoryImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
-import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
-import org.eclipse.e4.ui.services.ContextServiceAddon;
-import org.eclipse.e4.ui.services.EContextService;
-import org.eclipse.e4.ui.workbench.modeling.EModelService;
-import org.eclipse.e4.ui.workbench.renderers.swt.ContributionRecord;
-import org.eclipse.e4.ui.workbench.renderers.swt.MenuManagerRenderer;
-import org.eclipse.e4.ui.workbench.swt.factories.IRendererFactory;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.MenuManager;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Menu;
-import org.eclipse.swt.widgets.MenuItem;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.Widget;
-import org.eclipse.ui.internal.menus.MenuPersistence;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class MMenuItemTest {
-
- final static String PDE_SEARCH_AS_ID = "org.eclipse.pde.ui.SearchActionSet";
-
- final static String SEARCH_AS_ID = "org.eclipse.search.searchActionSet";
-
- protected IEclipseContext appContext;
-
- private EModelService modelService;
-
- protected E4Workbench wb;
-
- private MMenuContribution createMenuContributionWithOneEntry(boolean withVisibleWhen) {
- MMenuContribution mmc = modelService.createModelElement(MMenuContribution.class);
- mmc.setElementId("test.contrib1");
- mmc.setParentId("file");
- mmc.setPositionInParent("after=additions");
-
- MMenuItem item1 = modelService.createModelElement(MDirectMenuItem.class);
- item1.setElementId("mmc.item1");
- item1.setLabel("mmc.item1");
- mmc.getChildren().add(item1);
-
- if (withVisibleWhen) {
- MCoreExpression exp = modelService.createModelElement(MCoreExpression.class);
- exp.setCoreExpressionId("org.eclipse.e4.ui.tests.withMmc1");
- mmc.setVisibleWhen(exp);
- }
-
- return mmc;
- }
-
- private void createMenuContribution(MApplication application) {
- MMenuContribution mmc = MenuFactoryImpl.eINSTANCE.createMenuContribution();
- mmc.setElementId("test.contrib2");
- mmc.setParentId("org.eclipse.ui.main.menu");
- mmc.setPositionInParent("after=additions");
-
- MMenu menu = MenuFactoryImpl.eINSTANCE.createMenu();
- menu.setElementId("vanish");
- menu.setLabel("Vanish");
- mmc.getChildren().add(menu);
-
- MCoreExpression exp = UiFactoryImpl.eINSTANCE.createCoreExpression();
- exp.setCoreExpressionId("org.eclipse.e4.ui.tests.withMmc1");
- mmc.setVisibleWhen(exp);
-
- application.getMenuContributions().add(mmc);
-
- mmc = MenuFactoryImpl.eINSTANCE.createMenuContribution();
- mmc.setElementId("test.contrib3");
- mmc.setParentId("vanish");
- mmc.setPositionInParent("after=additions");
-
- MMenuItem item1 = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item1.setElementId("mmc.item2");
- item1.setLabel("mmc.item2");
- mmc.getChildren().add(item1);
-
- application.getMenuContributions().add(mmc);
- }
-
- private MenuManagerRenderer getRenderer(IEclipseContext context, MUIElement element) {
- IRendererFactory rendererFactory = context.get(IRendererFactory.class);
- AbstractPartRenderer renderer = rendererFactory.getRenderer(element, null);
- assertEquals(MenuManagerRenderer.class, renderer.getClass());
- return (MenuManagerRenderer) renderer;
- }
-
- @Before
- public void setUp() {
- appContext = E4Application.createDefaultContext();
- modelService = appContext.get(EModelService.class);
- ContextInjectionFactory.make(CommandServiceAddon.class, appContext);
- ContextInjectionFactory.make(ContextServiceAddon.class, appContext);
- ContextInjectionFactory.make(BindingServiceAddon.class, appContext);
- appContext.set(E4Workbench.PRESENTATION_URI_ARG, PartRenderingEngine.engineURI);
- }
-
- @After
- public void tearDown() {
- if (wb != null) {
- wb.close();
- }
- appContext.dispose();
- }
-
- @Test
- @Ignore("See bug 452765")
- public void testContributionRecordMerging() {
- MApplication application = TestUtil.setupRenderer(appContext);
- MenuManagerRenderer renderer = appContext.get(MenuManagerRenderer.class);
- MMenu menuBar = application.getChildren().get(0).getMainMenu();
-
- // read in the relevant extensions.
- MenuPersistence mp = new MenuPersistence(application, appContext, "org.eclipse.e4.ui.menu.tests.p1");
- mp.reRead();
- // printContributions(application);
-
- List<MMenuContribution> menuContributions = application
- .getMenuContributions();
- assertEquals(6, menuContributions.size());
-
- ContributionRecord twoMenus = new ContributionRecord(menuBar,
- menuContributions.get(0), renderer);
- assertTrue(twoMenus.mergeIntoModel());
- assertEquals(2, menuBar.getChildren().size());
-
- MMenu withHandlers = (MMenu) menuBar.getChildren().get(1);
- assertEquals(0, withHandlers.getChildren().size());
-
- ContributionRecord handlers = new ContributionRecord(withHandlers,
- menuContributions.get(2), renderer);
- assertTrue(handlers.mergeIntoModel());
- assertEquals(4, withHandlers.getChildren().size());
- }
-
- @Test
- public void validateThatMenuContributionIsAddedToMenu() {
- MWindow window = modelService.createModelElement(MWindow.class);
- MMenu menuBar = modelService.createModelElement(MMenu.class);
- menuBar.setElementId("org.eclipse.ui.main.menu");
- window.setMainMenu(menuBar);
-
- MMenu fileMenu = modelService.createModelElement(MMenu.class);
- fileMenu.setElementId("file");
- fileMenu.setLabel("File");
- menuBar.getChildren().add(fileMenu);
-
- MDirectMenuItem item1 = modelService.createModelElement(MDirectMenuItem.class);
- item1.setElementId("item1");
- item1.setLabel("item1");
- fileMenu.getChildren().add(item1);
-
- MMenuSeparator sep = modelService.createModelElement(MMenuSeparator.class);
- sep.setElementId("group1");
- fileMenu.getChildren().add(sep);
-
- MDirectMenuItem item2 = modelService.createModelElement(MDirectMenuItem.class);
- item2.setElementId("item2");
- item2.setLabel("item2");
- fileMenu.getChildren().add(item2);
-
- MApplication application = modelService.createModelElement(MApplication.class);
- application.getChildren().add(window);
- application.setContext(appContext);
- appContext.set(MApplication.class, application);
- application.getMenuContributions().add(createMenuContributionWithOneEntry(false));
-
- wb = new E4Workbench(window, appContext);
- wb.createAndRunUI(window);
-
- MenuManagerRenderer renderer = getRenderer(appContext, menuBar);
-
- MenuManager fileManager = renderer.getManager(fileMenu);
- assertNotNull("No file menu?", fileManager);
-
-
- assertEquals(4, fileManager.getSize());
-
- assertEquals("mmc.item1", fileManager.getItems()[3].getId());
- }
-
- @Test
- @Ignore("See bug 452765")
- public void testMenuContributionGeneration() {
- MApplication application = TestUtil.setupRenderer(appContext);
- MenuManagerRenderer renderer = appContext
- .get(MenuManagerRenderer.class);
- MMenu menuBar = application.getChildren().get(0).getMainMenu();
-
- // read in the relevant extensions.
- MenuPersistence mp = new MenuPersistence(application, appContext,
- "org.eclipse.e4.ui.menu.tests.p1");
- mp.reRead();
-
- // render the main menu bar
- Shell shell = new Shell();
- Menu menu = (Menu) renderer.createWidget(menuBar, shell);
- assertNotNull(menu);
- Object obj = menuBar;
- renderer.processContents((MElementContainer<MUIElement>) obj);
-
- MenuManager manager = renderer.getManager(menuBar);
- assertNotNull(manager);
- assertEquals(2, manager.getSize());
-
- MenuManager withGroup = (MenuManager) manager.getItems()[0];
- assertEquals("WithGroup", withGroup.getId());
- assertEquals(4, withGroup.getSize());
-
- IContributionItem[] withGroupItems = withGroup.getItems();
- assertEquals("group1", withGroupItems[0].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.commandOne",
- withGroupItems[1].getId());
- assertEquals("group2", withGroupItems[2].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.commandTwo",
- withGroupItems[3].getId());
-
- MenuManager withHandlers = (MenuManager) manager.getItems()[1];
- assertEquals("WithHandlers", withHandlers.getId());
- assertEquals(5, withHandlers.getSize());
-
- IContributionItem[] withHandlerItems = withHandlers.getItems();
- assertEquals("org.eclipse.e4.ui.menu.tests.commandOne",
- withHandlerItems[0].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.commandTwo",
- withHandlerItems[1].getId());
- assertEquals("group1", withHandlerItems[2].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.commandFour",
- withHandlerItems[3].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.commandThree",
- withHandlerItems[4].getId());
-
- }
-
- @Test
- @Ignore("See bug 452765")
- public void testMenuContributionVisibility() {
- MApplication application = TestUtil.setupRenderer(appContext);
- MenuManagerRenderer renderer = appContext
- .get(MenuManagerRenderer.class);
- MMenu menuBar = application.getChildren().get(0).getMainMenu();
-
- // read in the relevant extensions.
- MenuPersistence mp = new MenuPersistence(application, appContext,
- "org.eclipse.e4.ui.menu.tests.p4");
- mp.reRead();
-
- // render the main menu bar
- Shell shell = new Shell();
- Menu menu = (Menu) renderer.createWidget(menuBar, shell);
- assertNotNull(menu);
- Object obj = menuBar;
- renderer.processContents((MElementContainer<MUIElement>) obj);
-
- MenuManager manager = renderer.getManager(menuBar);
- assertNotNull(manager);
- assertEquals(2, manager.getSize());
-
- MenuManager withGroup = (MenuManager) manager.getItems()[0];
- assertEquals("WithGroup", withGroup.getId());
- assertEquals(5, withGroup.getSize());
-
- IContributionItem[] withGroupItems = withGroup.getItems();
- assertEquals("group1", withGroupItems[0].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.commandOne",
- withGroupItems[1].getId());
- IContributionItem p4InvOne = withGroupItems[2];
- assertEquals("p4.invisible.commandOne", p4InvOne.getId());
- assertEquals("group2", withGroupItems[3].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.commandTwo",
- withGroupItems[4].getId());
-
- assertTrue(p4InvOne.isVisible());
-
- Menu withGroupMenu = withGroup.getMenu();
- assertNotNull(withGroupMenu);
-
- Event show = new Event();
- show.widget = withGroupMenu;
- show.type = SWT.Show;
-
- withGroupMenu.notifyListeners(SWT.Show, show);
-
- Event hide = new Event();
- hide.widget = withGroupMenu;
- hide.type = SWT.Hide;
-
- withGroupMenu.notifyListeners(SWT.Hide, hide);
-
- assertFalse(p4InvOne.isVisible());
-
- MWindow window = application.getChildren().get(0);
- IEclipseContext context = window.getContext();
-
- context.set("selection", new StructuredSelection(
- "show.p4.invisible.commandOne"));
- withGroupMenu.notifyListeners(SWT.Show, show);
- withGroupMenu.notifyListeners(SWT.Hide, hide);
-
- assertTrue(p4InvOne.isVisible());
-
- context.set("selection", new StructuredSelection(
- new Object[] { "show.p4.invisible.commandOne",
- "show.p4.invisible.commandOne" }));
- withGroupMenu.notifyListeners(SWT.Show, show);
- withGroupMenu.notifyListeners(SWT.Hide, hide);
-
- assertFalse(p4InvOne.isVisible());
-
- context.set("selection", new StructuredSelection(
- "show.p4.invisible.commandOne"));
- withGroupMenu.notifyListeners(SWT.Show, show);
- withGroupMenu.notifyListeners(SWT.Hide, hide);
-
- assertTrue(p4InvOne.isVisible());
-
- context.set("selection", new StructuredSelection(
- "hide.p4.invisible.commandOne"));
- withGroupMenu.notifyListeners(SWT.Show, show);
- withGroupMenu.notifyListeners(SWT.Hide, hide);
-
- assertFalse(p4InvOne.isVisible());
-
- context.set("selection", new StructuredSelection(
- "show.p4.invisible.commandOne"));
- withGroupMenu.notifyListeners(SWT.Show, show);
- withGroupMenu.notifyListeners(SWT.Hide, hide);
-
- assertTrue(p4InvOne.isVisible());
-
- context.remove("selection");
- withGroupMenu.notifyListeners(SWT.Show, show);
- withGroupMenu.notifyListeners(SWT.Hide, hide);
-
- assertFalse(p4InvOne.isVisible());
-
- MenuManager withHandlers = (MenuManager) manager.getItems()[1];
- assertEquals("WithHandlers", withHandlers.getId());
- assertEquals(5, withHandlers.getSize());
-
- IContributionItem[] withHandlerItems = withHandlers.getItems();
- assertEquals("org.eclipse.e4.ui.menu.tests.commandOne",
- withHandlerItems[0].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.commandTwo",
- withHandlerItems[1].getId());
- assertEquals("group1", withHandlerItems[2].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.commandFour",
- withHandlerItems[3].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.commandThree",
- withHandlerItems[4].getId());
-
- }
-
- @Test
- public void validateThatCheckedHandledMenuItemIsCreated() {
- MWindow window = modelService.createModelElement(MWindow.class);
- MMenu menu = modelService.createModelElement(MMenu.class);
- MHandledMenuItem menuItem = modelService.createModelElement(MHandledMenuItem.class);
-
- MCommand command = modelService.createModelElement(MCommand.class);
- command.setElementId("commandId");
-
- menuItem.setCommand(command);
- menuItem.setType(ItemType.CHECK);
- menuItem.setSelected(true);
-
- menu.getChildren().add(menuItem);
- window.setMainMenu(menu);
-
- MApplication application = modelService.createModelElement(MApplication.class);
- application.getChildren().add(window);
- application.setContext(appContext);
- appContext.set(MApplication.class.getName(), application);
-
- wb = new E4Workbench(window, appContext);
- wb.createAndRunUI(window);
-
- MenuManager barManager = (MenuManager) ((Menu) menu.getWidget()).getData();
- barManager.updateAll(true);
-
- Object widget1 = menuItem.getWidget();
- assertNotNull(widget1);
- assertTrue(widget1 instanceof MenuItem);
-
- MenuItem menuItemWidget = (MenuItem) widget1;
- assertTrue(menuItemWidget.getSelection());
- }
-
- @Test
- public void validateThatMenuWithRadioButtonAreUpdatedByUserSelection() {
- MWindow window = modelService.createModelElement(MWindow.class);
- MMenu menu = modelService.createModelElement(MMenu.class);
- MMenuItem menuItem1 = modelService.createModelElement(MDirectMenuItem.class);
- MMenuItem menuItem2 = modelService.createModelElement(MDirectMenuItem.class);
-
- menuItem1.setType(ItemType.RADIO);
- menuItem2.setType(ItemType.RADIO);
-
- menu.getChildren().add(menuItem1);
- menu.getChildren().add(menuItem2);
- window.setMainMenu(menu);
-
- MApplication application = modelService.createModelElement(MApplication.class);
- application.getChildren().add(window);
- application.setContext(appContext);
- appContext.set(MApplication.class.getName(), application);
-
- wb = new E4Workbench(window, appContext);
- wb.createAndRunUI(window);
-
- ((MenuManager) ((Widget) menu.getWidget()).getData()).updateAll(true);
-
- Object widget1 = menuItem1.getWidget();
- assertNotNull(widget1);
- assertTrue(widget1 instanceof MenuItem);
-
- Object widget2 = menuItem2.getWidget();
- assertNotNull(widget2);
- assertTrue(widget2 instanceof MenuItem);
-
- MenuItem menuItemWidget1 = (MenuItem) widget1;
- MenuItem menuItemWidget2 = (MenuItem) widget2;
-
- // test that 'clicking' on the item updates the model
- menuItemWidget1.setSelection(false);
- menuItemWidget2.setSelection(true);
- menuItemWidget1.notifyListeners(SWT.Selection, new Event());
- menuItemWidget2.notifyListeners(SWT.Selection, new Event());
-
- assertFalse(menuItem1.isSelected());
- assertTrue(menuItem2.isSelected());
-
- menuItemWidget2.setSelection(false);
- menuItemWidget1.setSelection(true);
- menuItemWidget2.notifyListeners(SWT.Selection, new Event());
- menuItemWidget1.notifyListeners(SWT.Selection, new Event());
-
- assertTrue(menuItem1.isSelected());
- assertFalse(menuItem2.isSelected());
-
- // Check that model changes are reflected in the items
- menuItem1.setSelected(false);
- assertFalse(menuItemWidget1.getSelection());
- menuItem2.setSelected(true);
- assertTrue(menuItemWidget2.getSelection());
- }
-
- private void testMMenuItem_Text(String before, String beforeExpected,
- String after, String afterExpected) {
- MWindow window = BasicFactoryImpl.eINSTANCE.createWindow();
- MMenu menu = MenuFactoryImpl.eINSTANCE.createMenu();
- MMenuItem menuItem = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
-
- menuItem.setLabel(before);
-
- window.setMainMenu(menu);
- menu.getChildren().add(menuItem);
-
- MApplication application = ApplicationFactoryImpl.eINSTANCE
- .createApplication();
- application.getChildren().add(window);
- application.setContext(appContext);
- appContext.set(MApplication.class.getName(), application);
-
- wb = new E4Workbench(window, appContext);
- wb.createAndRunUI(window);
-
- ((MenuManager) ((Widget) menu.getWidget()).getData()).updateAll(true);
-
- Object widget = menuItem.getWidget();
- assertNotNull(widget);
- assertTrue(widget instanceof MenuItem);
-
- MenuItem menuItemWidget = (MenuItem) widget;
-
- assertEquals(beforeExpected, menuItemWidget.getText());
-
- menuItem.setLabel(after);
-
- assertEquals(afterExpected, menuItemWidget.getText());
- }
-
- @Test
- public void testMMenuItem_Text_EmptyEmpty() {
- testMMenuItem_Text("", "", "", "");
- }
-
- @Test
- public void testMMenuItem_Text_EmptyNull() {
- testMMenuItem_Text("", "", null, "");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMMenuItem_Text_EmptyString() {
- testMMenuItem_Text("", "", "label", "label");
- }
-
- @Test
- public void testMMenuItem_Text_NullEmpty() {
- testMMenuItem_Text(null, "", "", "");
- }
-
- @Test
- public void testMMenuItem_Text_NullNull() {
- testMMenuItem_Text(null, "", null, "");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMMenuItem_Text_NullString() {
- testMMenuItem_Text(null, "", "label", "label");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMMenuItem_Text_StringEmpty() {
- testMMenuItem_Text("label", "label", "", "");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMMenuItem_Text_StringNull() {
- testMMenuItem_Text("label", "label", null, "");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMMenuItem_Text_StringStringChanged() {
- testMMenuItem_Text("label", "label", "label2", "label2");
- }
-
- @Test
- public void testMMenuItem_Text_StringStringUnchanged() {
- testMMenuItem_Text("label", "label", "label", "label");
- }
-
- @Test
- public void testSubMenuCreation() {
- MWindow window = BasicFactoryImpl.eINSTANCE.createWindow();
- MMenu menuBar = MenuFactoryImpl.eINSTANCE.createMenu();
- menuBar.setElementId("org.eclipse.ui.main.menu");
- window.setMainMenu(menuBar);
-
- MMenu fileMenu = MenuFactoryImpl.eINSTANCE.createMenu();
- fileMenu.setElementId("file");
- fileMenu.setLabel("File");
- menuBar.getChildren().add(fileMenu);
-
- MMenuItem item1 = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item1.setElementId("item1");
- item1.setLabel("item1");
- fileMenu.getChildren().add(item1);
-
- MMenuSeparator sep = MenuFactoryImpl.eINSTANCE.createMenuSeparator();
- sep.setElementId("group1");
- fileMenu.getChildren().add(sep);
-
- MMenuItem item2 = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item2.setElementId("item2");
- item2.setLabel("item2");
- fileMenu.getChildren().add(item2);
-
- MApplication application = ApplicationFactoryImpl.eINSTANCE
- .createApplication();
- application.getChildren().add(window);
- application.setContext(appContext);
- appContext.set(MApplication.class.getName(), application);
-
- wb = new E4Workbench(window, appContext);
- wb.createAndRunUI(window);
-
- MenuManagerRenderer renderer = getRenderer(appContext, menuBar);
- MenuManager manager = renderer.getManager(menuBar);
- assertNotNull("failed to create menu bar manager", manager);
-
- assertEquals(1, manager.getSize());
-
- MenuManager fileManager = (MenuManager) manager.getItems()[0];
- MenuManager fileR = renderer.getManager(fileMenu);
- assertEquals(fileManager, fileR);
-
- assertEquals(3, fileManager.getSize());
- }
-
- @Test
- public void testTbrItem() {
- MWindow window = BasicFactoryImpl.eINSTANCE.createWindow();
- MMenu menuBar = MenuFactoryImpl.eINSTANCE.createMenu();
- menuBar.setElementId("org.eclipse.ui.main.menu");
- window.setMainMenu(menuBar);
-
- MMenu fileMenu = MenuFactoryImpl.eINSTANCE.createMenu();
- fileMenu.setElementId("file");
- fileMenu.setLabel("File");
- menuBar.getChildren().add(fileMenu);
-
- MMenuItem item1 = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item1.setElementId("item1");
- item1.setLabel("item1");
- fileMenu.getChildren().add(item1);
-
- MMenuSeparator sep = MenuFactoryImpl.eINSTANCE.createMenuSeparator();
- sep.setElementId("group1");
- fileMenu.getChildren().add(sep);
-
- MMenuItem item2 = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item2.setElementId("item2");
- item2.setLabel("item2");
- fileMenu.getChildren().add(item2);
- item2.setToBeRendered(false);
-
- MApplication application = ApplicationFactoryImpl.eINSTANCE
- .createApplication();
- application.getChildren().add(window);
- application.setContext(appContext);
- appContext.set(MApplication.class.getName(), application);
-
- wb = new E4Workbench(window, appContext);
- wb.createAndRunUI(window);
-
- MenuManagerRenderer renderer = getRenderer(appContext, menuBar);
- MenuManager manager = renderer.getManager(menuBar);
- assertNotNull("failed to create menu bar manager", manager);
-
- assertEquals(1, manager.getSize());
-
- MenuManager fileManager = (MenuManager) manager.getItems()[0];
- MenuManager fileR = renderer.getManager(fileMenu);
- assertEquals(fileManager, fileR);
-
- assertEquals(2, fileManager.getSize());
- }
-
- @Test
- @Ignore("TODO")
- public void TODOtestWithVisible() {
- MWindow window = BasicFactoryImpl.eINSTANCE.createWindow();
- MMenu menuBar = MenuFactoryImpl.eINSTANCE.createMenu();
- menuBar.setElementId("org.eclipse.ui.main.menu");
- window.setMainMenu(menuBar);
-
- MMenu fileMenu = MenuFactoryImpl.eINSTANCE.createMenu();
- fileMenu.setElementId("file");
- fileMenu.setLabel("File");
- menuBar.getChildren().add(fileMenu);
-
- MMenuItem item1 = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item1.setElementId("item1");
- item1.setLabel("item1");
- fileMenu.getChildren().add(item1);
-
- MMenuSeparator sep = MenuFactoryImpl.eINSTANCE.createMenuSeparator();
- sep.setElementId("group1");
- fileMenu.getChildren().add(sep);
-
- MMenuItem item2 = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item2.setElementId("item2");
- item2.setLabel("item2");
- fileMenu.getChildren().add(item2);
-
- MApplication application = ApplicationFactoryImpl.eINSTANCE
- .createApplication();
- application.getChildren().add(window);
- application.setContext(appContext);
- appContext.set(MApplication.class.getName(), application);
- application.getMenuContributions().add(createMenuContributionWithOneEntry(true));
-
- wb = new E4Workbench(window, appContext);
- wb.createAndRunUI(window);
-
- MenuManagerRenderer renderer = getRenderer(appContext, menuBar);
-
- MenuManager fileManager = renderer.getManager(fileMenu);
- assertNotNull("No file menu?", fileManager);
-
- assertEquals(4, fileManager.getSize());
-
- IContributionItem mmcItem = fileManager.getItems()[3];
- assertEquals("mmc.item1", mmcItem.getId());
- assertEquals("before the first show, we have no context to evaluate",
- true, mmcItem.isVisible());
-
- MenuManager manager = renderer.getManager(menuBar);
- manager.updateAll(true);
- Menu fileWidget = fileManager.getMenu();
- assertNotNull(fileWidget);
-
- Event show = new Event();
- show.widget = fileWidget;
- show.type = SWT.Show;
-
- fileWidget.notifyListeners(SWT.Show, show);
-
- Event hide = new Event();
- hide.widget = fileWidget;
- hide.type = SWT.Hide;
-
- fileWidget.notifyListeners(SWT.Hide, hide);
-
- assertEquals("after the first show, it should not be visible", false,
- mmcItem.isVisible());
-
- appContext.set("mmc1", Boolean.TRUE);
-
- assertEquals("Change should not show up until next show", false,
- mmcItem.isVisible());
-
- fileWidget.notifyListeners(SWT.Show, show);
-
- fileWidget.notifyListeners(SWT.Hide, hide);
-
- assertEquals(true, mmcItem.isVisible());
-
- appContext.remove("mmc1");
-
- fileWidget.notifyListeners(SWT.Show, show);
-
- assertEquals(false, mmcItem.isVisible());
-
- fileWidget.notifyListeners(SWT.Hide, hide);
- }
-
- @Test
- @Ignore("MenuPersistence no longer processes actionSets")
- public void XXXXtestActionSetGeneration() {
- MApplication application = TestUtil.setupRenderer(appContext);
- MenuManagerRenderer renderer = appContext
- .get(MenuManagerRenderer.class);
- MMenu menuBar = application.getChildren().get(0).getMainMenu();
-
- // setup structure for actionSet test
- TestUtil.setupActionBuilderStructure(menuBar);
-
- // read in the relevant extensions.
- MenuPersistence mp = new MenuPersistence(application, appContext,
- "org.eclipse.e4.ui.menu.tests.p2");
- mp.reRead();
-
- // render the main menu bar
- Shell shell = new Shell();
- Menu menu = (Menu) renderer.createWidget(menuBar, shell);
- assertNotNull(menu);
- Object obj = menuBar;
- renderer.processContents((MElementContainer<MUIElement>) obj);
-
- MenuManager manager = renderer.getManager(menuBar);
- assertNotNull(manager);
- assertEquals(5, manager.getSize());
-
- MenuManager editManager = (MenuManager) manager.getItems()[1];
- assertEquals(5, editManager.getSize());
- IContributionItem[] editItems = editManager.getItems();
- assertEquals("org.eclipse.e4.ui.menu.tests.p2.action4",
- editItems[4].getId());
-
- MenuManager actionManager = (MenuManager) manager.getItems()[3];
- assertEquals("org.eclipse.e4.ui.menu.tests.p2.menu1",
- actionManager.getId());
- assertEquals(5, actionManager.getSize());
-
- IContributionItem[] actionItems = actionManager.getItems();
- assertEquals("group1", actionItems[0].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.p2.action2",
- actionItems[1].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.p2.action1",
- actionItems[2].getId());
- assertEquals("group2", actionItems[3].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.p2.action3",
- actionItems[4].getId());
-
- }
-
- @Test
- @Ignore("MenuPersistence no longer processes actionSets")
- public void XXXXtestActionSetSharedBothActive() {
- MApplication application = TestUtil.setupRenderer(appContext);
- MenuManagerRenderer renderer = appContext
- .get(MenuManagerRenderer.class);
- MWindow window = application.getChildren().get(0);
- MMenu menuBar = window.getMainMenu();
-
- // setup structure for actionSet test
- TestUtil.setupActionBuilderStructure(menuBar);
-
- // read in the relevant extensions.
- MenuPersistence mp = new MenuPersistence(application, appContext,
- "org.eclipse.e4.ui.menu.tests.p3");
- mp.reRead();
- // printContributions(application);
-
- // render the main menu bar
- Shell shell = new Shell();
- Menu menu = (Menu) renderer.createWidget(menuBar, shell);
- assertNotNull(menu);
- Object obj = menuBar;
- renderer.processContents((MElementContainer<MUIElement>) obj);
-
- MenuManager manager = renderer.getManager(menuBar);
- assertNotNull(manager);
- assertEquals(6, manager.getSize());
-
- MenuManager editManager = (MenuManager) manager.getItems()[1];
- assertEquals(4, editManager.getSize());
-
- MenuManager searchManager = (MenuManager) manager.getItems()[4];
- assertEquals("org.eclipse.search.menu", searchManager.getId());
- assertFalse(searchManager.isVisible());
-
- IEclipseContext windowContext = window.getContext();
- EContextService ecs = windowContext.get(EContextService.class);
- ecs.activateContext(SEARCH_AS_ID);
- ecs.activateContext(PDE_SEARCH_AS_ID);
- assertTrue(searchManager.isVisible());
-
- assertEquals(10, searchManager.getSize());
- IContributionItem[] searchItems = searchManager.getItems();
- assertEquals("internalDialogGroup", searchItems[0].getId());
- assertEquals("org.eclipse.search.OpenSearchDialog",
- searchItems[1].getId());
- assertEquals("org.eclipse.search.OpenFileSearchPage",
- searchItems[2].getId());
- assertEquals("dialogGroup", searchItems[3].getId());
- assertEquals("org.eclipse.pde.ui.actions.OpenPluginSearchPage",
- searchItems[4].getId());
- assertEquals("fileSearchContextMenuActionsGroup",
- searchItems[5].getId());
- assertEquals("textSearchSubMenu", searchItems[6].getId());
- assertEquals("contextMenuActionsGroup", searchItems[7].getId());
- assertEquals("occurencesActionsGroup", searchItems[8].getId());
- assertEquals("extraSearchGroup", searchItems[9].getId());
-
- }
-
- @Test
- @Ignore("MenuPersistence no longer processes actionSets")
- public void XXXXtestActionSetSharedMenuGeneration() {
- MApplication application = TestUtil.setupRenderer(appContext);
- MenuManagerRenderer renderer = appContext
- .get(MenuManagerRenderer.class);
- MWindow window = application.getChildren().get(0);
- MMenu menuBar = window.getMainMenu();
-
- // setup structure for actionSet test
- TestUtil.setupActionBuilderStructure(menuBar);
-
- // read in the relevant extensions.
- MenuPersistence mp = new MenuPersistence(application, appContext,
- "org.eclipse.e4.ui.menu.tests.p3");
- mp.reRead();
- // printContributions(application);
-
- // render the main menu bar
- Shell shell = new Shell();
- Menu menu = (Menu) renderer.createWidget(menuBar, shell);
- assertNotNull(menu);
- Object obj = menuBar;
- renderer.processContents((MElementContainer<MUIElement>) obj);
-
- MenuManager manager = renderer.getManager(menuBar);
- assertNotNull(manager);
- assertEquals(6, manager.getSize());
-
- MenuManager editManager = (MenuManager) manager.getItems()[1];
- assertEquals(4, editManager.getSize());
-
- MenuManager searchManager = (MenuManager) manager.getItems()[4];
- assertEquals("org.eclipse.search.menu", searchManager.getId());
- assertFalse(searchManager.isVisible());
-
- assertEquals(10, searchManager.getSize());
- IContributionItem[] searchItems = searchManager.getItems();
- assertEquals("internalDialogGroup", searchItems[0].getId());
- assertEquals("org.eclipse.search.OpenSearchDialog",
- searchItems[1].getId());
- assertEquals("org.eclipse.search.OpenFileSearchPage",
- searchItems[2].getId());
- assertEquals("dialogGroup", searchItems[3].getId());
- assertEquals("org.eclipse.pde.ui.actions.OpenPluginSearchPage",
- searchItems[4].getId());
- assertEquals("fileSearchContextMenuActionsGroup",
- searchItems[5].getId());
- assertEquals("textSearchSubMenu", searchItems[6].getId());
- assertEquals("contextMenuActionsGroup", searchItems[7].getId());
- assertEquals("occurencesActionsGroup", searchItems[8].getId());
- assertEquals("extraSearchGroup", searchItems[9].getId());
-
- }
-
- @Test
- @Ignore("MenuPersistence no longer processes actionSets")
- public void XXXXtestActionSetSharedPDEActive() {
- MApplication application = TestUtil.setupRenderer(appContext);
- MenuManagerRenderer renderer = appContext
- .get(MenuManagerRenderer.class);
- MWindow window = application.getChildren().get(0);
- MMenu menuBar = window.getMainMenu();
-
- // setup structure for actionSet test
- TestUtil.setupActionBuilderStructure(menuBar);
-
- // read in the relevant extensions.
- MenuPersistence mp = new MenuPersistence(application, appContext,
- "org.eclipse.e4.ui.menu.tests.p3");
- mp.reRead();
- // printContributions(application);
-
- // render the main menu bar
- Shell shell = new Shell();
- Menu menu = (Menu) renderer.createWidget(menuBar, shell);
- assertNotNull(menu);
- Object obj = menuBar;
- renderer.processContents((MElementContainer<MUIElement>) obj);
-
- MenuManager manager = renderer.getManager(menuBar);
- assertNotNull(manager);
- assertEquals(6, manager.getSize());
-
- MenuManager editManager = (MenuManager) manager.getItems()[1];
- assertEquals(4, editManager.getSize());
-
- MenuManager searchManager = (MenuManager) manager.getItems()[4];
- assertEquals("org.eclipse.search.menu", searchManager.getId());
- assertFalse(searchManager.isVisible());
-
- IEclipseContext windowContext = window.getContext();
- EContextService ecs = windowContext.get(EContextService.class);
- ecs.activateContext(PDE_SEARCH_AS_ID);
- assertTrue(searchManager.isVisible());
-
- assertEquals(10, searchManager.getSize());
- IContributionItem[] searchItems = searchManager.getItems();
- assertEquals("internalDialogGroup", searchItems[0].getId());
- assertEquals("org.eclipse.search.OpenSearchDialog",
- searchItems[1].getId());
- assertEquals("org.eclipse.search.OpenFileSearchPage",
- searchItems[2].getId());
- assertEquals("dialogGroup", searchItems[3].getId());
- assertEquals("org.eclipse.pde.ui.actions.OpenPluginSearchPage",
- searchItems[4].getId());
- assertEquals("fileSearchContextMenuActionsGroup",
- searchItems[5].getId());
- assertEquals("textSearchSubMenu", searchItems[6].getId());
- assertEquals("contextMenuActionsGroup", searchItems[7].getId());
- assertEquals("occurencesActionsGroup", searchItems[8].getId());
- assertEquals("extraSearchGroup", searchItems[9].getId());
-
- }
-
- @Test
- @Ignore("MenuPersistence no longer processes actionSets")
- public void XXXXtestActionSetSharedSearchActive() {
- MApplication application = TestUtil.setupRenderer(appContext);
- MenuManagerRenderer renderer = appContext
- .get(MenuManagerRenderer.class);
- MWindow window = application.getChildren().get(0);
- MMenu menuBar = window.getMainMenu();
-
- // setup structure for actionSet test
- TestUtil.setupActionBuilderStructure(menuBar);
-
- // read in the relevant extensions.
- MenuPersistence mp = new MenuPersistence(application, appContext,
- "org.eclipse.e4.ui.menu.tests.p3");
- mp.reRead();
- // printContributions(application);
-
- // render the main menu bar
- Shell shell = new Shell();
- Menu menu = (Menu) renderer.createWidget(menuBar, shell);
- assertNotNull(menu);
- Object obj = menuBar;
- renderer.processContents((MElementContainer<MUIElement>) obj);
-
- MenuManager manager = renderer.getManager(menuBar);
- assertNotNull(manager);
- assertEquals(6, manager.getSize());
-
- MenuManager editManager = (MenuManager) manager.getItems()[1];
- assertEquals(4, editManager.getSize());
-
- MenuManager searchManager = (MenuManager) manager.getItems()[4];
- assertEquals("org.eclipse.search.menu", searchManager.getId());
- assertFalse(searchManager.isVisible());
-
- IEclipseContext windowContext = window.getContext();
- EContextService ecs = windowContext.get(EContextService.class);
- ecs.activateContext(SEARCH_AS_ID);
- assertTrue(searchManager.isVisible());
-
- assertEquals(10, searchManager.getSize());
- IContributionItem[] searchItems = searchManager.getItems();
- assertEquals("internalDialogGroup", searchItems[0].getId());
- assertEquals("org.eclipse.search.OpenSearchDialog",
- searchItems[1].getId());
- assertEquals("org.eclipse.search.OpenFileSearchPage",
- searchItems[2].getId());
- assertEquals("dialogGroup", searchItems[3].getId());
- assertEquals("org.eclipse.pde.ui.actions.OpenPluginSearchPage",
- searchItems[4].getId());
- assertEquals("fileSearchContextMenuActionsGroup",
- searchItems[5].getId());
- assertEquals("textSearchSubMenu", searchItems[6].getId());
- assertEquals("contextMenuActionsGroup", searchItems[7].getId());
- assertEquals("occurencesActionsGroup", searchItems[8].getId());
- assertEquals("extraSearchGroup", searchItems[9].getId());
-
- }
-}
diff --git a/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/MToolItemTest.java b/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/MToolItemTest.java
deleted file mode 100644
index ff0bbd8..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/MToolItemTest.java
+++ /dev/null
@@ -1,642 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014 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
- * Thibault Le Ouay <thibaultleouay@gmail.com> - Bug 452764
- *******************************************************************************/
-
-package org.eclipse.e4.ui.menu.tests;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import org.eclipse.e4.core.commands.CommandServiceAddon;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.ui.bindings.BindingServiceAddon;
-import org.eclipse.e4.ui.internal.workbench.E4Workbench;
-import org.eclipse.e4.ui.internal.workbench.swt.E4Application;
-import org.eclipse.e4.ui.internal.workbench.swt.PartRenderingEngine;
-import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimElement;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
-import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.ItemType;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
-import org.eclipse.e4.ui.services.ContextServiceAddon;
-import org.eclipse.e4.ui.services.EContextService;
-import org.eclipse.e4.ui.workbench.renderers.swt.DirectContributionItem;
-import org.eclipse.e4.ui.workbench.renderers.swt.ToolBarManagerRenderer;
-import org.eclipse.jface.action.IContributionItem;
-import org.eclipse.jface.action.ToolBarManager;
-import org.eclipse.jface.viewers.StructuredSelection;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Event;
-import org.eclipse.swt.widgets.Shell;
-import org.eclipse.swt.widgets.ToolBar;
-import org.eclipse.swt.widgets.ToolItem;
-import org.eclipse.ui.internal.menus.MenuPersistence;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Ignore;
-import org.junit.Test;
-
-public class MToolItemTest {
- protected IEclipseContext appContext;
- protected E4Workbench wb;
-
- private ToolBar getToolBar(Composite intermediate) {
- for (Control child : intermediate.getChildren()) {
- if (child.getData() instanceof ToolBarManager) {
- return (ToolBar) child;
- }
- }
- return null;
- }
-
- @Before
- public void setUp() {
- appContext = E4Application.createDefaultContext();
- ContextInjectionFactory.make(CommandServiceAddon.class, appContext);
- ContextInjectionFactory.make(ContextServiceAddon.class, appContext);
- ContextInjectionFactory.make(BindingServiceAddon.class, appContext);
- appContext.set(E4Workbench.PRESENTATION_URI_ARG,
- PartRenderingEngine.engineURI);
- }
-
- @After
- public void tearDown() {
- if (wb != null) {
- wb.close();
- }
- appContext.dispose();
- }
-
- @Test
- public void test01Children() {
- MToolBar toolbarModel = MenuFactoryImpl.eINSTANCE.createToolBar();
- toolbarModel.setElementId("p2.tb1");
-
- MToolBar toolbarModel2 = MenuFactoryImpl.eINSTANCE.createToolBar();
- toolbarModel2.setElementId("p2.tb2");
-
- MToolBarSeparator sep = MenuFactoryImpl.eINSTANCE
- .createToolBarSeparator();
- sep.setElementId("additions");
- toolbarModel.getChildren().add(sep);
- assertEquals(1, toolbarModel.getChildren().size());
- assertEquals(0, toolbarModel2.getChildren().size());
-
- toolbarModel2.getChildren().addAll(toolbarModel.getChildren());
- assertEquals(0, toolbarModel.getChildren().size());
- assertEquals(1, toolbarModel2.getChildren().size());
- }
-
- @Test
- @Ignore("See bug 452765")
- public void testFileItemContributionVisibility() {
- MApplication application = TestUtil.setupRenderer(appContext);
- // MenuManagerRenderer renderer = appContext
- // .get(MenuManagerRenderer.class);
- MTrimmedWindow window = (MTrimmedWindow) application.getChildren().get(
- 0);
- MTrimBar coolbar = window.getTrimBars().get(0);
- assertNotNull(coolbar);
-
- // setup structure for actionSet test
- TestUtil.setupActionBuilderStructure(coolbar);
-
- MToolBar file = (MToolBar) coolbar.getChildren().get(1);
- assertEquals(5, coolbar.getChildren().size());
-
- // read in the relevant extensions.
- MenuPersistence mp = new MenuPersistence(application, appContext,
- "org.eclipse.e4.ui.menu.tests.p4");
- mp.reRead();
-
- ToolBarManagerRenderer renderer = appContext
- .get(ToolBarManagerRenderer.class);
- Shell shell = new Shell();
- Composite parent = new Composite(shell, SWT.NONE);
- Composite intermediate = (Composite) renderer
- .createWidget(file, parent);
- assertNotNull(intermediate);
- Control[] childTB = intermediate.getChildren();
- assertTrue(childTB.length > 0);
- ToolBar toolbar = (ToolBar) childTB[0];
-
- assertNotNull(toolbar);
- Object obj = file;
- renderer.processContents((MElementContainer<MUIElement>) obj);
-
- ToolBarManager tbm = renderer.getManager(file);
- assertNotNull(tbm);
-
- IContributionItem[] tbItems = tbm.getItems();
- assertEquals(12, tbItems.length);
- IContributionItem p4InvOne = tbItems[8];
- assertEquals("p4.invisible.commandOne", p4InvOne.getId());
- assertFalse(p4InvOne.isVisible());
-
- IEclipseContext context = window.getContext();
-
- context.set("selection", new StructuredSelection(
- "show.p4.invisible.commandOne"));
-
- assertTrue(p4InvOne.isVisible());
-
- context.set("selection", new StructuredSelection(
- new Object[] { "show.p4.invisible.commandOne",
- "show.p4.invisible.commandOne" }));
- assertFalse(p4InvOne.isVisible());
-
- context.set("selection", new StructuredSelection(
- "show.p4.invisible.commandOne"));
- assertTrue(p4InvOne.isVisible());
-
- context.set("selection", new StructuredSelection(
- "hide.p4.invisible.commandOne"));
- assertFalse(p4InvOne.isVisible());
- context.set("selection", new StructuredSelection(
- "show.p4.invisible.commandOne"));
- assertTrue(p4InvOne.isVisible());
-
- context.remove("selection");
- assertFalse(p4InvOne.isVisible());
- }
-
- @Ignore("See bug 452765")
- @Test
- public void testFileItemGeneration() {
- MApplication application = TestUtil.setupRenderer(appContext);
- // MenuManagerRenderer renderer = appContext
- // .get(MenuManagerRenderer.class);
- MTrimmedWindow window = (MTrimmedWindow) application.getChildren().get(
- 0);
- MTrimBar coolbar = window.getTrimBars().get(0);
- assertNotNull(coolbar);
-
- // setup structure for actionSet test
- TestUtil.setupActionBuilderStructure(coolbar);
-
- MToolBar file = (MToolBar) coolbar.getChildren().get(1);
- assertEquals(5, coolbar.getChildren().size());
-
- // read in the relevant extensions.
- MenuPersistence mp = new MenuPersistence(application, appContext,
- "org.eclipse.e4.ui.menu.tests.p1");
- mp.reRead();
-
- ToolBarManagerRenderer renderer = appContext
- .get(ToolBarManagerRenderer.class);
- Shell shell = new Shell();
- Composite parent = new Composite(shell, SWT.NONE);
- Composite intermediate = (Composite) renderer
- .createWidget(file, parent);
- assertNotNull(intermediate);
- Control[] childTB = intermediate.getChildren();
- assertTrue(childTB.length > 0);
- ToolBar toolbar = (ToolBar) childTB[0];
-
- assertNotNull(toolbar);
- Object obj = file;
- renderer.processContents((MElementContainer<MUIElement>) obj);
-
- ToolBarManager tbm = renderer.getManager(file);
- assertNotNull(tbm);
-
- assertEquals(13, tbm.getItems().length);
- IContributionItem saveAll = tbm.find("saveAll");
- assertNotNull(saveAll);
- assertTrue(saveAll instanceof DirectContributionItem);
-
- IContributionItem cmdTwo = tbm.getItems()[8];
- assertEquals("org.eclipse.e4.ui.menu.tests.commandTwo", cmdTwo.getId());
-
- IContributionItem cmdOne = tbm.getItems()[12];
- assertEquals("org.eclipse.e4.ui.menu.tests.commandOne", cmdOne.getId());
- }
-
- @Test
- @Ignore("See bug 452765")
- public void testFileToolbarRendered() {
- MApplication application = TestUtil.setupRenderer(appContext);
- // MenuManagerRenderer renderer = appContext
- // .get(MenuManagerRenderer.class);
- MTrimmedWindow window = (MTrimmedWindow) application.getChildren().get(
- 0);
- MTrimBar coolbar = window.getTrimBars().get(0);
- assertNotNull(coolbar);
-
- // setup structure for actionSet test
- TestUtil.setupActionBuilderStructure(coolbar);
-
- MToolBar file = (MToolBar) coolbar.getChildren().get(1);
- assertEquals(5, coolbar.getChildren().size());
-
- // read in the relevant extensions.
-
- ToolBarManagerRenderer renderer = appContext
- .get(ToolBarManagerRenderer.class);
- Shell shell = new Shell();
- Composite parent = new Composite(shell, SWT.NONE);
- Composite intermediate = (Composite) renderer
- .createWidget(file, parent);
- assertNotNull(intermediate);
- Control[] childTB = intermediate.getChildren();
- assertTrue(childTB.length > 0);
- ToolBar toolbar = (ToolBar) childTB[0];
-
- assertNotNull(toolbar);
- Object obj = file;
- renderer.processContents((MElementContainer<MUIElement>) obj);
-
- ToolBarManager tbm = renderer.getManager(file);
- assertNotNull(tbm);
-
- assertEquals(11, tbm.getItems().length);
- IContributionItem saveAll = tbm.find("saveAll");
- assertNotNull(saveAll);
- assertTrue(saveAll instanceof DirectContributionItem);
- }
-
- @Test
- @Ignore("See bug 452765")
- public void testMToolItem_RadioItems() {
- MTrimmedWindow window = BasicFactoryImpl.eINSTANCE
- .createTrimmedWindow();
- MTrimBar trimBar = BasicFactoryImpl.eINSTANCE.createTrimBar();
- MToolBar toolBar = MenuFactoryImpl.eINSTANCE.createToolBar();
- MToolItem toolItem1 = MenuFactoryImpl.eINSTANCE.createDirectToolItem();
- MToolItem toolItem2 = MenuFactoryImpl.eINSTANCE.createDirectToolItem();
-
- toolItem1.setType(ItemType.RADIO);
- toolItem2.setType(ItemType.RADIO);
-
- window.getTrimBars().add(trimBar);
- trimBar.getChildren().add(toolBar);
- toolBar.getChildren().add(toolItem1);
- toolBar.getChildren().add(toolItem2);
-
- MApplication application = ApplicationFactoryImpl.eINSTANCE
- .createApplication();
- application.getChildren().add(window);
- application.setContext(appContext);
- appContext.set(MApplication.class.getName(), application);
-
- wb = new E4Workbench(window, appContext);
- wb.createAndRunUI(window);
-
- Object widget1 = toolItem1.getWidget();
- assertNotNull(widget1);
- assertTrue(widget1 instanceof ToolItem);
-
- Object widget2 = toolItem2.getWidget();
- assertNotNull(widget2);
- assertTrue(widget2 instanceof ToolItem);
-
- ToolItem toolItemWidget1 = (ToolItem) widget1;
- ToolItem toolItemWidget2 = (ToolItem) widget2;
-
- // test that 'clicking' on the item updates the model
- toolItemWidget1.setSelection(false);
- toolItemWidget2.setSelection(true);
- toolItemWidget1.notifyListeners(SWT.Selection, new Event());
- toolItemWidget2.notifyListeners(SWT.Selection, new Event());
-
- assertFalse(toolItem1.isSelected());
- assertTrue(toolItem2.isSelected());
-
- toolItemWidget2.setSelection(false);
- toolItemWidget1.setSelection(true);
- toolItemWidget2.notifyListeners(SWT.Selection, new Event());
- toolItemWidget1.notifyListeners(SWT.Selection, new Event());
-
- assertTrue(toolItem1.isSelected());
- assertFalse(toolItem2.isSelected());
-
- // Check that model changes are reflected in the items
- toolItem1.setSelected(false);
- assertFalse(toolItemWidget1.getSelection());
- toolItem2.setSelected(true);
- assertTrue(toolItemWidget2.getSelection());
- }
-
- private void testMToolItem_Text(String before, String beforeExpected, String after, String afterExpected) {
- MTrimmedWindow window = BasicFactoryImpl.eINSTANCE.createTrimmedWindow();
- MTrimBar trimBar = BasicFactoryImpl.eINSTANCE.createTrimBar();
- MToolBar toolBar = MenuFactoryImpl.eINSTANCE.createToolBar();
- MToolItem toolItem = MenuFactoryImpl.eINSTANCE.createDirectToolItem();
-
- toolItem.setLabel(before);
-
- window.getTrimBars().add(trimBar);
- trimBar.getChildren().add(toolBar);
- toolBar.getChildren().add(toolItem);
-
- MApplication application = ApplicationFactoryImpl.eINSTANCE
- .createApplication();
- application.getChildren().add(window);
- application.setContext(appContext);
- appContext.set(MApplication.class.getName(), application);
-
- wb = new E4Workbench(window, appContext);
- wb.createAndRunUI(window);
-
- Object widget = toolItem.getWidget();
- assertNotNull(widget);
- assertTrue(widget instanceof ToolItem);
-
- ToolItem toolItemWidget = (ToolItem) widget;
-
- assertEquals(beforeExpected, toolItemWidget.getText());
-
- toolItem.setLabel(after);
-
- assertEquals(afterExpected, toolItemWidget.getText());
- }
-
- @Test
- public void testMToolItem_Text_EmptyEmpty() {
- testMToolItem_Text("", "", "", "");
- }
-
- @Test
- public void testMToolItem_Text_EmptyNull() {
- testMToolItem_Text("", "", null, "");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMToolItem_Text_EmptyString() {
- testMToolItem_Text("", "", "label", "label");
- }
-
- @Test
- public void testMToolItem_Text_NullEmpty() {
- testMToolItem_Text(null, "", "", "");
- }
-
- @Test
- public void testMToolItem_Text_NullNull() {
- testMToolItem_Text(null, "", null, "");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMToolItem_Text_NullString() {
- testMToolItem_Text(null, "", "label", "label");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMToolItem_Text_StringEmpty() {
- testMToolItem_Text("label", "label", "", "");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMToolItem_Text_StringNull() {
- testMToolItem_Text("label", "label", null, "");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMToolItem_Text_StringStringChanged() {
- testMToolItem_Text("label", "label", "label2", "label2");
- }
-
- @Test
- public void testMToolItem_Text_StringStringUnchanged() {
- testMToolItem_Text("label", "label", "label", "label");
- }
-
- private void testMToolItem_Tooltip(String before, String beforeExpected,
- String after, String afterExpected) {
- MTrimmedWindow window = BasicFactoryImpl.eINSTANCE
- .createTrimmedWindow();
- MTrimBar trimBar = BasicFactoryImpl.eINSTANCE.createTrimBar();
- MToolBar toolBar = MenuFactoryImpl.eINSTANCE.createToolBar();
- MToolItem toolItem = MenuFactoryImpl.eINSTANCE.createDirectToolItem();
-
- toolItem.setTooltip(before);
-
- window.getTrimBars().add(trimBar);
- trimBar.getChildren().add(toolBar);
- toolBar.getChildren().add(toolItem);
-
- MApplication application = ApplicationFactoryImpl.eINSTANCE
- .createApplication();
- application.getChildren().add(window);
- application.setContext(appContext);
- appContext.set(MApplication.class.getName(), application);
-
- wb = new E4Workbench(window, appContext);
- wb.createAndRunUI(window);
-
- Object widget = toolItem.getWidget();
- assertNotNull(widget);
- assertTrue(widget instanceof ToolItem);
-
- ToolItem toolItemWidget = (ToolItem) widget;
-
- assertEquals(beforeExpected, toolItemWidget.getToolTipText());
-
- toolItem.setTooltip(after);
-
- assertEquals(afterExpected, toolItemWidget.getToolTipText());
- }
-
- @Test
- public void testMToolItem_Tooltip_EmptyEmpty() {
- testMToolItem_Tooltip("", "", "", "");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMToolItem_Tooltip_EmptyNull() {
- testMToolItem_Tooltip("", "", null, null);
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMToolItem_Tooltip_EmptyString() {
- testMToolItem_Tooltip("", "", "toolTip", "toolTip");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMToolItem_Tooltip_NullEmpty() {
- testMToolItem_Tooltip(null, null, "", "");
- }
-
- @Test
- public void testMToolItem_Tooltip_NullNull() {
- testMToolItem_Tooltip(null, null, null, null);
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMToolItem_Tooltip_NullString() {
- testMToolItem_Tooltip(null, null, "toolTip", "toolTip");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMToolItem_Tooltip_StringEmpty() {
- testMToolItem_Tooltip("toolTip", "toolTip", "", "");
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMToolItem_Tooltip_StringNull() {
- testMToolItem_Tooltip("toolTip", "toolTip", null, null);
- }
-
- @Test
- @Ignore("See Bug 452765")
- public void testMToolItem_Tooltip_StringStringChanged() {
- testMToolItem_Tooltip("toolTip", "toolTip", "toolTip2", "toolTip2");
- }
-
- @Test
- public void testMToolItem_Tooltip_StringStringUnchanged() {
- testMToolItem_Tooltip("toolTip", "toolTip", "toolTip", "toolTip");
- }
-
- @Test
- @Ignore("MenuPersistence no longer processes actionSets")
- public void XXXXtestActionSetAddedToFile() {
- MApplication application = TestUtil.setupRenderer(appContext);
- // MenuManagerRenderer renderer = appContext
- // .get(MenuManagerRenderer.class);
- MTrimmedWindow window = (MTrimmedWindow) application.getChildren().get(
- 0);
- MTrimBar coolbar = window.getTrimBars().get(0);
- assertNotNull(coolbar);
-
- // setup structure for actionSet test
- TestUtil.setupActionBuilderStructure(coolbar);
-
- MToolBar file = (MToolBar) coolbar.getChildren().get(1);
- assertEquals(5, coolbar.getChildren().size());
-
- // read in the relevant extensions.
- MenuPersistence mp = new MenuPersistence(application, appContext,
- "org.eclipse.e4.ui.menu.tests.p3");
- mp.reRead();
-
- ToolBarManagerRenderer renderer = appContext
- .get(ToolBarManagerRenderer.class);
- Shell shell = new Shell();
- Composite parent = new Composite(shell, SWT.NONE);
- Composite intermediate = (Composite) renderer
- .createWidget(file, parent);
- assertNotNull(intermediate);
- Control[] childTB = intermediate.getChildren();
- assertTrue(childTB.length > 0);
- ToolBar toolbar = (ToolBar) childTB[0];
-
- assertNotNull(toolbar);
- Object obj = file;
- renderer.processContents((MElementContainer<MUIElement>) obj);
-
- ToolBarManager tbm = renderer.getManager(file);
- assertNotNull(tbm);
-
- IContributionItem[] tbItems = tbm.getItems();
- assertEquals(12, tbItems.length);
-
- IContributionItem actionSetAction = tbItems[2];
- assertEquals("org.eclipse.e4.ui.menu.tests.p3.toolAction1",
- actionSetAction.getId());
- assertFalse(actionSetAction.isVisible());
-
- IEclipseContext windowContext = window.getContext();
- EContextService ecs = windowContext.get(EContextService.class);
- ecs.activateContext("org.eclipse.e4.ui.menu.tests.p3.toolSet");
- assertTrue(actionSetAction.isVisible());
-
- ecs.deactivateContext("org.eclipse.e4.ui.menu.tests.p3.toolSet");
- assertFalse(actionSetAction.isVisible());
- }
-
- @Test
- @Ignore("MenuPersistence no longer processes actionSets")
- public void XXXXtestActionSetAddedToMyToolbar() {
- MApplication application = TestUtil.setupRenderer(appContext);
- // MenuManagerRenderer renderer = appContext
- // .get(MenuManagerRenderer.class);
- MTrimmedWindow window = (MTrimmedWindow) application.getChildren().get(
- 0);
- MTrimBar coolbar = window.getTrimBars().get(0);
- assertNotNull(coolbar);
-
- // setup structure for actionSet test
- TestUtil.setupActionBuilderStructure(coolbar);
-
- int idx = 0;
- for (MTrimElement child : coolbar.getChildren()) {
- if (child.getElementId().equals("additions")) {
- break;
- }
- idx++;
- }
-
- MToolBar toolbarModel = MenuFactoryImpl.eINSTANCE.createToolBar();
- toolbarModel.setElementId("p2.tb1");
- coolbar.getChildren().add(idx, toolbarModel);
-
- // read in the relevant extensions.
- MenuPersistence mp = new MenuPersistence(application, appContext,
- "org.eclipse.e4.ui.menu.tests.p2");
- mp.reRead();
-
- TestUtil.printContributions(application);
-
- ToolBarManagerRenderer renderer = appContext
- .get(ToolBarManagerRenderer.class);
- Shell shell = new Shell();
- Composite parent = new Composite(shell, SWT.NONE);
- Composite intermediate = (Composite) renderer.createWidget(
- toolbarModel, parent);
- assertNotNull(intermediate);
- Control[] childTB = intermediate.getChildren();
- assertTrue(childTB.length > 0);
- ToolBar toolbar = (ToolBar) childTB[0];
-
- assertNotNull(toolbar);
- Object obj = toolbarModel;
- renderer.processContents((MElementContainer<MUIElement>) obj);
-
- ToolBarManager tbm = renderer.getManager(toolbarModel);
- assertNotNull(tbm);
-
- IContributionItem[] tbItems = tbm.getItems();
- assertEquals(7, tbItems.length);
-
- assertEquals("group1", tbItems[0].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.p2.tb1", tbItems[1].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.p2.tb2", tbItems[2].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.p2.tb3", tbItems[3].getId());
- assertEquals("group2", tbItems[4].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.p2.tb4", tbItems[5].getId());
- assertEquals("org.eclipse.e4.ui.menu.tests.p2.tb5", tbItems[6].getId());
- }
-}
diff --git a/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/MenuTestSuite.java b/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/MenuTestSuite.java
deleted file mode 100644
index 1ecf87d..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/MenuTestSuite.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2014, 2016 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
- * Thibault Le Ouay <thibaultleouay@gmail.com> - Bug 452764
- *******************************************************************************/
-
-package org.eclipse.e4.ui.menu.tests;
-
-import org.junit.runner.RunWith;
-import org.junit.runners.Suite;
-import org.junit.runners.Suite.SuiteClasses;
-
-@RunWith(Suite.class)
-@SuiteClasses({
- MMenuItemTest.class,
- MToolItemTest.class
-})
-public class MenuTestSuite {
-
-}
diff --git a/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/TestUtil.java b/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/TestUtil.java
deleted file mode 100644
index 189b911..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/src/org/eclipse/e4/ui/menu/tests/TestUtil.java
+++ /dev/null
@@ -1,492 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011, 2014 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
- *******************************************************************************/
-package org.eclipse.e4.ui.menu.tests;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.core.commands.contexts.Context;
-import org.eclipse.e4.core.contexts.ContextInjectionFactory;
-import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.ui.internal.workbench.UIEventPublisher;
-import org.eclipse.e4.ui.internal.workbench.swt.AbstractPartRenderer;
-import org.eclipse.e4.ui.internal.workbench.swt.CSSRenderingUtils;
-import org.eclipse.e4.ui.model.application.MApplication;
-import org.eclipse.e4.ui.model.application.MApplicationElement;
-import org.eclipse.e4.ui.model.application.commands.MBindingContext;
-import org.eclipse.e4.ui.model.application.commands.impl.CommandsFactoryImpl;
-import org.eclipse.e4.ui.model.application.impl.ApplicationFactoryImpl;
-import org.eclipse.e4.ui.model.application.ui.MElementContainer;
-import org.eclipse.e4.ui.model.application.ui.MUIElement;
-import org.eclipse.e4.ui.model.application.ui.MUILabel;
-import org.eclipse.e4.ui.model.application.ui.SideValue;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimBar;
-import org.eclipse.e4.ui.model.application.ui.basic.MTrimmedWindow;
-import org.eclipse.e4.ui.model.application.ui.basic.impl.BasicFactoryImpl;
-import org.eclipse.e4.ui.model.application.ui.menu.MDirectMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MDirectToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MHandledToolItem;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenu;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
-import org.eclipse.e4.ui.model.application.ui.menu.MMenuSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBar;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarContribution;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarElement;
-import org.eclipse.e4.ui.model.application.ui.menu.MToolBarSeparator;
-import org.eclipse.e4.ui.model.application.ui.menu.impl.MenuFactoryImpl;
-import org.eclipse.e4.ui.services.EContextService;
-import org.eclipse.e4.ui.workbench.IPresentationEngine;
-import org.eclipse.e4.ui.workbench.IResourceUtilities;
-import org.eclipse.e4.ui.workbench.renderers.swt.MenuManagerRenderer;
-import org.eclipse.e4.ui.workbench.renderers.swt.ToolBarManagerRenderer;
-import org.eclipse.e4.ui.workbench.swt.factories.IRendererFactory;
-import org.eclipse.e4.ui.workbench.swt.util.ISWTResourceUtilities;
-import org.eclipse.emf.common.notify.Notifier;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.equinox.log.Logger;
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchActionConstants;
-import org.eclipse.ui.commands.ICommandImageService;
-import org.eclipse.ui.internal.commands.CommandImageManager;
-import org.eclipse.ui.internal.commands.CommandImageService;
-import org.osgi.framework.ServiceReference;
-
-class TestUtil {
- public static final String ORG_ECLIPSE_UI_CONTEXTS_ACTION_SET = "org.eclipse.ui.contexts.actionSet";
-
- public static void printContributions(MApplication application) {
- for (MMenuContribution mc : application.getMenuContributions()) {
- System.out.print("\n\nMC: " + mc.getParentId() + "?"
- + mc.getPositionInParent());
- printMenuOut(1, mc);
- }
-
- for (MToolBarContribution tbc : application.getToolBarContributions()) {
- System.out.print("\n\nTC: " + tbc.getParentId() + "?"
- + tbc.getPositionInParent());
- printToolOut(1, tbc);
- }
- }
-
- public static void printIcon(int level, MUILabel item) {
- printTabs(level + 2);
- System.out.print("icon: " + item.getIconURI());
- }
-
- public static void printMenuOut(int level,
- MElementContainer<MMenuElement> container) {
- for (MMenuElement child : container.getChildren()) {
- printTabs(level);
- System.out.print(child.getClass().getSimpleName() + ": "
- + child.getElementId());
- if (child instanceof MMenu) {
- printMenuOut(level + 1, (MElementContainer<MMenuElement>) child);
- } else if (child instanceof MHandledMenuItem) {
- System.out.print(": cmd "
- + ((MHandledMenuItem) child).getCommand()
- .getElementId());
- printIcon(level, child);
- } else if (child instanceof MDirectMenuItem) {
- System.out.print(": cmd "
- + ((MDirectMenuItem) child).getContributionURI());
- printIcon(level, child);
- } else if (child instanceof MMenuSeparator) {
- System.out.print(": label "
- + ((MMenuSeparator) child).getLabel());
- }
- }
- }
-
- public static void printTabs(int level) {
- System.out.print("\n");
- for (int i = 0; i < level; i++) {
- System.out.print(" ");
- }
- }
-
- public static void printToolOut(int level, MToolBarContribution tbc) {
- for (MToolBarElement child : tbc.getChildren()) {
- printTabs(level);
- System.out.print(child.getClass().getSimpleName() + ": "
- + child.getElementId());
- if (child instanceof MDirectToolItem) {
- System.out.print(": cmd "
- + ((MDirectToolItem) child).getContributionURI());
- printIcon(level, (MUILabel) child);
- } else if (child instanceof MHandledToolItem) {
- System.out.print(": cmd "
- + ((MHandledToolItem) child).getCommand()
- .getElementId());
- printIcon(level, (MUILabel) child);
- } else if (child instanceof MToolBarSeparator) {
- System.out.print(": separator ");
- }
- }
- }
-
- public static void setupActionBuilderStructure(MMenu menuBar) {
- MMenu file = MenuFactoryImpl.eINSTANCE.createMenu();
- file.setElementId("file");
- file.setLabel("&File");
- menuBar.getChildren().add(file);
-
- MDirectMenuItem item = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item.setElementId("refresh");
- item.setLabel("Re&fresh");
- file.getChildren().add(item);
-
- item = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item.setElementId("exit");
- item.setLabel("&Exit");
- file.getChildren().add(item);
-
- MMenu edit = MenuFactoryImpl.eINSTANCE.createMenu();
- edit.setElementId("edit");
- edit.setLabel("&Edit");
- menuBar.getChildren().add(edit);
-
- item = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item.setElementId("cut");
- item.setLabel("Cu&t");
- edit.getChildren().add(item);
-
- item = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item.setElementId("copy");
- item.setLabel("&Copy");
- edit.getChildren().add(item);
-
- item = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item.setElementId("paste");
- item.setLabel("&Paste");
- edit.getChildren().add(item);
-
- MMenuSeparator sep = MenuFactoryImpl.eINSTANCE.createMenuSeparator();
- sep.setElementId("copy.ext");
- sep.setVisible(false);
- edit.getChildren().add(sep);
-
- sep = MenuFactoryImpl.eINSTANCE.createMenuSeparator();
- sep.setElementId("additions");
- sep.setVisible(false);
- menuBar.getChildren().add(sep);
-
- MMenu window = MenuFactoryImpl.eINSTANCE.createMenu();
- window.setElementId("window");
- window.setLabel("&Window");
- menuBar.getChildren().add(window);
-
- item = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item.setElementId("newWindow");
- item.setLabel("&New Window");
- window.getChildren().add(item);
-
- item = MenuFactoryImpl.eINSTANCE.createDirectMenuItem();
- item.setElementId("preferences");
- item.setLabel("&Preferences");
- window.getChildren().add(item);
- }
-
- public static void setupActionBuilderStructure(MTrimBar coolbar) {
- MToolBar groupFile = MenuFactoryImpl.eINSTANCE.createToolBar();
- groupFile.setElementId("group.file");
- groupFile.setVisible(false);
-
- coolbar.getChildren().add(groupFile);
-
- MToolBar fileToolBar = MenuFactoryImpl.eINSTANCE.createToolBar();
- fileToolBar.setElementId(IWorkbenchActionConstants.TOOLBAR_FILE);
-
- MToolBarSeparator sep = MenuFactoryImpl.eINSTANCE
- .createToolBarSeparator();
- sep.setElementId(IWorkbenchActionConstants.NEW_GROUP);
- fileToolBar.getChildren().add(sep);
- // fileToolBar.add(newWizardDropDownAction);
- sep = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
- sep.setElementId(IWorkbenchActionConstants.SAVE_GROUP);
- sep.setVisible(false);
- fileToolBar.getChildren().add(sep);
- sep = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
- sep.setElementId(IWorkbenchActionConstants.NEW_EXT);
- sep.setVisible(false);
- fileToolBar.getChildren().add(sep);
-
- MDirectToolItem item = MenuFactoryImpl.eINSTANCE.createDirectToolItem();
- item.setElementId("save");
- item.setLabel("S&ave");
- fileToolBar.getChildren().add(item);
-
- item = MenuFactoryImpl.eINSTANCE.createDirectToolItem();
- item.setElementId("saveAll");
- item.setLabel("Sa&ve All");
- fileToolBar.getChildren().add(item);
-
- sep = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
- sep.setElementId(IWorkbenchActionConstants.SAVE_EXT);
- sep.setVisible(false);
- fileToolBar.getChildren().add(sep);
-
- item = MenuFactoryImpl.eINSTANCE.createDirectToolItem();
- item.setElementId("print");
- item.setLabel("&Print");
- fileToolBar.getChildren().add(item);
-
- sep = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
- sep.setElementId(IWorkbenchActionConstants.PRINT_EXT);
- sep.setVisible(false);
- fileToolBar.getChildren().add(sep);
- sep = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
- sep.setElementId(IWorkbenchActionConstants.BUILD_GROUP);
- fileToolBar.getChildren().add(sep);
- sep = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
- sep.setElementId(IWorkbenchActionConstants.BUILD_EXT);
- sep.setVisible(false);
- fileToolBar.getChildren().add(sep);
- sep = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
- sep.setElementId(IWorkbenchActionConstants.MB_ADDITIONS);
- fileToolBar.getChildren().add(sep);
-
- coolbar.getChildren().add(fileToolBar);
-
- MToolBar add = MenuFactoryImpl.eINSTANCE.createToolBar();
- add.setElementId(IWorkbenchActionConstants.MB_ADDITIONS);
- add.setVisible(false);
-
- coolbar.getChildren().add(add);
-
- MToolBar groupNav = MenuFactoryImpl.eINSTANCE.createToolBar();
- groupNav.setElementId("group.nav");
- groupNav.setVisible(false);
-
- coolbar.getChildren().add(groupNav);
-
- MToolBar navToolBar = MenuFactoryImpl.eINSTANCE.createToolBar();
- navToolBar.setElementId(IWorkbenchActionConstants.TOOLBAR_NAVIGATE);
-
- sep = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
- sep.setElementId(IWorkbenchActionConstants.HISTORY_GROUP);
- navToolBar.getChildren().add(sep);
-
- sep = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
- sep.setElementId(IWorkbenchActionConstants.GROUP_APP);
- sep.setVisible(false);
- navToolBar.getChildren().add(sep);
-
- item = MenuFactoryImpl.eINSTANCE.createDirectToolItem();
- item.setElementId("backwardHistory");
- item.setLabel("Backward");
- navToolBar.getChildren().add(item);
-
- item = MenuFactoryImpl.eINSTANCE.createDirectToolItem();
- item.setElementId("forwardHistory");
- item.setLabel("Forward");
- navToolBar.getChildren().add(item);
-
- sep = MenuFactoryImpl.eINSTANCE.createToolBarSeparator();
- sep.setElementId(IWorkbenchActionConstants.PIN_GROUP);
- navToolBar.getChildren().add(sep);
-
- coolbar.getChildren().add(navToolBar);
- }
-
- public static void setupCommandImageService(IEclipseContext ctx) {
- CmdService cs = ContextInjectionFactory.make(CmdService.class, ctx);
- CommandImageService service = new CommandImageService(
- new CommandImageManager(), cs);
- service.readRegistry();
- ctx.set(ICommandImageService.class, service);
- }
-
- public static MApplication setupRenderer(IEclipseContext appContext) {
- MApplication application = ApplicationFactoryImpl.eINSTANCE
- .createApplication();
- application.setContext(appContext);
- appContext.set(MApplication.class, application);
-
- MBindingContext rootContext = CommandsFactoryImpl.eINSTANCE
- .createBindingContext();
- rootContext.setElementId(ORG_ECLIPSE_UI_CONTEXTS_ACTION_SET);
- rootContext.setName("ActionSets");
- application.getRootContext().add(rootContext);
- EContextService ecs = appContext.get(EContextService.class);
- Context actionSet = ecs.getContext(ORG_ECLIPSE_UI_CONTEXTS_ACTION_SET);
- if (!actionSet.isDefined()) {
- actionSet.define("ActionSets", null, null);
- }
-
- TestUtil.setupRendererServices(appContext);
-
- TestUtil.setupCommandImageService(appContext);
- MTrimmedWindow window = BasicFactoryImpl.eINSTANCE
- .createTrimmedWindow();
- window.setContext(appContext.createChild("MWindowContext"));
- MMenu menuBar = MenuFactoryImpl.eINSTANCE.createMenu();
- menuBar.setElementId("org.eclipse.ui.main.menu");
- window.setMainMenu(menuBar);
-
- MTrimBar coolbar = BasicFactoryImpl.eINSTANCE.createTrimBar();
- coolbar.setElementId("org.eclipse.ui.main.toolbar");
- coolbar.setSide(SideValue.TOP);
- window.getTrimBars().add(coolbar);
-
- application.getChildren().add(window);
- application.setSelectedElement(window);
- window.getContext().activate();
-
- Display display = Display.getDefault();
- appContext.set(Display.class, display);
-
- final MenuManagerRenderer menuRenderer = new MenuManagerRenderer();
- final ToolBarManagerRenderer tbRenderer = new ToolBarManagerRenderer();
- appContext.set(IRendererFactory.class, new IRendererFactory() {
- @Override
- public AbstractPartRenderer getRenderer(MUIElement uiElement,
- Object parent) {
- if (uiElement instanceof MMenu) {
- return menuRenderer;
- } else if (uiElement instanceof MToolBar) {
- return tbRenderer;
- }
- return null;
- }
- });
- menuRenderer.init(appContext);
- ContextInjectionFactory.inject(menuRenderer, appContext);
- tbRenderer.init(appContext);
- ContextInjectionFactory.inject(tbRenderer, appContext);
-
- ((Notifier) application).eAdapters().add(
- new UIEventPublisher(appContext));
- return application;
- }
-
- public static void setupRendererServices(IEclipseContext appContext) {
- appContext.set(Logger.class, new Logger() {
-
- @Override
- public String getName() {
- // TODO Auto-generated method stub
- return "Fake Logger";
- }
-
- @Override
- public boolean isLoggable(int level) {
- // TODO Auto-generated method stub
- return false;
- }
-
- @Override
- public void log(int level, String message) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void log(int level, String message, Throwable exception) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void log(Object context, int level, String message) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void log(Object context, int level, String message,
- Throwable exception) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void log(ServiceReference<?> sr, int level, String message) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void log(ServiceReference<?> sr, int level, String message,
- Throwable exception) {
-
- }
- });
- appContext.set(IResourceUtilities.class, new ISWTResourceUtilities() {
-
- @Override
- public Image adornImage(Image toAdorn, Image adornment) {
- return null;
- }
-
- @Override
- public ImageDescriptor imageDescriptorFromURI(URI iconPath) {
- try {
- return ImageDescriptor.createFromURL(new URL(iconPath
- .toString()));
- } catch (MalformedURLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
- }
- return null;
- }
- });
- appContext.set(IPresentationEngine.class, new IPresentationEngine() {
-
- @Override
- public Object createGui(MUIElement element) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public Object createGui(MUIElement element, Object parentWidget,
- IEclipseContext parentContext) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void focusGui(MUIElement element) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void removeGui(MUIElement element) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public Object run(MApplicationElement uiRoot,
- IEclipseContext appContext) {
- // TODO Auto-generated method stub
- return null;
- }
-
- @Override
- public void stop() {
- // TODO Auto-generated method stub
-
- }
- });
- appContext.set(CSSRenderingUtils.class, ContextInjectionFactory.make(
- CSSRenderingUtils.class, appContext));
- }
-
- private TestUtil() {
- // not able tp construct
- }
-}
diff --git a/tests/org.eclipse.e4.ui.menu.tests/test.xml b/tests/org.eclipse.e4.ui.menu.tests/test.xml
deleted file mode 100644
index b8139de..0000000
--- a/tests/org.eclipse.e4.ui.menu.tests/test.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="testsuite" default="run" basedir=".">
- <!-- The property ${eclipse-home} should be passed into this script -->
- <!-- Set a meaningful default value for when it is not. -->
- <property name="eclipse-home" value="${basedir}/../.." />
-
- <!-- sets the properties eclipse-home, and library-file -->
- <property name="plugin-name" value="org.eclipse.e4.ui.menu.tests" />
- <property name="library-file" value="${eclipse-home}/plugins/org.eclipse.test/library.xml" />
-
- <!-- This target holds all initialization code that needs to be done for -->
- <!-- all tests that are to be run. Initialization for individual tests -->
- <!-- should be done within the body of the suite target. -->
- <target name="init">
- <tstamp />
- <delete>
- <fileset dir="${eclipse-home}" includes="org*.xml" />
- </delete>
- </target>
-
- <!-- This target defines the tests that need to be run. -->
- <target name="suite">
- <property name="sniff-folder" value="${eclipse-home}/e4ui_menu_sniff_folder" />
- <delete dir="${sniff-folder}" quiet="true" />
- <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
- <property name="data-dir" value="${sniff-folder}" />
- <property name="plugin-name" value="${plugin-name}" />
- <property name="classname" value="org.eclipse.e4.ui.menu.tests.MenuTestSuite" />
- </ant>
- </target>
-
- <!-- This target holds code to cleanup the testing environment after -->
- <!-- after all of the tests have been run. You can use this target to -->
- <!-- delete temporary files that have been created. -->
- <target name="cleanup">
- </target>
-
- <!-- after all the tests have been run should go here. -->
- <target name="run" depends="init,suite,cleanup">
- <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
- <property name="includes" value="org*.xml" />
- <property name="output-file" value="${plugin-name}.xml" />
- </ant>
- </target>
-</project>
