From 6477d1125eebfd494f4a3d1a666519e24daedf9d Mon Sep 17 00:00:00 2001 From: Mathieu Cartaud Date: Wed, 15 Jun 2016 10:13:57 +0200 Subject: Switch to Eclipse mars.2 Format all non generated classes to get ride of formatter incompatibilities Migrate checkstyle config for checkstyle 6.19 Change-Id: I8c2b31765053a3686de62320f893bedf4ad81d1f Signed-off-by: Mathieu Cartaud --- .../.checkstyle | 10 + .../.settings/org.eclipse.jdt.core.prefs | 285 +++++++++++++++++++++ .../.settings/org.eclipse.jdt.ui.prefs | 62 +++++ .../src/data/models/Data.java | 56 ++-- .../src/data/models/DataGit.java | 58 ++--- .../src/data/models/LargeGitInputData.java | 6 +- .../src/data/models/LargeInputData.java | 12 +- .../src/data/models/LargeSplitGitInputData.java | 6 +- .../src/data/models/LargeSplitInputData.java | 21 +- .../src/data/models/NominalGitInputData.java | 6 +- .../src/data/models/NominalInputData.java | 13 +- .../src/data/models/NominalSplitGitInputData.java | 6 +- .../src/data/models/NominalSplitInputData.java | 21 +- .../src/data/models/SmallGitInputData.java | 6 +- .../src/data/models/SmallInputData.java | 15 +- .../src/data/models/SmallSplitGitInputData.java | 6 +- .../src/data/models/SmallSplitInputData.java | 21 +- .../AbstractEMFComparePerformanceTest.java | 112 ++++---- .../tests/performance/EMFComparePerfStats.java | 57 +++-- .../tests/performance/PerformanceGitSuite.java | 16 +- .../performance/PerformanceLargeGitSuite.java | 16 +- .../tests/performance/PerformanceLargeSuite.java | 18 +- .../tests/performance/PerformanceSuite.java | 16 +- .../emf/compare/tests/performance/SizeUnit.java | 48 +--- .../emf/compare/tests/performance/TestCompare.java | 10 +- .../compare/tests/performance/TestConflict.java | 12 +- .../emf/compare/tests/performance/TestDiff.java | 11 +- .../emf/compare/tests/performance/TestEqui.java | 12 +- .../tests/performance/TestLogicalModel.java | 128 +++++---- .../tests/performance/TestMatchContent.java | 10 +- .../emf/compare/tests/performance/TestMatchId.java | 10 +- .../tests/performance/TestPostComparisonGMF.java | 10 +- .../tests/performance/TestPostComparisonUML.java | 10 +- .../tests/performance/TestPostMatchUML.java | 10 +- .../emf/compare/tests/performance/TestReq.java | 12 +- .../emf/compare/tests/performance/git/GitUtil.java | 44 ++-- .../tests/performance/git/TestGitCompare.java | 18 +- .../tests/performance/git/TestGitConflict.java | 18 +- .../compare/tests/performance/git/TestGitDiff.java | 18 +- .../compare/tests/performance/git/TestGitEqui.java | 18 +- .../tests/performance/git/TestGitMatchContent.java | 18 +- .../tests/performance/git/TestGitMatchId.java | 18 +- .../performance/git/TestGitPostComparisonGMF.java | 18 +- .../performance/git/TestGitPostComparisonUML.java | 18 +- .../tests/performance/git/TestGitPostMatchUML.java | 18 +- .../compare/tests/performance/git/TestGitReq.java | 18 +- .../performance/git/large/TestLargeGitCompare.java | 10 +- .../git/large/TestLargeGitConflict.java | 10 +- .../performance/git/large/TestLargeGitDiff.java | 10 +- .../performance/git/large/TestLargeGitEqui.java | 10 +- .../git/large/TestLargeGitMatchContent.java | 10 +- .../performance/git/large/TestLargeGitMatchId.java | 10 +- .../git/large/TestLargeGitPostComparisonGMF.java | 10 +- .../git/large/TestLargeGitPostComparisonUML.java | 10 +- .../git/large/TestLargeGitPostMatchUML.java | 10 +- .../performance/git/large/TestLargeGitReq.java | 10 +- .../tests/performance/large/TestLargeCompare.java | 8 +- .../tests/performance/large/TestLargeConflict.java | 8 +- .../tests/performance/large/TestLargeDiff.java | 9 +- .../tests/performance/large/TestLargeEqui.java | 8 +- .../performance/large/TestLargeLogicalModel.java | 74 +++--- .../performance/large/TestLargeMatchContent.java | 6 +- .../tests/performance/large/TestLargeMatchId.java | 8 +- .../large/TestLargePostComparisonGMF.java | 6 +- .../large/TestLargePostComparisonUML.java | 8 +- .../performance/large/TestLargePostMatchUML.java | 8 +- .../tests/performance/large/TestLargeReq.java | 8 +- 67 files changed, 978 insertions(+), 625 deletions(-) create mode 100644 performance/org.eclipse.emf.compare.tests.performance/.checkstyle create mode 100644 performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.ui.prefs (limited to 'performance') diff --git a/performance/org.eclipse.emf.compare.tests.performance/.checkstyle b/performance/org.eclipse.emf.compare.tests.performance/.checkstyle new file mode 100644 index 000000000..2684ff12f --- /dev/null +++ b/performance/org.eclipse.emf.compare.tests.performance/.checkstyle @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.core.prefs b/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.core.prefs index af0f20f97..024d3f43a 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.core.prefs +++ b/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.core.prefs @@ -5,3 +5,288 @@ org.eclipse.jdt.core.compiler.compliance=1.5 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.source=1.5 +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=0 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=0 +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=1 +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=true +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=true +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=110 +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=true +org.eclipse.jdt.core.formatter.indentation.size=8 +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=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=do not 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=do not 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=do not 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=110 +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/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.ui.prefs b/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.ui.prefs new file mode 100644 index 000000000..de1c79644 --- /dev/null +++ b/performance/org.eclipse.emf.compare.tests.performance/.settings/org.eclipse.jdt.ui.prefs @@ -0,0 +1,62 @@ +eclipse.preferences.version=1 +editor_save_participant_org.eclipse.jdt.ui.postsavelistener.cleanup=true +formatter_profile=_EMF Compare +formatter_settings_version=12 +sp_cleanup.add_default_serial_version_id=true +sp_cleanup.add_generated_serial_version_id=false +sp_cleanup.add_missing_annotations=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=false +sp_cleanup.insert_inferred_type_arguments=false +sp_cleanup.make_local_variable_final=true +sp_cleanup.make_parameters_final=false +sp_cleanup.make_private_fields_final=true +sp_cleanup.make_type_abstract_if_missing_method=false +sp_cleanup.make_variable_declarations_final=false +sp_cleanup.never_use_blocks=false +sp_cleanup.never_use_parentheses_in_expressions=true +sp_cleanup.on_save_use_additional_actions=true +sp_cleanup.organize_imports=true +sp_cleanup.qualify_static_field_accesses_with_declaring_class=false +sp_cleanup.qualify_static_member_accesses_through_instances_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_through_subtypes_with_declaring_class=true +sp_cleanup.qualify_static_member_accesses_with_declaring_class=false +sp_cleanup.qualify_static_method_accesses_with_declaring_class=false +sp_cleanup.remove_private_constructors=true +sp_cleanup.remove_redundant_type_arguments=true +sp_cleanup.remove_trailing_whitespaces=false +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=true +sp_cleanup.remove_unused_imports=false +sp_cleanup.remove_unused_local_variables=false +sp_cleanup.remove_unused_private_fields=true +sp_cleanup.remove_unused_private_members=false +sp_cleanup.remove_unused_private_methods=true +sp_cleanup.remove_unused_private_types=true +sp_cleanup.sort_members=false +sp_cleanup.sort_members_all=false +sp_cleanup.use_anonymous_class_creation=false +sp_cleanup.use_blocks=false +sp_cleanup.use_blocks_only_for_return_and_throw=false +sp_cleanup.use_lambda=true +sp_cleanup.use_parentheses_in_expressions=false +sp_cleanup.use_this_for_non_static_field_access=false +sp_cleanup.use_this_for_non_static_field_access_only_if_necessary=true +sp_cleanup.use_this_for_non_static_method_access=false +sp_cleanup.use_this_for_non_static_method_access_only_if_necessary=true +sp_cleanup.use_type_arguments=false diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/Data.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/Data.java index c01a38d91..6f854ae84 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/Data.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/Data.java @@ -59,15 +59,21 @@ import com.google.common.io.Closeables; public abstract class Data { private List resourceSets = newArrayList(); + private Comparison comparison; + private final Notifier left; + private final Notifier right; + private final Notifier ancestor; - + public abstract Notifier loadLeft(); + public abstract Notifier loadRight(); + public abstract Notifier loadAncestor(); - + /** * */ @@ -76,73 +82,75 @@ public abstract class Data { right = loadRight(); ancestor = loadAncestor(); } - + /** * @return the left */ public Notifier getLeft() { return left; } - + /** * @return the right */ public Notifier getRight() { return right; } - + /** * @return the ancestor */ public Notifier getAncestor() { return ancestor; } - + protected ResourceSet createResourceSet() { ResourceSet resourceSet = new ResourceSetImpl(); resourceSet.getPackageRegistry().put(UMLPackage.eNS_URI, UMLPackage.eINSTANCE); - resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, UMLResource.Factory.INSTANCE); + resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap().put(UMLResource.FILE_EXTENSION, + UMLResource.Factory.INSTANCE); resourceSets.add(resourceSet); return resourceSet; } - + public void logicalModel(ITypedElement leftTypedElement, ITypedElement rightTypedElement) { - ComparisonScopeBuilder.create(null, leftTypedElement, rightTypedElement, null, new NullProgressMonitor()); + ComparisonScopeBuilder.create(null, leftTypedElement, rightTypedElement, null, + new NullProgressMonitor()); } - + public Comparison match() { return match(UseIdentifiers.ONLY); } - + public Comparison match(UseIdentifiers useIDs) { final IComparisonScope scope = new DefaultComparisonScope(getLeft(), getRight(), getAncestor()); final IMatchEngine matchEngine = DefaultMatchEngine.create(useIDs); comparison = matchEngine.match(scope, new BasicMonitor()); return comparison; } - + public Comparison diff() { final IDiffProcessor diffBuilder = new DiffBuilder(); final IDiffEngine diffEngine = new DefaultDiffEngine(diffBuilder); - diffEngine.diff(comparison, new BasicMonitor()); + diffEngine.diff(comparison, new BasicMonitor()); return comparison; } - + public void req() { final IReqEngine reqEngine = new DefaultReqEngine(); reqEngine.computeRequirements(comparison, new BasicMonitor()); } - + public void equi() { final IEquiEngine equiEngine = new DefaultEquiEngine(); equiEngine.computeEquivalences(comparison, new BasicMonitor()); } - + public void conflict() { final IConflictDetector conflictDetector = new MatchBasedConflictDetector(); conflictDetector.detect(comparison, new BasicMonitor()); } - + public void compare() { final IComparisonScope scope = new DefaultComparisonScope(getLeft(), getRight(), getAncestor()); EMFCompare.builder().build().compare(scope); @@ -152,18 +160,17 @@ public abstract class Data { final IPostProcessor postProcessor = new CompareDiagramPostProcessor(); postProcessor.postComparison(comparison, new BasicMonitor()); } - + public void postMatchUML() { final IPostProcessor postProcessor = new UMLPostProcessor(); postProcessor.postMatch(comparison, new BasicMonitor()); } - + public void postComparisonUML() { final IPostProcessor postProcessor = new UMLPostProcessor(); postProcessor.postComparison(comparison, new BasicMonitor()); } - - + public void dispose() { comparison = null; for (ResourceSet rs : resourceSets) { @@ -176,12 +183,11 @@ public abstract class Data { } resource.eAdapters().clear(); } - + rs.getResources().clear(); rs.eAdapters().clear(); } - - + resourceSets = null; } @@ -226,4 +232,4 @@ public abstract class Data { return resource; } -} \ No newline at end of file +} diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java index 81ea64593..8eb515d5b 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/DataGit.java @@ -78,7 +78,6 @@ import com.google.common.base.Throwables; /** * @author Axel Richard - * */ @SuppressWarnings("restriction") public class DataGit { @@ -86,11 +85,11 @@ public class DataGit { private static final String MASTER = Constants.R_HEADS + Constants.MASTER; private static final String MODIFIED = Constants.R_HEADS + "modified"; - + private List disposers; - + private List resourceSets = newArrayList(); - + private IComparisonScope scope; private Comparison comparison; @@ -106,13 +105,13 @@ public class DataGit { Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance"); URL entry = bundle.getEntry(zippedRepoLocation); repoFile = new File(systemTmpDir + File.separator + repoName); - + // Delete repo if it already exists GitUtil.deleteRepo(repoFile); - + // Unzip repository to temp directory GitUtil.unzipRepo(entry, systemTmpDir, new NullProgressMonitor()); - + Job importJob = new Job("ImportProjects") { @Override protected IStatus run(IProgressMonitor monitor) { @@ -122,7 +121,7 @@ public class DataGit { }; importJob.schedule(); importJob.join(); - + Job connectJob = new Job("ConnectProjects") { @Override protected IStatus run(IProgressMonitor monitor) { @@ -140,12 +139,13 @@ public class DataGit { }; connectJob.schedule(); connectJob.join(); - + IProject rootProject = ResourcesPlugin.getWorkspace().getRoot().getProject(rootProjectName); - + final IFile model = rootProject.getFile(new Path(modelName)); final String fullPath = model.getFullPath().toString(); - final Subscriber subscriber = GitUtil.createSubscriberForComparison(repository, MASTER, MODIFIED, model, disposers); + final Subscriber subscriber = GitUtil.createSubscriberForComparison(repository, MASTER, MODIFIED, + model, disposers); final IStorageProviderAccessor accessor = new SubscriberStorageAccessor(subscriber); final IStorageProvider sourceProvider = accessor.getStorageProvider(model, IStorageProviderAccessor.DiffSide.SOURCE); @@ -171,7 +171,7 @@ public class DataGit { resourceSets.add((ResourceSet)scope.getLeft()); resourceSets.add((ResourceSet)scope.getRight()); resourceSets.add((ResourceSet)scope.getOrigin()); - + } catch (IOException e) { Throwables.propagate(e); } catch (CoreException e) { @@ -180,58 +180,58 @@ public class DataGit { Throwables.propagate(e); } } - + public Comparison match() { return match(UseIdentifiers.ONLY); } - + public Comparison match(UseIdentifiers useIDs) { final IMatchEngine matchEngine = DefaultMatchEngine.create(useIDs); comparison = matchEngine.match(scope, new BasicMonitor()); return comparison; } - + public Comparison diff() { final IDiffProcessor diffBuilder = new DiffBuilder(); final IDiffEngine diffEngine = new DefaultDiffEngine(diffBuilder); - diffEngine.diff(comparison, new BasicMonitor()); + diffEngine.diff(comparison, new BasicMonitor()); return comparison; } - + public void req() { final IReqEngine reqEngine = new DefaultReqEngine(); reqEngine.computeRequirements(comparison, new BasicMonitor()); } - + public void equi() { final IEquiEngine equiEngine = new DefaultEquiEngine(); equiEngine.computeEquivalences(comparison, new BasicMonitor()); } - + public void conflict() { final IConflictDetector conflictDetector = new MatchBasedConflictDetector(); conflictDetector.detect(comparison, new BasicMonitor()); } - + public void compare() { EMFCompare.builder().build().compare(scope); } - + public void postComparisonGMF() { final IPostProcessor postProcessor = new CompareDiagramPostProcessor(); postProcessor.postComparison(comparison, new BasicMonitor()); } - + public void postMatchUML() { final IPostProcessor postProcessor = new UMLPostProcessor(); postProcessor.postMatch(comparison, new BasicMonitor()); } - + public void postComparisonUML() { final IPostProcessor postProcessor = new UMLPostProcessor(); postProcessor.postComparison(comparison, new BasicMonitor()); } - + public void dispose() { comparison = null; for (ResourceSet rs : resourceSets) { @@ -244,14 +244,13 @@ public class DataGit { } resource.eAdapters().clear(); } - + rs.getResources().clear(); rs.eAdapters().clear(); } - - + resourceSets = null; - + Job cleanJob = new Job("ClearWorkspace") { @Override protected IStatus run(IProgressMonitor monitor) { @@ -274,7 +273,6 @@ public class DataGit { } catch (InterruptedException e) { Throwables.propagate(e); } - if (repository != null) { repository.close(); @@ -284,7 +282,7 @@ public class DataGit { disposer.run(); } disposers.clear(); - + // Delete repository from temp directory GitUtil.deleteRepo(repoFile); } diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeGitInputData.java index 014ed9f53..5a22630c5 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeGitInputData.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeGitInputData.java @@ -12,11 +12,11 @@ package data.models; /** * @author Axel Richard - * */ public class LargeGitInputData extends DataGit { public LargeGitInputData() { - super("src/data/models/git/model_size_large_repo.zip", "model_size_large_repo", "model_size_large_git", "model.uml"); + super("src/data/models/git/model_size_large_repo.zip", "model_size_large_repo", + "model_size_large_git", "model.uml"); } -} \ No newline at end of file +} diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeInputData.java index f81ac6e43..5834232a1 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeInputData.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeInputData.java @@ -19,9 +19,8 @@ import org.eclipse.emf.ecore.util.EcoreUtil; public class LargeInputData extends Data { /** - * @return - * @throws IOException - * + * @return + * @throws IOException */ public ResourceSet loadLeft() { ResourceSet resourceSet = createResourceSet(); @@ -29,18 +28,21 @@ public class LargeInputData extends Data { EcoreUtil.resolveAll(resourceSet); return resourceSet; } + public ResourceSet loadRight() { ResourceSet resourceSet = createResourceSet(); Resource ret = loadFromClassLoader("model_size_large/modified/model.uml", resourceSet); EcoreUtil.resolveAll(resourceSet); return resourceSet; } - /** + + /** * {@inheritDoc} + * * @see data.models.TestMatchUML.Data#loadAncestor() */ @Override public Notifier loadAncestor() { return null; } -} \ No newline at end of file +} diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitGitInputData.java index fb5db4ce5..60091be55 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitGitInputData.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitGitInputData.java @@ -12,11 +12,11 @@ package data.models; /** * @author Axel Richard - * */ public class LargeSplitGitInputData extends DataGit { public LargeSplitGitInputData() { - super("src/data/models/git/model_size_large_split_repo.zip", "model_size_large_split_repo", "model_size_large_git_model", "model.uml"); + super("src/data/models/git/model_size_large_split_repo.zip", "model_size_large_split_repo", + "model_size_large_git_model", "model.uml"); } -} \ No newline at end of file +} diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitInputData.java index cf96d0c47..1a95961a5 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitInputData.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/LargeSplitInputData.java @@ -19,29 +19,32 @@ import org.eclipse.emf.ecore.util.EcoreUtil; public class LargeSplitInputData extends Data { /** - * @return - * @throws IOException - * + * @return + * @throws IOException */ public ResourceSet loadLeft() { ResourceSet resourceSet = createResourceSet(); - Resource ret = loadFromClassLoader("model_size_large_split/model_size_large_original_model/model.uml", resourceSet); + Resource ret = loadFromClassLoader("model_size_large_split/model_size_large_original_model/model.uml", + resourceSet); EcoreUtil.resolveAll(resourceSet); return resourceSet; } + public ResourceSet loadRight() { ResourceSet resourceSet = createResourceSet(); - Resource ret = loadFromClassLoader("model_size_large_split/model_size_large_modified_model/model.uml", resourceSet); - EcoreUtil.resolveAll(resourceSet); + Resource ret = loadFromClassLoader("model_size_large_split/model_size_large_modified_model/model.uml", + resourceSet); + EcoreUtil.resolveAll(resourceSet); return resourceSet; } - - /** + + /** * {@inheritDoc} + * * @see data.models.TestMatchUML.Data#loadAncestor() */ @Override public Notifier loadAncestor() { return null; } -} \ No newline at end of file +} diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalGitInputData.java index 83bc0ca25..dd71a06d9 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalGitInputData.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalGitInputData.java @@ -12,11 +12,11 @@ package data.models; /** * @author Axel Richard - * */ public class NominalGitInputData extends DataGit { public NominalGitInputData() { - super("src/data/models/git/model_size_nominal_repo.zip", "model_size_nominal_repo", "model_size_nominal_git", "model.uml"); + super("src/data/models/git/model_size_nominal_repo.zip", "model_size_nominal_repo", + "model_size_nominal_git", "model.uml"); } -} \ No newline at end of file +} diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalInputData.java index c782eefaa..af1cb8c4c 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalInputData.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalInputData.java @@ -19,9 +19,8 @@ import org.eclipse.emf.ecore.util.EcoreUtil; public class NominalInputData extends Data { /** - * @return - * @throws IOException - * + * @return + * @throws IOException */ public ResourceSet loadLeft() { ResourceSet resourceSet = createResourceSet(); @@ -29,19 +28,21 @@ public class NominalInputData extends Data { EcoreUtil.resolveAll(resourceSet); return resourceSet; } + public ResourceSet loadRight() { ResourceSet resourceSet = createResourceSet(); Resource ret = loadFromClassLoader("model_size_nominal/modified/model.uml", resourceSet); EcoreUtil.resolveAll(resourceSet); return resourceSet; } - - /** + + /** * {@inheritDoc} + * * @see data.models.TestMatchUML.Data#loadAncestor() */ @Override public Notifier loadAncestor() { return null; } -} \ No newline at end of file +} diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitGitInputData.java index d9c85439d..87d5e642b 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitGitInputData.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitGitInputData.java @@ -12,11 +12,11 @@ package data.models; /** * @author Axel Richard - * */ public class NominalSplitGitInputData extends DataGit { public NominalSplitGitInputData() { - super("src/data/models/git/model_size_nominal_split_repo.zip", "model_size_nominal_split_repo", "model_size_nominal_git_model", "model.uml"); + super("src/data/models/git/model_size_nominal_split_repo.zip", "model_size_nominal_split_repo", + "model_size_nominal_git_model", "model.uml"); } -} \ No newline at end of file +} diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitInputData.java index 9b72710e3..c7e7b7b05 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitInputData.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/NominalSplitInputData.java @@ -19,29 +19,32 @@ import org.eclipse.emf.ecore.util.EcoreUtil; public class NominalSplitInputData extends Data { /** - * @return - * @throws IOException - * + * @return + * @throws IOException */ public ResourceSet loadLeft() { ResourceSet resourceSet = createResourceSet(); - Resource ret = loadFromClassLoader("model_size_nominal_split/model_size_nominal_original_model/model.uml", resourceSet); + Resource ret = loadFromClassLoader( + "model_size_nominal_split/model_size_nominal_original_model/model.uml", resourceSet); EcoreUtil.resolveAll(resourceSet); return resourceSet; } + public ResourceSet loadRight() { ResourceSet resourceSet = createResourceSet(); - Resource ret = loadFromClassLoader("model_size_nominal_split/model_size_nominal_modified_model/model.uml", resourceSet); - EcoreUtil.resolveAll(resourceSet); + Resource ret = loadFromClassLoader( + "model_size_nominal_split/model_size_nominal_modified_model/model.uml", resourceSet); + EcoreUtil.resolveAll(resourceSet); return resourceSet; } - - /** + + /** * {@inheritDoc} + * * @see data.models.TestMatchUML.Data#loadAncestor() */ @Override public Notifier loadAncestor() { return null; } -} \ No newline at end of file +} diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallGitInputData.java index 2cfd0a134..b02f4a757 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallGitInputData.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallGitInputData.java @@ -12,11 +12,11 @@ package data.models; /** * @author Axel Richard - * */ public class SmallGitInputData extends DataGit { public SmallGitInputData() { - super("src/data/models/git/model_size_small_repo.zip", "model_size_small_repo", "model_small_size_git", "model.uml"); + super("src/data/models/git/model_size_small_repo.zip", "model_size_small_repo", + "model_small_size_git", "model.uml"); } -} \ No newline at end of file +} diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallInputData.java index f39070f7e..024837e23 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallInputData.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallInputData.java @@ -19,9 +19,8 @@ import org.eclipse.emf.ecore.util.EcoreUtil; public class SmallInputData extends Data { /** - * @return - * @throws IOException - * + * @return + * @throws IOException */ public ResourceSet loadLeft() { ResourceSet resourceSet = createResourceSet(); @@ -29,19 +28,21 @@ public class SmallInputData extends Data { EcoreUtil.resolveAll(resourceSet); return resourceSet; } + public ResourceSet loadRight() { ResourceSet resourceSet = createResourceSet(); Resource ret = loadFromClassLoader("model_size_small/modified/model.uml", resourceSet); - EcoreUtil.resolveAll(resourceSet); + EcoreUtil.resolveAll(resourceSet); return resourceSet; } - - /** + + /** * {@inheritDoc} + * * @see data.models.TestMatchUML.Data#loadAncestor() */ @Override public Notifier loadAncestor() { return null; } -} \ No newline at end of file +} diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitGitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitGitInputData.java index 1f06284c6..32ea8c309 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitGitInputData.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitGitInputData.java @@ -12,11 +12,11 @@ package data.models; /** * @author Axel Richard - * */ public class SmallSplitGitInputData extends DataGit { public SmallSplitGitInputData() { - super("src/data/models/git/model_size_small_split_repo.zip", "model_size_small_split_repo", "model_size_small_git_model", "model.uml"); + super("src/data/models/git/model_size_small_split_repo.zip", "model_size_small_split_repo", + "model_size_small_git_model", "model.uml"); } -} \ No newline at end of file +} diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitInputData.java b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitInputData.java index b6e8cfa38..c7bcf2af8 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitInputData.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/data/models/SmallSplitInputData.java @@ -19,29 +19,32 @@ import org.eclipse.emf.ecore.util.EcoreUtil; public class SmallSplitInputData extends Data { /** - * @return - * @throws IOException - * + * @return + * @throws IOException */ public ResourceSet loadLeft() { ResourceSet resourceSet = createResourceSet(); - Resource ret = loadFromClassLoader("model_size_small_split/model_size_small_original_model/model.uml", resourceSet); + Resource ret = loadFromClassLoader("model_size_small_split/model_size_small_original_model/model.uml", + resourceSet); EcoreUtil.resolveAll(resourceSet); return resourceSet; } + public ResourceSet loadRight() { ResourceSet resourceSet = createResourceSet(); - Resource ret = loadFromClassLoader("model_size_small_split/model_size_small_modified_model/model.uml", resourceSet); - EcoreUtil.resolveAll(resourceSet); + Resource ret = loadFromClassLoader("model_size_small_split/model_size_small_modified_model/model.uml", + resourceSet); + EcoreUtil.resolveAll(resourceSet); return resourceSet; } - - /** + + /** * {@inheritDoc} + * * @see data.models.TestMatchUML.Data#loadAncestor() */ @Override public Notifier loadAncestor() { return null; } -} \ No newline at end of file +} diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java index 8caa630a0..609f5f0aa 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/AbstractEMFComparePerformanceTest.java @@ -63,7 +63,6 @@ import fr.obeo.performance.api.Performance; /** * @author Mikael Barbero - * */ public abstract class AbstractEMFComparePerformanceTest { @@ -73,8 +72,7 @@ public abstract class AbstractEMFComparePerformanceTest { private static final Function MEASURE__SCENARIO = new Function() { public Scenario apply(Measure measure) { - return ((TestResult) ((DataPoint) measure.eContainer()) - .eContainer()).getScenario(); + return ((TestResult)((DataPoint)measure.eContainer()).eContainer()).getScenario(); } }; @@ -83,6 +81,7 @@ public abstract class AbstractEMFComparePerformanceTest { return measure.getValue(); } }; + private static final Function MEASURE__NAME = new Function() { public String apply(Measure measure) { return measure.getName(); @@ -94,49 +93,50 @@ public abstract class AbstractEMFComparePerformanceTest { return point.getMeasures(); } }; - + private static final Function> TEST_RESULT__DATA_POINTS = new Function>() { public List apply(TestResult testResult) { return testResult.getDataPoints(); } }; - + private static final Function, Double> AVERAGE = new Function, Double>() { public Double apply(Iterable it) { Double sum = 0.0; - if(!Iterables.isEmpty(it)) { - for (Double d : it) { - sum += d; - } - return sum.doubleValue() / Iterables.size(it); - } - return sum; + if (!Iterables.isEmpty(it)) { + for (Double d : it) { + sum += d; + } + return sum.doubleValue() / Iterables.size(it); + } + return sum; } }; private static final int DEFAULT_STEPS_NUMBER = 3; private static final boolean DEFAULT_WARMUP = true; - + @BeforeClass public static void setUp() throws Exception { if (!EMFPlugin.IS_ECLIPSE_RUNNING) { EPackage perf = PerformancePackage.eINSTANCE; EPackage.Registry.INSTANCE.put(perf.getNsURI(), perf); - Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("performance", new XMIResourceFactoryImpl()); + Resource.Factory.Registry.INSTANCE.getExtensionToFactoryMap().put("performance", + new XMIResourceFactoryImpl()); } - - //Deactivate auto-building - IWorkspace workspace= ResourcesPlugin.getWorkspace(); - if (workspace != null) { - IWorkspaceDescription desc= workspace.getDescription(); - boolean isAutoBuilding= desc.isAutoBuilding(); + + // Deactivate auto-building + IWorkspace workspace = ResourcesPlugin.getWorkspace(); + if (workspace != null) { + IWorkspaceDescription desc = workspace.getDescription(); + boolean isAutoBuilding = desc.isAutoBuilding(); if (isAutoBuilding == true) { desc.setAutoBuilding(false); workspace.setDescription(desc); } } - + timestamp = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss").format(new Date()); performance = new Performance("emf.compare.performance"); } @@ -145,24 +145,24 @@ public abstract class AbstractEMFComparePerformanceTest { public final void configureSUTName() { setSUTName(); } - + protected static final Performance getPerformance() { return performance; } - + /** - * Should be static but want to force impl. + * Should be static but want to force impl. */ protected abstract void setSUTName(); - + protected int getStepsNumber() { return DEFAULT_STEPS_NUMBER; } - + protected boolean warmup() { return DEFAULT_WARMUP; } - + @AfterClass public static void tearDown() { final NumberFormat nf = NumberFormat.getInstance(Locale.US); @@ -176,8 +176,8 @@ public abstract class AbstractEMFComparePerformanceTest { for (Entry> entry : measuresByName.asMap().entrySet()) { String measureName = entry.getKey(); - File output = new File(MessageFormat.format("{0}-{1}.csv", performance - .getSystemUnderTest().getName().replaceAll(" ", "_"), + File output = new File(MessageFormat.format("{0}-{1}.csv", + performance.getSystemUnderTest().getName().replaceAll(" ", "_"), measureName.replaceAll(" ", "_"))); PrintWriter writer = null; @@ -191,45 +191,45 @@ public abstract class AbstractEMFComparePerformanceTest { writer.println("Date, Small UML, Nominal UML, Small Split UML, Nominal Split UML"); columns = 4; } else { - //Get number of columns that contains measures + // Get number of columns that contains measures columns = readLine.split(",").length - 1; } writer.print(timestamp + ","); Collection measures = entry.getValue(); - ImmutableListMultimap measuresByScenario = Multimaps.index(measures, MEASURE__SCENARIO); - String joinedMeasure = Joiner.on(',').join( - transform(measuresByScenario.asMap().entrySet(), - new Function>, String>() { - public String apply(Entry> entry) { - final Dimension dimension = getFirst(entry.getValue(), null).getDimension(); - Iterable transform = transform(entry.getValue(), MEASURE__VALUE); - - List minAvMax = Lists.newArrayList(); - minAvMax.add(Ordering.natural().min(transform)); - minAvMax.add(AVERAGE.apply(transform)); - minAvMax.add(Ordering.natural().max(transform)); - - Iterable transform2 = transform(minAvMax, + ImmutableListMultimap measuresByScenario = Multimaps.index(measures, + MEASURE__SCENARIO); + String joinedMeasure = Joiner.on(',').join(transform(measuresByScenario.asMap().entrySet(), + new Function>, String>() { + public String apply(Entry> entry) { + final Dimension dimension = getFirst(entry.getValue(), null).getDimension(); + Iterable transform = transform(entry.getValue(), MEASURE__VALUE); + + List minAvMax = Lists.newArrayList(); + minAvMax.add(Ordering.natural().min(transform)); + minAvMax.add(AVERAGE.apply(transform)); + minAvMax.add(Ordering.natural().max(transform)); + + Iterable transform2 = transform(minAvMax, new Function() { public String apply(Double d) { switch (dimension) { - case MEMORY: - return nf.format(SizeUnit.MEBI.convert(d)).replaceAll(",", ""); - case TIME: - return nf.format(d).replaceAll(",", ""); + case MEMORY: + return nf.format(SizeUnit.MEBI.convert(d)) + .replaceAll(",", ""); + case TIME: + return nf.format(d).replaceAll(",", ""); } return ""; } }); - - String ret = Joiner.on(';').join(transform2); - return ret; - } - }) - ); + + String ret = Joiner.on(';').join(transform2); + return ret; + } + })); joinedMeasure = fillEmptyColumns(joinedMeasure, columns); writer.println(joinedMeasure); - + } catch (IOException e) { Throwables.propagate(e); } finally { @@ -242,7 +242,7 @@ public abstract class AbstractEMFComparePerformanceTest { } performance = null; } - + private static String fillEmptyColumns(String joinedMeasure, int columns) { final int filled = joinedMeasure.split(",").length; for (int i = 0; i < columns - filled; i++) { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/EMFComparePerfStats.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/EMFComparePerfStats.java index c9dc7cfe3..2025e5983 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/EMFComparePerfStats.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/EMFComparePerfStats.java @@ -17,94 +17,95 @@ import java.util.concurrent.TimeUnit; import com.google.common.base.Stopwatch; - /** * @author Mikael Barbero - * */ public class EMFComparePerfStats { private MemoryMXBean fMemoryBean; - + private MemoryUsage beforeMatchHeapMemoryUsage; + private MemoryUsage afterMatchHeapMemoryUsage; - + private MemoryUsage beforeDiffHeapMemoryUsage; + private MemoryUsage afterDiffHeapMemoryUsage; - + private final Stopwatch elapsedTimeInMatch; + private final Stopwatch elapsedTimeInDiff; - + EMFComparePerfStats() { fMemoryBean = ManagementFactory.getMemoryMXBean(); elapsedTimeInMatch = new Stopwatch(); elapsedTimeInDiff = new Stopwatch(); } - + void beforeMatch() { beforeMatchHeapMemoryUsage = fMemoryBean.getHeapMemoryUsage(); elapsedTimeInMatch.start(); } - + void afterMatch() { elapsedTimeInMatch.stop(); afterMatchHeapMemoryUsage = fMemoryBean.getHeapMemoryUsage(); } - + void beforeDiff() { beforeDiffHeapMemoryUsage = fMemoryBean.getHeapMemoryUsage(); elapsedTimeInDiff.start(); } - + void afterDiff() { elapsedTimeInDiff.stop(); afterDiffHeapMemoryUsage = fMemoryBean.getHeapMemoryUsage(); } - + public long elapsedTimeInMatch(TimeUnit unit) { return elapsedTimeInMatch.elapsedTime(unit); } - + public long usedHeapBeforeMatch(SizeUnit unit) { return unit.convert(beforeMatchHeapMemoryUsage.getUsed()); } - + public long usedHeapAfterMatch(SizeUnit unit) { return unit.convert(afterMatchHeapMemoryUsage.getUsed()); } - + public long elapsedTimeInDiff(TimeUnit unit) { return elapsedTimeInDiff.elapsedTime(unit); } - + public long usedHeapBeforeDiff(SizeUnit unit) { return unit.convert(beforeDiffHeapMemoryUsage.getUsed()); } - + public long usedHeapAfterDiff(SizeUnit unit) { return unit.convert(afterDiffHeapMemoryUsage.getUsed()); } - + public EMFComparePerfStats minus(EMFComparePerfStats stats) { return null; } - - /** + + /** * {@inheritDoc} + * * @see java.lang.Object#toString() */ @Override public String toString() { StringBuilder sb = new StringBuilder(256); - sb.append("Match\n"). - append("\tElapsed time: " + elapsedTimeInMatch(TimeUnit.MILLISECONDS) + " msec.\n"). - append("\tUsed heap before: " + usedHeapBeforeMatch(SizeUnit.MEBI)+ " MiB\n"). - append("\tUsed heap after : " + usedHeapAfterMatch(SizeUnit.MEBI)+ " MiB\n"). - append("Diff\n"). - append("\tElapsed time: " + elapsedTimeInDiff(TimeUnit.MILLISECONDS) + " msec.\n"). - append("\tUsed heap before: " + usedHeapBeforeDiff(SizeUnit.MEBI)+ " MiB\n"). - append("\tUsed heap after : " + usedHeapAfterDiff(SizeUnit.MEBI)+ " MiB\n") - ; + sb.append("Match\n") + .append("\tElapsed time: " + elapsedTimeInMatch(TimeUnit.MILLISECONDS) + " msec.\n") + .append("\tUsed heap before: " + usedHeapBeforeMatch(SizeUnit.MEBI) + " MiB\n") + .append("\tUsed heap after : " + usedHeapAfterMatch(SizeUnit.MEBI) + " MiB\n") + .append("Diff\n") + .append("\tElapsed time: " + elapsedTimeInDiff(TimeUnit.MILLISECONDS) + " msec.\n") + .append("\tUsed heap before: " + usedHeapBeforeDiff(SizeUnit.MEBI) + " MiB\n") + .append("\tUsed heap after : " + usedHeapAfterDiff(SizeUnit.MEBI) + " MiB\n"); return sb.toString(); } } diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceGitSuite.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceGitSuite.java index f53521833..9fe448d05 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceGitSuite.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceGitSuite.java @@ -22,18 +22,10 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses({ - TestGitMatchId.class, -// TestGitMatchContent.class, - TestGitDiff.class, - TestGitReq.class, - TestGitEqui.class, - TestGitConflict.class, - TestGitCompare.class, - TestGitPostMatchUML.class, - TestGitPostComparisonUML.class, -}) +@SuiteClasses({TestGitMatchId.class, + // TestGitMatchContent.class, + TestGitDiff.class, TestGitReq.class, TestGitEqui.class, TestGitConflict.class, TestGitCompare.class, + TestGitPostMatchUML.class, TestGitPostComparisonUML.class, }) public class PerformanceGitSuite { - } diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeGitSuite.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeGitSuite.java index 68d3523ed..8a7ca3cbf 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeGitSuite.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeGitSuite.java @@ -21,18 +21,10 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses({ - TestLargeGitMatchId.class, -// TestLargeGitMatchContent.class, - TestLargeGitDiff.class, - TestLargeGitReq.class, - TestLargeGitEqui.class, - TestLargeGitConflict.class, - TestLargeGitCompare.class, - TestLargeGitPostMatchUML.class, - TestLargeGitPostComparisonUML.class, -}) +@SuiteClasses({TestLargeGitMatchId.class, + // TestLargeGitMatchContent.class, + TestLargeGitDiff.class, TestLargeGitReq.class, TestLargeGitEqui.class, TestLargeGitConflict.class, + TestLargeGitCompare.class, TestLargeGitPostMatchUML.class, TestLargeGitPostComparisonUML.class, }) public class PerformanceLargeGitSuite { - } diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeSuite.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeSuite.java index dc065914e..db33031ac 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeSuite.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceLargeSuite.java @@ -22,19 +22,11 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses({ - TestLargeMatchId.class, -// TestLargeMatchContent.class, - TestLargeDiff.class, - TestLargeReq.class, - TestLargeEqui.class, - TestLargeConflict.class, - TestLargeCompare.class, - TestLargePostMatchUML.class, - TestLargePostComparisonUML.class, - TestLargeLogicalModel.class, -}) +@SuiteClasses({TestLargeMatchId.class, + // TestLargeMatchContent.class, + TestLargeDiff.class, TestLargeReq.class, TestLargeEqui.class, TestLargeConflict.class, + TestLargeCompare.class, TestLargePostMatchUML.class, TestLargePostComparisonUML.class, + TestLargeLogicalModel.class, }) public class PerformanceLargeSuite { - } diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceSuite.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceSuite.java index e76bb4e15..32a7c915e 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceSuite.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/PerformanceSuite.java @@ -13,19 +13,9 @@ import org.junit.runners.Suite; import org.junit.runners.Suite.SuiteClasses; @RunWith(Suite.class) -@SuiteClasses({ - TestMatchId.class, - TestMatchContent.class, - TestDiff.class, - TestReq.class, - TestEqui.class, - TestConflict.class, - TestCompare.class, - TestPostMatchUML.class, - TestPostComparisonUML.class, - TestLogicalModel.class, -}) +@SuiteClasses({TestMatchId.class, TestMatchContent.class, TestDiff.class, TestReq.class, TestEqui.class, + TestConflict.class, TestCompare.class, TestPostMatchUML.class, TestPostComparisonUML.class, + TestLogicalModel.class, }) public class PerformanceSuite { - } diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/SizeUnit.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/SizeUnit.java index 76b02d5ad..40a0c18e8 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/SizeUnit.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/SizeUnit.java @@ -12,53 +12,31 @@ package org.eclipse.emf.compare.tests.performance; /** * @author Mikael Barbero - * */ public enum SizeUnit { /** - * Prefixes binaires (prefixes CEI) -Nom Symb. Facteur -kibi Ki 2^10 = 1 024 -mebi Mi 2^20 = 1 048 576 -gibi Gi 2^30 = 1 073 741 824 -tebi Ti 2^40 = 1 099 511 627 776 -pebi Pi 2^50 = 1 125 899 906 842 624 -exbi Ei 2^60 = 1 152 921 504 606 846 976 -zebi Zi 2^70 = 1 180 591 620 717 411 303 424 -yobi Yi 2^80 = 1 208 925 819 614 629 174 706 176 -Prefixes decimaux (prefixes SI) -Nom Symb. Facteur Err. -kilo k 10^3 = 1 000 2 % -mega M 10^6 = 1 000 000 5 % -giga G 10^9 = 1 000 000 000 7 % -tera T 10^12 = 1 000 000 000 000 10 % -peta P 10^15 = 1 000 000 000 000 000 13 % -exa E 10^18 = 1 000 000 000 000 000 000 15 % -zetta Z 10^21 = 1 000 000 000 000 000 000 000 18 % -yotta Y 10^24 = 1 000 000 000 000 000 000 000 000 21 % - + * Prefixes binaires (prefixes CEI) Nom Symb. Facteur kibi Ki 2^10 = 1 024 mebi Mi 2^20 = 1 048 576 gibi + * Gi 2^30 = 1 073 741 824 tebi Ti 2^40 = 1 099 511 627 776 pebi Pi 2^50 = 1 125 899 906 842 624 exbi Ei + * 2^60 = 1 152 921 504 606 846 976 zebi Zi 2^70 = 1 180 591 620 717 411 303 424 yobi Yi 2^80 = 1 208 925 + * 819 614 629 174 706 176 Prefixes decimaux (prefixes SI) Nom Symb. Facteur Err. kilo k 10^3 = 1 000 2 % + * mega M 10^6 = 1 000 000 5 % giga G 10^9 = 1 000 000 000 7 % tera T 10^12 = 1 000 000 000 000 10 % peta + * P 10^15 = 1 000 000 000 000 000 13 % exa E 10^18 = 1 000 000 000 000 000 000 15 % zetta Z 10^21 = 1 000 + * 000 000 000 000 000 000 18 % yotta Y 10^24 = 1 000 000 000 000 000 000 000 000 21 % */ - - KIBI(1024), - MEBI(KIBI.fFactor * 1024), - GIBI(MEBI.fFactor * 1024), - TEBI(GIBI.fFactor * 1024), - PEBI(TEBI.fFactor * 1024), - EXBI(PEBI.fFactor * 1024), - ZEBI(EXBI.fFactor * 1024), - YOBI(ZEBI.fFactor * 1024); - + + KIBI(1024), MEBI(KIBI.fFactor * 1024), GIBI(MEBI.fFactor * 1024), TEBI(GIBI.fFactor * 1024), PEBI(TEBI.fFactor * 1024), EXBI(PEBI.fFactor * 1024), ZEBI(EXBI.fFactor * 1024), YOBI(ZEBI.fFactor * 1024); + private final long fFactor; - + private SizeUnit(long factor) { fFactor = factor; } - + public long convert(long value) { return (value / fFactor); } - + public double convert(double value) { return (value / fFactor); } diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestCompare.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestCompare.java index 23642aa56..62012265e 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestCompare.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestCompare.java @@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Mikael Barbero - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestCompare extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -50,7 +50,7 @@ public class TestCompare extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_compareUMLNominal() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLNominal"); @@ -62,7 +62,7 @@ public class TestCompare extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_compareUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLSmallSplit"); @@ -74,7 +74,7 @@ public class TestCompare extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_compareUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLNominalSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestConflict.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestConflict.java index 27c363932..39c6dbf93 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestConflict.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestConflict.java @@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestConflict extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override protected void setSUTName() { getPerformance().getSystemUnderTest().setName(TestConflict.class.getSimpleName()); } - + @Test public void a_conflictUMLSmall() { PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLSmall"); @@ -54,7 +54,7 @@ public class TestConflict extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_conflictUMLNominal() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLNominal"); @@ -70,7 +70,7 @@ public class TestConflict extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_conflictUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLSmallSplit"); @@ -86,7 +86,7 @@ public class TestConflict extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_conflictUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLNominalSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestDiff.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestDiff.java index c3b7d8beb..06450196b 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestDiff.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestDiff.java @@ -25,14 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Mikael Barbero - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestDiff extends AbstractEMFComparePerformanceTest { - - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -52,7 +51,7 @@ public class TestDiff extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_diffUMLNominal() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLNominal"); @@ -65,7 +64,7 @@ public class TestDiff extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_diffUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLSmallSplit"); @@ -78,7 +77,7 @@ public class TestDiff extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_diffUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLNominalSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestEqui.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestEqui.java index 2106adc65..a1bff6654 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestEqui.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestEqui.java @@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestEqui extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override protected void setSUTName() { getPerformance().getSystemUnderTest().setName(TestEqui.class.getSimpleName()); } - + @Test public void a_equiUMLSmall() { PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLSmall"); @@ -52,7 +52,7 @@ public class TestEqui extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_equiUMLNominal() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLNominal"); @@ -66,7 +66,7 @@ public class TestEqui extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_equiUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLSmallSplit"); @@ -80,7 +80,7 @@ public class TestEqui extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_equiUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLNominalSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestLogicalModel.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestLogicalModel.java index 9a90d407d..14c660ca2 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestLogicalModel.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestLogicalModel.java @@ -47,13 +47,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLogicalModel extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -66,21 +66,24 @@ public class TestLogicalModel extends AbstractEMFComparePerformanceTest { try { PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLSmall"); final Data data = new SmallInputData(); - + Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance"); URL entry = bundle.getEntry("src/data/models/model_size_small/.project"); URL fileURL = FileLocator.toFileURL(entry); - IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(fileURL.getPath())); - + IProjectDescription description = ResourcesPlugin.getWorkspace() + .loadProjectDescription(new Path(fileURL.getPath())); + IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName()); project.create(description, new NullProgressMonitor()); project.open(new NullProgressMonitor()); - + final IFile leftFile = project.getFile(new Path("original/model.uml")); final IFile rightFile = project.getFile(new Path("modified/model.uml")); - final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString()); - final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString()); - + final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, + leftFile.getFullPath().toOSString()); + final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, + rightFile.getFullPath().toOSString()); + monitor.measure(false, getStepsNumber(), new Runnable() { public void run() { data.logicalModel(leftTypedElement, rightTypedElement); @@ -94,25 +97,28 @@ public class TestLogicalModel extends AbstractEMFComparePerformanceTest { Assert.fail(); } } - + @Test public void b_logicalModelUMLNominal() { try { PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLNominal"); final Data data = new NominalInputData(); - + Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance"); URL entry = bundle.getEntry("src/data/models/model_size_nominal/.project"); URL fileURL = FileLocator.toFileURL(entry); - IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(fileURL.getPath())); + IProjectDescription description = ResourcesPlugin.getWorkspace() + .loadProjectDescription(new Path(fileURL.getPath())); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName()); project.create(description, new NullProgressMonitor()); project.open(new NullProgressMonitor()); final IFile leftFile = project.getFile(new Path("original/model.uml")); final IFile rightFile = project.getFile(new Path("modified/model.uml")); - final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString()); - final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString()); - + final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, + leftFile.getFullPath().toOSString()); + final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, + rightFile.getFullPath().toOSString()); + monitor.measure(false, getStepsNumber(), new Runnable() { public void run() { data.logicalModel(leftTypedElement, rightTypedElement); @@ -126,40 +132,46 @@ public class TestLogicalModel extends AbstractEMFComparePerformanceTest { Assert.fail(); } } - + @SuppressWarnings("restriction") @Test public void c_logicalModelUMLSmallSplit() { try { PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLSmallSplit"); final Data data = new SmallSplitInputData(); - + Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance"); - - final ResourceSet leftResourceSet = (ResourceSet) data.getLeft(); - final ResourceSet rightResourceSet = (ResourceSet) data.getRight(); - + + final ResourceSet leftResourceSet = (ResourceSet)data.getLeft(); + final ResourceSet rightResourceSet = (ResourceSet)data.getRight(); + IFile leftFile = null; IFile rightFile = null; - + final List projects = new ArrayList(); - - leftFile = createProjects(bundle, leftResourceSet, "model_size_small_split", "model_size_small_original_model", projects); - rightFile = createProjects(bundle, rightResourceSet, "model_size_small_split", "model_size_small_modified_model", projects); - final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString()); - final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString()); + leftFile = createProjects(bundle, leftResourceSet, "model_size_small_split", + "model_size_small_original_model", projects); + rightFile = createProjects(bundle, rightResourceSet, "model_size_small_split", + "model_size_small_modified_model", projects); + + final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, + leftFile.getFullPath().toOSString()); + final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, + rightFile.getFullPath().toOSString()); final IPreferenceStore store = EMFCompareIDEUIPlugin.getDefault().getPreferenceStore(); monitor.measure(false, getStepsNumber(), new Runnable() { public void run() { - store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, CrossReferenceResolutionScope.WORKSPACE.name()); + store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, + CrossReferenceResolutionScope.WORKSPACE.name()); data.logicalModel(leftTypedElement, rightTypedElement); - store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, store.getDefaultString(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE)); + store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, + store.getDefaultString(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE)); } }); data.dispose(); - + for (IProject project : projects) { project.close(new NullProgressMonitor()); project.delete(false, new NullProgressMonitor()); @@ -170,40 +182,46 @@ public class TestLogicalModel extends AbstractEMFComparePerformanceTest { Assert.fail(); } } - + @SuppressWarnings("restriction") @Test public void d_logicalModelUMLNominalSplit() { try { PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLNominalSplit"); final Data data = new NominalSplitInputData(); - + Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance"); - - final ResourceSet leftResourceSet = (ResourceSet) data.getLeft(); - final ResourceSet rightResourceSet = (ResourceSet) data.getRight(); - + + final ResourceSet leftResourceSet = (ResourceSet)data.getLeft(); + final ResourceSet rightResourceSet = (ResourceSet)data.getRight(); + IFile leftFile = null; IFile rightFile = null; - + final List projects = new ArrayList(); - - leftFile = createProjects(bundle, leftResourceSet, "model_size_nominal_split", "model_size_nominal_original_model", projects); - rightFile = createProjects(bundle, rightResourceSet, "model_size_nominal_split", "model_size_nominal_modified_model", projects); - final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString()); - final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString()); + leftFile = createProjects(bundle, leftResourceSet, "model_size_nominal_split", + "model_size_nominal_original_model", projects); + rightFile = createProjects(bundle, rightResourceSet, "model_size_nominal_split", + "model_size_nominal_modified_model", projects); + + final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, + leftFile.getFullPath().toOSString()); + final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, + rightFile.getFullPath().toOSString()); final IPreferenceStore store = EMFCompareIDEUIPlugin.getDefault().getPreferenceStore(); monitor.measure(false, getStepsNumber(), new Runnable() { public void run() { - store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, CrossReferenceResolutionScope.WORKSPACE.name()); + store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, + CrossReferenceResolutionScope.WORKSPACE.name()); data.logicalModel(leftTypedElement, rightTypedElement); - store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, store.getDefaultString(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE)); + store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, + store.getDefaultString(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE)); } }); data.dispose(); - + for (IProject project : projects) { project.close(new NullProgressMonitor()); project.delete(false, new NullProgressMonitor()); @@ -214,23 +232,25 @@ public class TestLogicalModel extends AbstractEMFComparePerformanceTest { Assert.fail(); } } - - private IFile createProjects(Bundle bundle, final ResourceSet rightResourceSet, - String sourceProjectName, String projectName, final List projects) throws IOException, - CoreException { + + private IFile createProjects(Bundle bundle, final ResourceSet rightResourceSet, String sourceProjectName, + String projectName, final List projects) throws IOException, CoreException { IFile file = null; for (Resource right : rightResourceSet.getResources()) { - //URIs pattern : bundleresource://149.fwk766258359/data/models/model_size_small_split/model_size_small_original_model/model.uml - //We have to retrieve the second to last segment + // URIs pattern : + // bundleresource://149.fwk766258359/data/models/model_size_small_split/model_size_small_original_model/model.uml + // We have to retrieve the second to last segment String projectPartName = right.getURI().segment(3); - URL entry = bundle.getEntry("src/data/models/" + sourceProjectName + "/" + projectPartName + "/.project"); + URL entry = bundle + .getEntry("src/data/models/" + sourceProjectName + "/" + projectPartName + "/.project"); URL fileURL = FileLocator.toFileURL(entry); - IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(fileURL.getPath())); + IProjectDescription description = ResourcesPlugin.getWorkspace() + .loadProjectDescription(new Path(fileURL.getPath())); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName()); project.create(description, new NullProgressMonitor()); project.open(new NullProgressMonitor()); projects.add(project); - if (file == null && projectPartName.equals(projectName)){ + if (file == null && projectPartName.equals(projectName)) { file = project.getFile(new Path("model.uml")); } } diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchContent.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchContent.java index 65bd03c7b..b6d23f3b5 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchContent.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchContent.java @@ -26,13 +26,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestMatchContent extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -51,7 +51,7 @@ public class TestMatchContent extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_matchContentUMLNominal() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLNominal"); @@ -63,7 +63,7 @@ public class TestMatchContent extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_matchContentUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLSmallSplit"); @@ -75,7 +75,7 @@ public class TestMatchContent extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_matchContentUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLNominalSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchId.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchId.java index 9b50e656c..7f6f4781d 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchId.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestMatchId.java @@ -24,13 +24,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Mikael Barbero - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestMatchId extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -49,7 +49,7 @@ public class TestMatchId extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_matchIdUMLNominal() { PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLNominal"); @@ -61,7 +61,7 @@ public class TestMatchId extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_matchIdUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLSmallSplit"); @@ -73,7 +73,7 @@ public class TestMatchId extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_matchIdUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLNominalSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonGMF.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonGMF.java index a402da0b2..f1f2fb6d8 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonGMF.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonGMF.java @@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Mikael Barbero - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestPostComparisonGMF extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -55,7 +55,7 @@ public class TestPostComparisonGMF extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_pcGMFUMLNominal() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLNominal"); @@ -72,7 +72,7 @@ public class TestPostComparisonGMF extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_pcGMFUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLSmallSplit"); @@ -89,7 +89,7 @@ public class TestPostComparisonGMF extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_pcGMFUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLNominalSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonUML.java index 53171b599..76c3ec0a0 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonUML.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostComparisonUML.java @@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestPostComparisonUML extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -56,7 +56,7 @@ public class TestPostComparisonUML extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_pcUMLUMLNominal() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLNominal"); @@ -74,7 +74,7 @@ public class TestPostComparisonUML extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_pcUMLUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLSmallSplit"); @@ -92,7 +92,7 @@ public class TestPostComparisonUML extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_pcUMLUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLNominalSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostMatchUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostMatchUML.java index f6d9d1076..5052ec055 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostMatchUML.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestPostMatchUML.java @@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestPostMatchUML extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -51,7 +51,7 @@ public class TestPostMatchUML extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_pmUMLUMLNominal() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLNominal"); @@ -64,7 +64,7 @@ public class TestPostMatchUML extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_pmUMLUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLSmallSplit"); @@ -77,7 +77,7 @@ public class TestPostMatchUML extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_pmUMLUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLNominalSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestReq.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestReq.java index 3146c9e15..294614453 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestReq.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/TestReq.java @@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestReq extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override protected void setSUTName() { getPerformance().getSystemUnderTest().setName(TestReq.class.getSimpleName()); } - + @Test public void a_reqUMLSmall() { PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLSmall"); @@ -52,7 +52,7 @@ public class TestReq extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_reqUMLNominal() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLNominal"); @@ -66,7 +66,7 @@ public class TestReq extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_reqUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLSmallSplit"); @@ -80,7 +80,7 @@ public class TestReq extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_reqUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLNominalSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/GitUtil.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/GitUtil.java index 149fc0ce7..be8db00ef 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/GitUtil.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/GitUtil.java @@ -51,7 +51,6 @@ import com.google.common.base.Throwables; /** * @author Axel Richard - * */ @SuppressWarnings("restriction") public final class GitUtil { @@ -116,18 +115,18 @@ public final class GitUtil { Throwables.propagate(e); } } - + /** * Delete the repository (and all files contained in). * * @param repository - * the File representing the repository. + * the File representing the repository. */ public static void deleteRepo(File repository) { if (repository.exists()) { File[] files = repository.listFiles(); if (null != files) { - for (int i=0; i < files.length; i++) { + for (int i = 0; i < files.length; i++) { if (files[i].isDirectory()) { deleteRepo(files[i]); } else { @@ -138,7 +137,7 @@ public final class GitUtil { repository.delete(); } } - + /** * Import the project from the given repository. * @@ -150,18 +149,19 @@ public final class GitUtil { */ public static IProject importProjectFromRepo(File repository, String projectFilePath) { try { - IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(repository.getPath() + File.separator + projectFilePath)); + IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription( + new Path(repository.getPath() + File.separator + projectFilePath)); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName()); project.create(description, new NullProgressMonitor()); project.open(new NullProgressMonitor()); - + return project; } catch (CoreException e) { Throwables.propagate(e); } return null; } - + /** * Import all projects contain in the given repository. * @@ -172,8 +172,9 @@ public final class GitUtil { Collection projects = new ArrayList(); try { Collection projectsFromRepo = getProjectsFromRepo(repository); - for (File file : projectsFromRepo) { - IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(file.getPath())); + for (File file : projectsFromRepo) { + IProjectDescription description = ResourcesPlugin.getWorkspace() + .loadProjectDescription(new Path(file.getPath())); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName()); project.create(description, new NullProgressMonitor()); project.open(new NullProgressMonitor()); @@ -184,9 +185,10 @@ public final class GitUtil { } return projects; } - + /** * Get the ".projects" files from the given repository. + * * @param repository * the given repository. * @return the ".projects" files from the given repository. @@ -196,7 +198,7 @@ public final class GitUtil { if (repository.exists()) { File[] files = repository.listFiles(); if (null != files) { - for (int i=0; i < files.length; i++) { + for (int i = 0; i < files.length; i++) { if (files[i].isDirectory()) { projects.addAll(getProjectsFromRepo(files[i])); } else if (files[i].getName().endsWith(IProjectDescription.DESCRIPTION_FILE_NAME)) { @@ -207,9 +209,10 @@ public final class GitUtil { } return projects; } - + /** * Connect given projects to the given repository. + * * @param repository * the given repository. * @param projects @@ -218,14 +221,15 @@ public final class GitUtil { public static void connectProjectsToRepo(Repository repository, Collection projects) { for (IProject project : projects) { try { - ConnectProviderOperation op = new ConnectProviderOperation(project, repository.getDirectory()); + ConnectProviderOperation op = new ConnectProviderOperation(project, + repository.getDirectory()); op.execute(new NullProgressMonitor()); } catch (CoreException e) { Throwables.propagate(e); } } } - + /** * Simulate a comparison between the two given references and returns back the subscriber that can provide * all computed synchronization information. @@ -238,16 +242,16 @@ public final class GitUtil { * The file we are comparing (that would be the file right-clicked into the workspace). * @return The created subscriber. */ - public static Subscriber createSubscriberForComparison(Repository repository, String sourceRef, String targetRef, IFile comparedFile, List disposers) - throws IOException { + public static Subscriber createSubscriberForComparison(Repository repository, String sourceRef, + String targetRef, IFile comparedFile, List disposers) throws IOException { final GitSynchronizeData data = new GitSynchronizeData(repository, sourceRef, targetRef, false); final GitSynchronizeDataSet dataSet = new GitSynchronizeDataSet(data); final ResourceMapping[] mappings = getResourceMappings(comparedFile); final GitResourceVariantTreeSubscriber subscriber = new GitResourceVariantTreeSubscriber(dataSet); subscriber.init(new NullProgressMonitor()); - final RemoteResourceMappingContext remoteContext = new GitSubscriberResourceMappingContext( - subscriber, dataSet); + final RemoteResourceMappingContext remoteContext = new GitSubscriberResourceMappingContext(subscriber, + dataSet); final SubscriberScopeManager manager = new SubscriberScopeManager(subscriber.getName(), mappings, subscriber, remoteContext, true); final GitSubscriberMergeContext context = new GitSubscriberMergeContext(subscriber, manager, dataSet); @@ -260,7 +264,7 @@ public final class GitUtil { }); return context.getSubscriber(); } - + /** * This will query all model providers for those that are enabled on the given file and list all mappings * available for that file. diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitCompare.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitCompare.java index 47ec917d4..eed87b73f 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitCompare.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitCompare.java @@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGitCompare extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -42,7 +42,7 @@ public class TestGitCompare extends AbstractEMFComparePerformanceTest { @Test public void a_compareUMLSmall() { PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLSmall"); - + final DataGit data = new SmallGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -51,11 +51,11 @@ public class TestGitCompare extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_compareUMLNominal() { PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLNominal"); - + final DataGit data = new NominalGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -64,11 +64,11 @@ public class TestGitCompare extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_compareUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLSmallSplit"); - + final DataGit data = new SmallSplitGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -77,11 +77,11 @@ public class TestGitCompare extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_compareUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLNominalSplit"); - + final DataGit data = new NominalSplitGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitConflict.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitConflict.java index 49f3ffb1e..a7a7aba92 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitConflict.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitConflict.java @@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGitConflict extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -42,7 +42,7 @@ public class TestGitConflict extends AbstractEMFComparePerformanceTest { @Test public void a_conflictUMLSmall() { PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLSmall"); - + final DataGit data = new SmallGitInputData(); data.match(); data.diff(); @@ -55,11 +55,11 @@ public class TestGitConflict extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_conflictUMLNominal() { PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLNominal"); - + final DataGit data = new NominalGitInputData(); data.match(); data.diff(); @@ -72,11 +72,11 @@ public class TestGitConflict extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_conflictUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLSmallSplit"); - + final DataGit data = new SmallSplitGitInputData(); data.match(); data.diff(); @@ -89,11 +89,11 @@ public class TestGitConflict extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_conflictUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLNominalSplit"); - + final DataGit data = new NominalSplitGitInputData(); data.match(); data.diff(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitDiff.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitDiff.java index 6cf5cee4a..3c56a78ab 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitDiff.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitDiff.java @@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGitDiff extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -42,7 +42,7 @@ public class TestGitDiff extends AbstractEMFComparePerformanceTest { @Test public void a_diffUMLSmall() { PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLSmall"); - + final DataGit data = new SmallGitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { @@ -52,11 +52,11 @@ public class TestGitDiff extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_diffUMLNominal() { PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLNominal"); - + final DataGit data = new NominalGitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { @@ -66,11 +66,11 @@ public class TestGitDiff extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_diffUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLSmallSplit"); - + final DataGit data = new SmallSplitGitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { @@ -80,11 +80,11 @@ public class TestGitDiff extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_diffUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLNominalSplit"); - + final DataGit data = new NominalSplitGitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitEqui.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitEqui.java index c093734c3..222af82f7 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitEqui.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitEqui.java @@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGitEqui extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -42,7 +42,7 @@ public class TestGitEqui extends AbstractEMFComparePerformanceTest { @Test public void a_equiUMLSmall() { PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLSmall"); - + final DataGit data = new SmallGitInputData(); data.match(); data.diff(); @@ -53,11 +53,11 @@ public class TestGitEqui extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_equiUMLNominal() { PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLNominal"); - + final DataGit data = new NominalGitInputData(); data.match(); data.diff(); @@ -68,11 +68,11 @@ public class TestGitEqui extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_equiUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLSmallSplit"); - + final DataGit data = new SmallSplitGitInputData(); data.match(); data.diff(); @@ -83,11 +83,11 @@ public class TestGitEqui extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_equiUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLNominalSplit"); - + final DataGit data = new NominalSplitGitInputData(); data.match(); data.diff(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchContent.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchContent.java index 34e5425ea..f2335b006 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchContent.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchContent.java @@ -26,13 +26,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGitMatchContent extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -43,7 +43,7 @@ public class TestGitMatchContent extends AbstractEMFComparePerformanceTest { @Test public void a_matchContentUMLSmall() { PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLSmall"); - + final DataGit data = new SmallGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -52,11 +52,11 @@ public class TestGitMatchContent extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_matchContentUMLNominal() { PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLNominal"); - + final DataGit data = new NominalGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -65,11 +65,11 @@ public class TestGitMatchContent extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_matchContentUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLSmallSplit"); - + final DataGit data = new SmallSplitGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -78,11 +78,11 @@ public class TestGitMatchContent extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_matchContentUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLNominalSplit"); - + final DataGit data = new NominalSplitGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchId.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchId.java index 23e79069e..26c115928 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchId.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitMatchId.java @@ -26,13 +26,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGitMatchId extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -43,7 +43,7 @@ public class TestGitMatchId extends AbstractEMFComparePerformanceTest { @Test public void a_matchIdUMLSmall() { PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLSmall"); - + final DataGit data = new SmallGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -52,11 +52,11 @@ public class TestGitMatchId extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_matchIdUMLNominal() { PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLNominal"); - + final DataGit data = new NominalGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -65,11 +65,11 @@ public class TestGitMatchId extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_matchIdUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLSmallSplit"); - + final DataGit data = new SmallSplitGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -78,11 +78,11 @@ public class TestGitMatchId extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_matchIdUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLNominalSplit"); - + final DataGit data = new NominalSplitGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonGMF.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonGMF.java index 5fab090f4..f1c81981e 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonGMF.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonGMF.java @@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGitPostComparisonGMF extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -42,7 +42,7 @@ public class TestGitPostComparisonGMF extends AbstractEMFComparePerformanceTest @Test public void a_pcGMFUMLSmall() { PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLSmall"); - + final DataGit data = new SmallGitInputData(); data.match(); data.diff(); @@ -56,11 +56,11 @@ public class TestGitPostComparisonGMF extends AbstractEMFComparePerformanceTest }); data.dispose(); } - + @Test public void b_pcGMFUMLNominal() { PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLNominal"); - + final DataGit data = new NominalGitInputData(); data.match(); data.diff(); @@ -74,11 +74,11 @@ public class TestGitPostComparisonGMF extends AbstractEMFComparePerformanceTest }); data.dispose(); } - + @Test public void c_pcGMFUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLSmallSplit"); - + final DataGit data = new SmallSplitGitInputData(); data.match(); data.diff(); @@ -92,11 +92,11 @@ public class TestGitPostComparisonGMF extends AbstractEMFComparePerformanceTest }); data.dispose(); } - + @Test public void d_pcGMFUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLNominalSplit"); - + final DataGit data = new NominalSplitGitInputData(); data.match(); data.diff(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonUML.java index f150f82d1..994579cdc 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonUML.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostComparisonUML.java @@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGitPostComparisonUML extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -42,7 +42,7 @@ public class TestGitPostComparisonUML extends AbstractEMFComparePerformanceTest @Test public void a_pcUMLUMLSmall() { PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLSmall"); - + final DataGit data = new SmallGitInputData(); data.match(); data.postMatchUML(); @@ -57,11 +57,11 @@ public class TestGitPostComparisonUML extends AbstractEMFComparePerformanceTest }); data.dispose(); } - + @Test public void b_pcUMLUMLNominal() { PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLNominal"); - + final DataGit data = new NominalGitInputData(); data.match(); data.postMatchUML(); @@ -76,11 +76,11 @@ public class TestGitPostComparisonUML extends AbstractEMFComparePerformanceTest }); data.dispose(); } - + @Test public void c_pcUMLUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLSmallSplit"); - + final DataGit data = new SmallSplitGitInputData(); data.match(); data.postMatchUML(); @@ -95,11 +95,11 @@ public class TestGitPostComparisonUML extends AbstractEMFComparePerformanceTest }); data.dispose(); } - + @Test public void d_pcUMLUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLNominalSplit"); - + final DataGit data = new NominalSplitGitInputData(); data.match(); data.postMatchUML(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostMatchUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostMatchUML.java index b19ce32c0..e809b6cda 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostMatchUML.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitPostMatchUML.java @@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGitPostMatchUML extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -42,7 +42,7 @@ public class TestGitPostMatchUML extends AbstractEMFComparePerformanceTest { @Test public void a_pmUMLUMLSmall() { PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLSmall"); - + final DataGit data = new SmallGitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { @@ -52,11 +52,11 @@ public class TestGitPostMatchUML extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_pmUMLUMLNominal() { PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLNominal"); - + final DataGit data = new NominalGitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { @@ -66,11 +66,11 @@ public class TestGitPostMatchUML extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_pmUMLUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLSmallSplit"); - + final DataGit data = new SmallSplitGitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { @@ -80,11 +80,11 @@ public class TestGitPostMatchUML extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_pmUMLUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLNominalSplit"); - + final DataGit data = new NominalSplitGitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitReq.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitReq.java index 83a2eff3f..2509b7a53 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitReq.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/TestGitReq.java @@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGitReq extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -42,7 +42,7 @@ public class TestGitReq extends AbstractEMFComparePerformanceTest { @Test public void a_reqUMLSmall() { PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLSmall"); - + final DataGit data = new SmallGitInputData(); data.match(); data.diff(); @@ -53,11 +53,11 @@ public class TestGitReq extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_reqUMLNominal() { PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLNominal"); - + final DataGit data = new NominalGitInputData(); data.match(); data.diff(); @@ -68,11 +68,11 @@ public class TestGitReq extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void c_reqUMLSmallSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLSmallSplit"); - + final DataGit data = new SmallSplitGitInputData(); data.match(); data.diff(); @@ -83,11 +83,11 @@ public class TestGitReq extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void d_reqUMLNominalSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLNominalSplit"); - + final DataGit data = new NominalSplitGitInputData(); data.match(); data.diff(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java index 2c8ba7e1a..832595dd9 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitCompare.java @@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeGitCompare extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -40,7 +40,7 @@ public class TestLargeGitCompare extends AbstractEMFComparePerformanceTest { @Test public void a_compareUMLLarge() { PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLLarge"); - + final DataGit data = new LargeGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -49,11 +49,11 @@ public class TestLargeGitCompare extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_compareUMLLargeSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLLargeSplit"); - + final DataGit data = new LargeSplitGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitConflict.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitConflict.java index 3b662f33b..2e9da1e7d 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitConflict.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitConflict.java @@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeGitConflict extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -40,7 +40,7 @@ public class TestLargeGitConflict extends AbstractEMFComparePerformanceTest { @Test public void a_conflictUMLLarge() { PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLLarge"); - + final DataGit data = new LargeGitInputData(); data.match(); data.diff(); @@ -53,11 +53,11 @@ public class TestLargeGitConflict extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_conflictUMLLargeSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLLargeSplit"); - + final DataGit data = new LargeSplitGitInputData(); data.match(); data.diff(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitDiff.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitDiff.java index 365c1fd10..f9a50503d 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitDiff.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitDiff.java @@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeGitDiff extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -40,7 +40,7 @@ public class TestLargeGitDiff extends AbstractEMFComparePerformanceTest { @Test public void a_diffUMLLarge() { PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLLarge"); - + final DataGit data = new LargeGitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { @@ -50,11 +50,11 @@ public class TestLargeGitDiff extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_diffUMLLargeSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLLargeSplit"); - + final DataGit data = new LargeSplitGitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitEqui.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitEqui.java index 1badf86bd..7517de7bc 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitEqui.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitEqui.java @@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeGitEqui extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -40,7 +40,7 @@ public class TestLargeGitEqui extends AbstractEMFComparePerformanceTest { @Test public void a_equiUMLLarge() { PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLLarge"); - + final DataGit data = new LargeGitInputData(); data.match(); data.diff(); @@ -51,11 +51,11 @@ public class TestLargeGitEqui extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_equiUMLLargeSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLLargeSplit"); - + final DataGit data = new LargeSplitGitInputData(); data.match(); data.diff(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchContent.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchContent.java index 4ed79e3d9..150d89246 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchContent.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchContent.java @@ -24,13 +24,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeGitMatchContent extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -41,7 +41,7 @@ public class TestLargeGitMatchContent extends AbstractEMFComparePerformanceTest @Test public void a_matchContentUMLLarge() { PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLLarge"); - + final DataGit data = new LargeGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -50,11 +50,11 @@ public class TestLargeGitMatchContent extends AbstractEMFComparePerformanceTest }); data.dispose(); } - + @Test public void b_matchContentUMLLargeSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLLargeSplit"); - + final DataGit data = new LargeSplitGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchId.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchId.java index ded41c2dd..c0df3b247 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchId.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitMatchId.java @@ -24,13 +24,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeGitMatchId extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -41,7 +41,7 @@ public class TestLargeGitMatchId extends AbstractEMFComparePerformanceTest { @Test public void a_matchIdUMLLarge() { PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLLarge"); - + final DataGit data = new LargeGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { @@ -50,11 +50,11 @@ public class TestLargeGitMatchId extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_matchIdUMLLargeSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLLargeSplit"); - + final DataGit data = new LargeSplitGitInputData(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { public void run() { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonGMF.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonGMF.java index 9055efc03..b74b9c012 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonGMF.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonGMF.java @@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeGitPostComparisonGMF extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -40,7 +40,7 @@ public class TestLargeGitPostComparisonGMF extends AbstractEMFComparePerformance @Test public void a_pcGMFUMLLarge() { PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLLarge"); - + final DataGit data = new LargeGitInputData(); data.match(); data.diff(); @@ -54,11 +54,11 @@ public class TestLargeGitPostComparisonGMF extends AbstractEMFComparePerformance }); data.dispose(); } - + @Test public void b_pcGMFUMLLargeSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLLargeSplit"); - + final DataGit data = new LargeSplitGitInputData(); data.match(); data.diff(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonUML.java index c0642a0d4..846c02118 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonUML.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostComparisonUML.java @@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeGitPostComparisonUML extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -40,7 +40,7 @@ public class TestLargeGitPostComparisonUML extends AbstractEMFComparePerformance @Test public void a_pcUMLUMLLarge() { PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLLarge"); - + final DataGit data = new LargeGitInputData(); data.match(); data.postMatchUML(); @@ -55,11 +55,11 @@ public class TestLargeGitPostComparisonUML extends AbstractEMFComparePerformance }); data.dispose(); } - + @Test public void b_pcUMLUMLLargeSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLLargeSplit"); - + final DataGit data = new LargeSplitGitInputData(); data.match(); data.postMatchUML(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostMatchUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostMatchUML.java index c3f5ee4de..ac1583181 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostMatchUML.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitPostMatchUML.java @@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeGitPostMatchUML extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -40,7 +40,7 @@ public class TestLargeGitPostMatchUML extends AbstractEMFComparePerformanceTest @Test public void a_pmUMLUMLLarge() { PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLLarge"); - + final DataGit data = new LargeGitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { @@ -50,11 +50,11 @@ public class TestLargeGitPostMatchUML extends AbstractEMFComparePerformanceTest }); data.dispose(); } - + @Test public void b_pmUMLUMLLargeSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLLargeSplit"); - + final DataGit data = new LargeSplitGitInputData(); data.match(); monitor.measure(warmup(), getStepsNumber(), new Runnable() { diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitReq.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitReq.java index e44937358..46eb6d1ab 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitReq.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/git/large/TestLargeGitReq.java @@ -23,13 +23,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeGitReq extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -40,7 +40,7 @@ public class TestLargeGitReq extends AbstractEMFComparePerformanceTest { @Test public void a_reqUMLLarge() { PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLLarge"); - + final DataGit data = new LargeGitInputData(); data.match(); data.diff(); @@ -51,11 +51,11 @@ public class TestLargeGitReq extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_reqUMLLargeSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLLargeSplit"); - + final DataGit data = new LargeSplitGitInputData(); data.match(); data.diff(); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeCompare.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeCompare.java index ea8a73891..2195ed316 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeCompare.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeCompare.java @@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Mikael Barbero - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeCompare extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override protected void setSUTName() { getPerformance().getSystemUnderTest().setName(TestCompare.class.getSimpleName()); } - + @Test public void a_compareUMLLarge() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLLarge"); @@ -50,7 +50,7 @@ public class TestLargeCompare extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_compareUMLLargeSplit() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("compareUMLLargeSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeConflict.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeConflict.java index 2158e0309..6790b2dec 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeConflict.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeConflict.java @@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeConflict extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override protected void setSUTName() { getPerformance().getSystemUnderTest().setName(TestConflict.class.getSimpleName()); } - + @Test public void a_conflictUMLLarge() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLLarge"); @@ -54,7 +54,7 @@ public class TestLargeConflict extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_conflictUMLLargeSplit() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("conflictUMLLargeSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeDiff.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeDiff.java index ce7770977..d936b6e8a 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeDiff.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeDiff.java @@ -25,21 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Mikael Barbero - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeDiff extends AbstractEMFComparePerformanceTest { - - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override protected void setSUTName() { getPerformance().getSystemUnderTest().setName(TestDiff.class.getSimpleName()); } - + @Test public void a_diffUMLLarge() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLLarge"); @@ -52,7 +51,7 @@ public class TestLargeDiff extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_diffUMLLargeSplit() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("diffUMLLargeSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeEqui.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeEqui.java index 53f0d0456..d3126a60f 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeEqui.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeEqui.java @@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeEqui extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override protected void setSUTName() { getPerformance().getSystemUnderTest().setName(TestEqui.class.getSimpleName()); } - + @Test public void a_equiUMLLarge() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLLarge"); @@ -52,7 +52,7 @@ public class TestLargeEqui extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_equiUMLLargeSplit() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("equiUMLLargeSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeLogicalModel.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeLogicalModel.java index a70db7faf..288a2a193 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeLogicalModel.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeLogicalModel.java @@ -48,38 +48,41 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeLogicalModel extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override protected void setSUTName() { getPerformance().getSystemUnderTest().setName(TestLogicalModel.class.getSimpleName()); } - + @Test public void a_logicalModelUMLLarge() { try { PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLLarge"); final Data data = new LargeInputData(); - + Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance"); URL entry = bundle.getEntry("src/data/models/model_size_large/.project"); URL fileURL = FileLocator.toFileURL(entry); - IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(fileURL.getPath())); + IProjectDescription description = ResourcesPlugin.getWorkspace() + .loadProjectDescription(new Path(fileURL.getPath())); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName()); project.create(description, new NullProgressMonitor()); project.open(new NullProgressMonitor()); final IFile leftFile = project.getFile(new Path("original/model.uml")); final IFile rightFile = project.getFile(new Path("modified/model.uml")); - final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString()); - final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString()); - + final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, + leftFile.getFullPath().toOSString()); + final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, + rightFile.getFullPath().toOSString()); + monitor.measure(false, getStepsNumber(), new Runnable() { public void run() { data.logicalModel(leftTypedElement, rightTypedElement); @@ -93,40 +96,46 @@ public class TestLargeLogicalModel extends AbstractEMFComparePerformanceTest { Assert.fail(); } } - + @SuppressWarnings("restriction") @Test public void b_logicalModelUMLLargeSplit() { try { PerformanceMonitor monitor = getPerformance().createMonitor("logicalModelUMLLargeSplit"); final Data data = new LargeSplitInputData(); - + Bundle bundle = Platform.getBundle("org.eclipse.emf.compare.tests.performance"); - - final ResourceSet leftResourceSet = (ResourceSet) data.getLeft(); - final ResourceSet rightResourceSet = (ResourceSet) data.getRight(); - + + final ResourceSet leftResourceSet = (ResourceSet)data.getLeft(); + final ResourceSet rightResourceSet = (ResourceSet)data.getRight(); + IFile leftFile = null; IFile rightFile = null; - + final List projects = new ArrayList(); - - leftFile = createProjects(bundle, leftResourceSet, "model_size_large_split", "model_size_large_original_model", projects); - rightFile = createProjects(bundle, rightResourceSet, "model_size_large_split", "model_size_large_modified_model", projects); - final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, leftFile.getFullPath().toOSString()); - final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, rightFile.getFullPath().toOSString()); + leftFile = createProjects(bundle, leftResourceSet, "model_size_large_split", + "model_size_large_original_model", projects); + rightFile = createProjects(bundle, rightResourceSet, "model_size_large_split", + "model_size_large_modified_model", projects); + + final ITypedElement leftTypedElement = new StorageTypedElement(leftFile, + leftFile.getFullPath().toOSString()); + final ITypedElement rightTypedElement = new StorageTypedElement(rightFile, + rightFile.getFullPath().toOSString()); final IPreferenceStore store = EMFCompareIDEUIPlugin.getDefault().getPreferenceStore(); monitor.measure(false, getStepsNumber(), new Runnable() { public void run() { - store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, CrossReferenceResolutionScope.WORKSPACE.name()); + store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, + CrossReferenceResolutionScope.WORKSPACE.name()); data.logicalModel(leftTypedElement, rightTypedElement); - store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, store.getDefaultString(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE)); + store.setValue(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE, + store.getDefaultString(EMFCompareUIPreferences.RESOLUTION_SCOPE_PREFERENCE)); } }); data.dispose(); - + for (IProject project : projects) { project.close(new NullProgressMonitor()); project.delete(false, new NullProgressMonitor()); @@ -137,22 +146,25 @@ public class TestLargeLogicalModel extends AbstractEMFComparePerformanceTest { Assert.fail(); } } - private IFile createProjects(Bundle bundle, final ResourceSet rightResourceSet, - String sourceProjectName, String projectName, final List projects) throws IOException, - CoreException { + + private IFile createProjects(Bundle bundle, final ResourceSet rightResourceSet, String sourceProjectName, + String projectName, final List projects) throws IOException, CoreException { IFile file = null; for (Resource right : rightResourceSet.getResources()) { - //URIs pattern : bundleresource://149.fwk766258359/data/models/model_size_small_split/model_size_small_original_model/model.uml - //We have to retrieve the second to last segment + // URIs pattern : + // bundleresource://149.fwk766258359/data/models/model_size_small_split/model_size_small_original_model/model.uml + // We have to retrieve the second to last segment String projectPartName = right.getURI().segment(3); - URL entry = bundle.getEntry("src/data/models/" + sourceProjectName + "/" + projectPartName + "/.project"); + URL entry = bundle + .getEntry("src/data/models/" + sourceProjectName + "/" + projectPartName + "/.project"); URL fileURL = FileLocator.toFileURL(entry); - IProjectDescription description = ResourcesPlugin.getWorkspace().loadProjectDescription(new Path(fileURL.getPath())); + IProjectDescription description = ResourcesPlugin.getWorkspace() + .loadProjectDescription(new Path(fileURL.getPath())); IProject project = ResourcesPlugin.getWorkspace().getRoot().getProject(description.getName()); project.create(description, new NullProgressMonitor()); project.open(new NullProgressMonitor()); projects.add(project); - if (file == null && projectPartName.equals(projectName)){ + if (file == null && projectPartName.equals(projectName)) { file = project.getFile(new Path("model.uml")); } } diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchContent.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchContent.java index c88802786..f8cf06b77 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchContent.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchContent.java @@ -26,13 +26,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeMatchContent extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -51,7 +51,7 @@ public class TestLargeMatchContent extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_matchContentUMLLargeSplit() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("matchContentUMLLargeSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchId.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchId.java index 874e74f8b..8050d75a5 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchId.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeMatchId.java @@ -24,20 +24,20 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Mikael Barbero - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeMatchId extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override protected void setSUTName() { getPerformance().getSystemUnderTest().setName(TestMatchId.class.getSimpleName()); } - + @Test public void a_matchIdUMLLarge() { PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLLarge"); @@ -49,7 +49,7 @@ public class TestLargeMatchId extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_matchIdUMLLargeSplit() { PerformanceMonitor monitor = getPerformance().createMonitor("matchIdUMLLargeSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonGMF.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonGMF.java index 0df93200b..0f9278ce3 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonGMF.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonGMF.java @@ -25,13 +25,13 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Mikael Barbero - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargePostComparisonGMF extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override @@ -55,7 +55,7 @@ public class TestLargePostComparisonGMF extends AbstractEMFComparePerformanceTes }); data.dispose(); } - + @Test public void b_pcGMFUMLLargeSplit() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("pcGMFUMLLargeSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonUML.java index c72b31c99..4d0e90e57 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonUML.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostComparisonUML.java @@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargePostComparisonUML extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override protected void setSUTName() { getPerformance().getSystemUnderTest().setName(TestPostComparisonUML.class.getSimpleName()); } - + @Test public void a_pcUMLUMLLarge() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLLarge"); @@ -56,7 +56,7 @@ public class TestLargePostComparisonUML extends AbstractEMFComparePerformanceTes }); data.dispose(); } - + @Test public void b_pcUMLUMLLargeSplit() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("pcUMLUMLLargeSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostMatchUML.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostMatchUML.java index 63f116628..14c2fda4a 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostMatchUML.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargePostMatchUML.java @@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargePostMatchUML extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override protected void setSUTName() { getPerformance().getSystemUnderTest().setName(TestPostMatchUML.class.getSimpleName()); } - + @Test public void a_pmUMLUMLLarge() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLLarge"); @@ -51,7 +51,7 @@ public class TestLargePostMatchUML extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_pmUMLUMLLargeSplit() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("pmUMLUMLLargeSplit"); diff --git a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeReq.java b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeReq.java index 4a16491d4..31d156b71 100644 --- a/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeReq.java +++ b/performance/org.eclipse.emf.compare.tests.performance/src/org/eclipse/emf/compare/tests/performance/large/TestLargeReq.java @@ -25,20 +25,20 @@ import fr.obeo.performance.api.PerformanceMonitor; /** * @author Axel Richard - * */ @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLargeReq extends AbstractEMFComparePerformanceTest { - /** + /** * {@inheritDoc} + * * @see org.eclipse.emf.compare.tests.performance.AbstractEMFComparePerformanceTest#setSUTName() */ @Override protected void setSUTName() { getPerformance().getSystemUnderTest().setName(TestReq.class.getSimpleName()); } - + @Test public void a_reqUMLLarge() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLLarge"); @@ -52,7 +52,7 @@ public class TestLargeReq extends AbstractEMFComparePerformanceTest { }); data.dispose(); } - + @Test public void b_reqUMLLargeSplit() throws IOException { PerformanceMonitor monitor = getPerformance().createMonitor("reqUMLLargeSplit"); -- cgit v1.2.3