Bug 263880 - moved equinox tests from core.tests.runtime
Moved adapter & registry tests from org.eclipse.core.tests.runtime.
Change-Id: Ic0a6e61c3a4fd8904ec555ee736bbc14dc884f5c
Signed-off-by: Julian Honnen <julian.honnen@vector.com>
diff --git a/bundles/org.eclipse.equinox.common.tests/.settings/org.eclipse.jdt.core.prefs b/bundles/org.eclipse.equinox.common.tests/.settings/org.eclipse.jdt.core.prefs
index 0c68a61..f891093 100644
--- a/bundles/org.eclipse.equinox.common.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/bundles/org.eclipse.equinox.common.tests/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,432 @@
eclipse.preferences.version=1
+org.eclipse.jdt.core.builder.cleanOutputFolder=clean
+org.eclipse.jdt.core.builder.duplicateResourceTask=warning
+org.eclipse.jdt.core.builder.invalidClasspath=abort
+org.eclipse.jdt.core.builder.resourceCopyExclusionFilter=*.launch
+org.eclipse.jdt.core.circularClasspath=error
+org.eclipse.jdt.core.classpath.exclusionPatterns=enabled
+org.eclipse.jdt.core.classpath.multipleOutputLocations=enabled
+org.eclipse.jdt.core.compiler.annotation.inheritNullAnnotations=disabled
+org.eclipse.jdt.core.compiler.annotation.missingNonNullByDefaultAnnotation=ignore
+org.eclipse.jdt.core.compiler.annotation.nonnull=org.eclipse.jdt.annotation.NonNull
+org.eclipse.jdt.core.compiler.annotation.nonnullbydefault=org.eclipse.jdt.annotation.NonNullByDefault
+org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nullable
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.doc.comment.support=enabled
+org.eclipse.jdt.core.compiler.maxProblemPerUnit=1000
+org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.autoboxing=ignore
+org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning
+org.eclipse.jdt.core.compiler.problem.deadCode=error
+org.eclipse.jdt.core.compiler.problem.deprecation=warning
+org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled
+org.eclipse.jdt.core.compiler.problem.deprecationWhenOverridingDeprecatedMethod=enabled
+org.eclipse.jdt.core.compiler.problem.discouragedReference=ignore
+org.eclipse.jdt.core.compiler.problem.emptyStatement=warning
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.problem.explicitlyClosedAutoCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.fallthroughCase=ignore
+org.eclipse.jdt.core.compiler.problem.fatalOptionalError=enabled
+org.eclipse.jdt.core.compiler.problem.fieldHiding=warning
+org.eclipse.jdt.core.compiler.problem.finalParameterBound=ignore
+org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally=warning
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=error
+org.eclipse.jdt.core.compiler.problem.hiddenCatchBlock=warning
+org.eclipse.jdt.core.compiler.problem.includeNullInfoFromAsserts=disabled
+org.eclipse.jdt.core.compiler.problem.incompatibleNonInheritedInterfaceMethod=warning
+org.eclipse.jdt.core.compiler.problem.incompleteEnumSwitch=ignore
+org.eclipse.jdt.core.compiler.problem.indirectStaticAccess=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadoc=warning
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsDeprecatedRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsNotVisibleRef=enabled
+org.eclipse.jdt.core.compiler.problem.invalidJavadocTagsVisibility=private
+org.eclipse.jdt.core.compiler.problem.localVariableHiding=warning
+org.eclipse.jdt.core.compiler.problem.methodWithConstructorName=warning
+org.eclipse.jdt.core.compiler.problem.missingDefaultCase=ignore
+org.eclipse.jdt.core.compiler.problem.missingDeprecatedAnnotation=ignore
+org.eclipse.jdt.core.compiler.problem.missingEnumCaseDespiteDefault=disabled
+org.eclipse.jdt.core.compiler.problem.missingHashCodeMethod=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocComments=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocCommentsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingJavadocTags=ignore
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.missingOverrideAnnotationForInterfaceMethodImplementation=enabled
+org.eclipse.jdt.core.compiler.problem.missingSerialVersion=warning
+org.eclipse.jdt.core.compiler.problem.missingSynchronizedOnInheritedMethod=ignore
+org.eclipse.jdt.core.compiler.problem.noEffectAssignment=warning
+org.eclipse.jdt.core.compiler.problem.noImplicitStringConversion=warning
+org.eclipse.jdt.core.compiler.problem.nonExternalizedStringLiteral=ignore
+org.eclipse.jdt.core.compiler.problem.nonnullParameterAnnotationDropped=warning
+org.eclipse.jdt.core.compiler.problem.nullAnnotationInferenceConflict=error
+org.eclipse.jdt.core.compiler.problem.nullReference=warning
+org.eclipse.jdt.core.compiler.problem.nullSpecViolation=error
+org.eclipse.jdt.core.compiler.problem.nullUncheckedConversion=warning
+org.eclipse.jdt.core.compiler.problem.overridingPackageDefaultMethod=warning
+org.eclipse.jdt.core.compiler.problem.parameterAssignment=ignore
+org.eclipse.jdt.core.compiler.problem.possibleAccidentalBooleanAssignment=warning
+org.eclipse.jdt.core.compiler.problem.potentialNullReference=ignore
+org.eclipse.jdt.core.compiler.problem.potentiallyUnclosedCloseable=ignore
+org.eclipse.jdt.core.compiler.problem.rawTypeReference=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullAnnotation=warning
+org.eclipse.jdt.core.compiler.problem.redundantNullCheck=ignore
+org.eclipse.jdt.core.compiler.problem.redundantSpecificationOfTypeArguments=error
+org.eclipse.jdt.core.compiler.problem.redundantSuperinterface=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBePotentiallyStatic=ignore
+org.eclipse.jdt.core.compiler.problem.reportMethodCanBeStatic=ignore
+org.eclipse.jdt.core.compiler.problem.specialParameterHidingField=disabled
+org.eclipse.jdt.core.compiler.problem.staticAccessReceiver=warning
+org.eclipse.jdt.core.compiler.problem.suppressOptionalErrors=disabled
+org.eclipse.jdt.core.compiler.problem.suppressWarnings=enabled
+org.eclipse.jdt.core.compiler.problem.syntacticNullAnalysisForFields=disabled
+org.eclipse.jdt.core.compiler.problem.syntheticAccessEmulation=ignore
+org.eclipse.jdt.core.compiler.problem.typeParameterHiding=warning
+org.eclipse.jdt.core.compiler.problem.unavoidableGenericTypeProblems=disabled
+org.eclipse.jdt.core.compiler.problem.uncheckedTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unclosedCloseable=warning
+org.eclipse.jdt.core.compiler.problem.undocumentedEmptyBlock=ignore
+org.eclipse.jdt.core.compiler.problem.unhandledWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryElse=warning
+org.eclipse.jdt.core.compiler.problem.unnecessaryTypeCheck=warning
+org.eclipse.jdt.core.compiler.problem.unqualifiedFieldAccess=ignore
+org.eclipse.jdt.core.compiler.problem.unsafeTypeOperation=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownException=warning
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionExemptExceptionAndThrowable=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedDeclaredThrownExceptionWhenOverriding=enabled
+org.eclipse.jdt.core.compiler.problem.unusedExceptionParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedImport=error
+org.eclipse.jdt.core.compiler.problem.unusedLabel=warning
+org.eclipse.jdt.core.compiler.problem.unusedLocal=warning
+org.eclipse.jdt.core.compiler.problem.unusedObjectAllocation=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedParameterIncludeDocCommentReference=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenImplementingAbstract=enabled
+org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=enabled
+org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error
+org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
+org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
+org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.formatter.align_fields_grouping_blank_lines=2147483647
+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=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16
+org.eclipse.jdt.core.formatter.alignment_for_expressions_in_for_loop_header=0
+org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
+org.eclipse.jdt.core.formatter.alignment_for_module_statements=16
+org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16
+org.eclipse.jdt.core.formatter.alignment_for_parameterized_type_references=0
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_resources_in_try=80
+org.eclipse.jdt.core.formatter.alignment_for_selector_in_method_invocation=16
+org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_type_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_constructor_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_throws_clause_in_method_declaration=16
+org.eclipse.jdt.core.formatter.alignment_for_type_arguments=0
+org.eclipse.jdt.core.formatter.alignment_for_type_parameters=0
+org.eclipse.jdt.core.formatter.alignment_for_union_type_in_multicatch=16
+org.eclipse.jdt.core.formatter.blank_lines_after_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_after_package=1
+org.eclipse.jdt.core.formatter.blank_lines_before_field=0
+org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0
+org.eclipse.jdt.core.formatter.blank_lines_before_imports=1
+org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1
+org.eclipse.jdt.core.formatter.blank_lines_before_method=1
+org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1
+org.eclipse.jdt.core.formatter.blank_lines_before_package=0
+org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1
+org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1
+org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_lambda_body=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line
+org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line
+org.eclipse.jdt.core.formatter.comment.align_tags_descriptions_grouped=true
+org.eclipse.jdt.core.formatter.comment.align_tags_names_descriptions=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false
+org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false
+org.eclipse.jdt.core.formatter.comment.count_line_length_from_starting_position=true
+org.eclipse.jdt.core.formatter.comment.format_block_comments=true
+org.eclipse.jdt.core.formatter.comment.format_comments=false
+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=false
+org.eclipse.jdt.core.formatter.comment.indent_root_tags=false
+org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert
+org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert
+org.eclipse.jdt.core.formatter.comment.line_length=80
+org.eclipse.jdt.core.formatter.comment.new_lines_at_block_boundaries=true
+org.eclipse.jdt.core.formatter.comment.new_lines_at_javadoc_boundaries=true
+org.eclipse.jdt.core.formatter.comment.preserve_white_space_between_code_and_line_comments=false
+org.eclipse.jdt.core.formatter.compact_else_if=true
+org.eclipse.jdt.core.formatter.continuation_indentation=2
+org.eclipse.jdt.core.formatter.continuation_indentation_for_array_initializer=2
+org.eclipse.jdt.core.formatter.disabling_tag=@formatter\:off
+org.eclipse.jdt.core.formatter.enabling_tag=@formatter\:on
+org.eclipse.jdt.core.formatter.format_guardian_clause_on_one_line=false
+org.eclipse.jdt.core.formatter.format_line_comment_starting_on_first_column=false
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_annotation_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_constant_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_enum_declaration_header=true
+org.eclipse.jdt.core.formatter.indent_body_declarations_compare_to_type_header=true
+org.eclipse.jdt.core.formatter.indent_breaks_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_empty_lines=false
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_block=true
+org.eclipse.jdt.core.formatter.indent_statements_compare_to_body=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_cases=true
+org.eclipse.jdt.core.formatter.indent_switchstatements_compare_to_switch=false
+org.eclipse.jdt.core.formatter.indentation.size=4
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_field=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_local_variable=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_method=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_package=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_parameter=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_type=insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_label=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_opening_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_after_type_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert
+org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert
+org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert
+org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert
+org.eclipse.jdt.core.formatter.insert_space_after_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_try_resources=insert
+org.eclipse.jdt.core.formatter.insert_space_after_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_and_in_type_parameter=insert
+org.eclipse.jdt.core.formatter.insert_space_before_assignment_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_at_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_binary_operator=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_cast=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_catch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_if=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_switch=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_synchronized=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_try=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_closing_paren_in_while=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_assert=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_case=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_default=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_constructor_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_constant_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_enum_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_explicitconstructorcall_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_increments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_for_inits=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_declaration_throws=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_method_invocation_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_field_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_multiple_local_declarations=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_superinterfaces=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_comma_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_ellipsis=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_lambda_arrow=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_parameterized_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_arguments=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_angle_bracket_in_type_parameters=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_annotation_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_anonymous_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_array_initializer=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_block=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_constructor_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_constant=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_enum_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_method_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_brace_in_type_declaration=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_bracket_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_catch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_for=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_if=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_parenthesized_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_synchronized=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_try=insert
+org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_while=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_return=insert
+org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw=insert
+org.eclipse.jdt.core.formatter.insert_space_before_postfix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_prefix_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_conditional=insert
+org.eclipse.jdt.core.formatter.insert_space_before_question_in_wildcard=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_for=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_semicolon_in_try_resources=do not insert
+org.eclipse.jdt.core.formatter.insert_space_before_unary_operator=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_brackets_in_array_type_reference=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_braces_in_array_initializer=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_brackets_in_array_allocation_expression=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_annotation_type_member_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_constructor_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_enum_constant=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_declaration=do not insert
+org.eclipse.jdt.core.formatter.insert_space_between_empty_parens_in_method_invocation=do not insert
+org.eclipse.jdt.core.formatter.join_lines_in_comments=true
+org.eclipse.jdt.core.formatter.join_wrapped_lines=true
+org.eclipse.jdt.core.formatter.keep_else_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.keep_empty_array_initializer_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_imple_if_on_one_line=false
+org.eclipse.jdt.core.formatter.keep_then_statement_on_same_line=false
+org.eclipse.jdt.core.formatter.lineSplit=120
+org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false
+org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0
+org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1
+org.eclipse.jdt.core.formatter.parentheses_positions_in_annotation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_catch_clause=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_enum_constant_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_for_statment=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_if_while_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_lambda_declaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_delcaration=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_method_invocation=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_switch_statement=common_lines
+org.eclipse.jdt.core.formatter.parentheses_positions_in_try_clause=common_lines
+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_assignment_operator=false
+org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true
+org.eclipse.jdt.core.formatter.wrap_before_conditional_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.incompatibleJDKLevel=ignore
+org.eclipse.jdt.core.incompleteClasspath=error
+org.eclipse.jdt.core.javaFormatter=org.eclipse.jdt.core.defaultJavaFormatter
diff --git a/bundles/org.eclipse.equinox.common.tests/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/META-INF/MANIFEST.MF
index f767c56..3458acb 100644
--- a/bundles/org.eclipse.equinox.common.tests/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.common.tests/META-INF/MANIFEST.MF
@@ -1,13 +1,16 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Common Eclipse Runtime Tests
-Bundle-SymbolicName: org.eclipse.equinox.common.tests
+Bundle-SymbolicName: org.eclipse.equinox.common.tests;singleton:=true
Bundle-Version: 3.10.300.qualifier
Automatic-Module-Name: org.eclipse.equinox.common.tests
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: org.junit,
org.eclipse.equinox.common;bundle-version="3.10.300",
- org.eclipse.core.tests.harness;bundle-version="3.11.400"
-Import-Package: org.osgi.framework,
+ org.eclipse.core.tests.harness;bundle-version="3.11.400",
+ org.eclipse.equinox.registry;bundle-version="3.8.200"
+Import-Package: org.eclipse.osgi.service.localization,
+ org.osgi.framework,
+ org.osgi.service.packageadmin,
org.osgi.util.tracker
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/dynamic/A/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/dynamic/A/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..333363b
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/dynamic/A/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Adaptor dynamic test
+Bundle-SymbolicName: adaptorDynamicTestA;singleton:=true
+Bundle-Version: 1.0.0
+Require-Bundle: org.eclipse.core.runtime
+Eclipse-LazyStart: true
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/dynamic/A/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/dynamic/A/plugin.xml
new file mode 100644
index 0000000..519eaab
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/dynamic/A/plugin.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+
+ <extension
+ id="testA"
+ point="org.eclipse.core.runtime.adapters">
+ <factory class="sampleClassA1" adaptableType="org.eclipse.equinox.common.tests.adaptable.TestAdaptable">
+ <adapter type="abc.SomethingElseA1"/>
+ </factory>
+ </extension>
+
+ <extension point="org.eclipse.core.runtime.adapters">
+ <factory class="sampleClass2" adaptableType="org.eclipse.equinox.common.tests.adaptable.TestAdaptable">
+ <adapter type="abc.SomethingElseA2"/>
+ </factory>
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/dynamic/B/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/dynamic/B/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..cff9808
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/dynamic/B/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Adaptor dynamic test
+Bundle-SymbolicName: adaptorDynamicTestB;singleton:=true
+Bundle-Version: 1.0.0
+Require-Bundle: org.eclipse.core.runtime
+Eclipse-LazyStart: true
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/dynamic/B/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/dynamic/B/plugin.xml
new file mode 100644
index 0000000..7c583ec
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/dynamic/B/plugin.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+
+ <extension
+ id="testB"
+ point="org.eclipse.core.runtime.adapters">
+ <factory class="sampleClassB1" adaptableType="org.eclipse.equinox.common.tests.adaptable.TestAdaptable">
+ <adapter type="abc.SomethingElseB1"/>
+ </factory>
+ </extension>
+
+ <extension point="org.eclipse.core.runtime.adapters">
+ <factory class="sampleClassB2" adaptableType="org.eclipse.equinox.common.tests.adaptable.TestAdaptable">
+ <adapter type="abc.SomethingElseB2"/>
+ </factory>
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/testAdapter_1.0.0/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/testAdapter_1.0.0/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..a64f8ee
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/testAdapter_1.0.0/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: AdapterLoader Test Plug-in
+Bundle-SymbolicName: testAdapter;singleton:=true
+Bundle-Version: 1.0.0
+Require-Bundle: org.eclipse.equinox.common.tests
+Export-Package: testAdapter
+Eclipse-LazyStart: false
+Bundle-RequiredExecutionEnvironment: J2SE-1.4
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/testAdapter_1.0.0/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/testAdapter_1.0.0/plugin.xml
new file mode 100644
index 0000000..4b6e398
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/testAdapter_1.0.0/plugin.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension
+ point="org.eclipse.equinox.common.tests.factoryLoaderTest">
+ <AdapterClass
+ name="testAdapter.testUnknown">
+ </AdapterClass>
+ </extension>
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/testAdapter_1.0.0/src/testAdapter/testUnknown.java b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/testAdapter_1.0.0/src/testAdapter/testUnknown.java
new file mode 100644
index 0000000..f6b677a
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/testAdapter_1.0.0/src/testAdapter/testUnknown.java
@@ -0,0 +1,18 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2012 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package testAdapter;
+
+public class testUnknown {
+
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/testAdapter_1.0.0/testAdapter/testUnknown.class b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/testAdapter_1.0.0/testAdapter/testUnknown.class
new file mode 100644
index 0000000..e065ebf
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/adapters/testAdapter_1.0.0/testAdapter/testUnknown.class
Binary files differ
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/fragmentF/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/fragmentF/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..06c85cd
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/fragmentF/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: 71826F
+Bundle-SymbolicName: 71826F;singleton:=true
+Bundle-Version: 1.0.0
+Fragment-Host: 71826A; bundle-version=1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/fragmentF/fragment.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/fragmentF/fragment.xml
new file mode 100644
index 0000000..ae11176
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/fragmentF/fragment.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<fragment>
+
+ <extension point="71826A.xptE" id="F1">
+ </extension>
+
+</fragment>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/pluginA/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/pluginA/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..f7bc8a3
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/pluginA/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: 71826A
+Bundle-SymbolicName: 71826A;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/pluginA/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/pluginA/plugin.xml
new file mode 100644
index 0000000..0dcf9e5
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/pluginA/plugin.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptE" name="Label xptE" schema="schema/xptE.exsd"/>
+
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/pluginB/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/pluginB/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..6b11b9d
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/pluginB/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: 71826B
+Bundle-SymbolicName: 71826B;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/pluginB/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/pluginB/plugin.xml
new file mode 100644
index 0000000..94d4b95
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/71826/pluginB/plugin.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension point="71826A.xptE" id="B1">
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/contributors/A/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/contributors/A/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..99bd7c9
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/contributors/A/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testContributors
+Bundle-SymbolicName: testContributors;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/contributors/A/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/contributors/A/plugin.xml
new file mode 100644
index 0000000..19bc9cb
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/contributors/A/plugin.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptContibutorsA" name="Label xptContributorsA" schema="schema/xptContributorsA.exsd"/>
+
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/contributors/B/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/contributors/B/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7e7a6e9
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/contributors/B/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Fragment Contributor Test
+Bundle-SymbolicName: FragmentContributorTest; singleton := true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: jar.jar
+Fragment-Host: testContributors;bundle-version="[1.0.0,2.0.0)"
+Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/contributors/B/fragment.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/contributors/B/fragment.xml
new file mode 100644
index 0000000..9cb747d
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/contributors/B/fragment.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<fragment>
+ <extension-point id="contrFragment" name="Contributed by Fragment" schema="schema/fargment.exsd"/>
+
+</fragment>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/A/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/A/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..a36fca4
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/A/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testByContributorsA
+Bundle-SymbolicName: testByContributorsA;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/A/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/A/plugin.xml
new file mode 100644
index 0000000..994efd0
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/A/plugin.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension-point id="org.eclipse.test.registryByContrib.PointA"
+ name="By Contributors PointA"
+ schema="schema/PointA.exsd"/>
+ <extension id="org.eclipse.test.registryByContrib.ExtensionA"
+ name="Extension A"
+ point="org.eclipse.test.registryByContrib.PointA">
+ </extension>
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/Afragment/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/Afragment/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..59f9d05
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/Afragment/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Fragment Contributor Test
+Bundle-SymbolicName: testByContributorsFragmentA; singleton := true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: jar.jar
+Fragment-Host: testByContributorsA
+Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/Afragment/fragment.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/Afragment/fragment.xml
new file mode 100644
index 0000000..328c204
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/Afragment/fragment.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<fragment>
+ <extension-point id="org.eclipse.test.registryByContrib.PointFA"
+ name="By Contributors PointFA"
+ schema="schema/PointFA.exsd"/>
+ <extension id="org.eclipse.test.registryByContrib.ExtensionFA"
+ name="Extension FA"
+ point="org.eclipse.test.registryByContrib.PointFA">
+ </extension>
+</fragment>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/B/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/B/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..b589c01
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/B/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testByContributorsB
+Bundle-SymbolicName: testByContributorsB;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/B/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/B/plugin.xml
new file mode 100644
index 0000000..6c89473
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/elementsByContributor/B/plugin.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension-point id="org.eclipse.test.registryByContrib.PointB"
+ name="By Contributors PointB"
+ schema="schema/PointB.exsd"/>
+ <extension id="org.eclipse.test.registryByContrib.ExtensionB"
+ name="Extension B"
+ point="org.eclipse.test.registryByContrib.PointB">
+ </extension>
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/bad/extension/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/bad/extension/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..dd2ce02
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/bad/extension/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testErrorHandling
+Bundle-SymbolicName: testErrorHandling;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/bad/extension/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/bad/extension/plugin.xml
new file mode 100644
index 0000000..2c89ddf
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/bad/extension/plugin.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptErrorTestA" name="Label xptErrorTestA" schema="schema/xptErrorTestA.exsd"/>
+
+ <extension point="xptErrorTestA" id="testExtA">
+ <test testAttr="valueA">
+ </extension>
+
+ <extension point="xptErrorTestA" id="testExtB">
+ <test testAttr="valueB"> <
+ </extension>
+
+ <extension point="xptErrorTestA" id="testExtC">
+ <test testAttr="valueC">
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/bad/point/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/bad/point/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..dd2ce02
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/bad/point/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testErrorHandling
+Bundle-SymbolicName: testErrorHandling;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/bad/point/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/bad/point/plugin.xml
new file mode 100644
index 0000000..8876b9a
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/bad/point/plugin.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptErrorTestA" name="Label xptErrorTestA" schema="schema/xptErrorTestA.exsd"/>
+
+ <extension-point id="xptErrorTestB" name bad="Label xptErrorTestB"/>
+
+ <extension-point id="xptErrorTestB" name="Label xptErrorTestB" schema="schema/xptErrorTestB.exsd"/>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/good/extension/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/good/extension/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..dd2ce02
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/good/extension/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testErrorHandling
+Bundle-SymbolicName: testErrorHandling;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/good/extension/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/good/extension/plugin.xml
new file mode 100644
index 0000000..5b8b2a7
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/good/extension/plugin.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptErrorTestA" name="Label xptErrorTestA" schema="schema/xptErrorTestA.exsd"/>
+
+ <extension point="xptErrorTestA" id="testExtA">
+ <test testAttr="valueGoodA"/>
+ </extension>
+
+ <extension point="xptErrorTestA" id="testExtB">
+ <test testAttr="valueGoodB"/>
+ </extension>
+
+ <extension point="xptErrorTestA" id="testExtC">
+ <test testAttr="valueGoodC"/>
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/good/point/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/good/point/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..dd2ce02
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/good/point/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testErrorHandling
+Bundle-SymbolicName: testErrorHandling;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/good/point/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/good/point/plugin.xml
new file mode 100644
index 0000000..9cef1d9
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/errorHandling/good/point/plugin.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptErrorTestA" name="Label xptErrorTestA" schema="schema/xptErrorTestA.exsd"/>
+ <extension-point id="xptErrorTestB" name="Label xptErrorTestB" schema="schema/xptErrorTestB.exsd"/>
+
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/fragmentToNonSingleton/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/fragmentToNonSingleton/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..de8b967
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/fragmentToNonSingleton/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: FragmentToNonSingleton Fragment
+Bundle-SymbolicName: FragmentToNonSingleton; singleton := true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: FragmentToNonSingleton.jar
+Fragment-Host: NonSingleton;bundle-version="[1.0.0,2.0.0)"
+Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/fragmentToNonSingleton/fragment.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/fragmentToNonSingleton/fragment.xml
new file mode 100644
index 0000000..992aa6c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/fragmentToNonSingleton/fragment.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<fragment>
+ <extension-point id="Bar" name="bar name" schema="schema/Bar.exsd"/>
+
+</fragment>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..baed376
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/META-INF/MANIFEST.MF
@@ -0,0 +1,7 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Multi-language registry test
+Bundle-SymbolicName: org.eclipse.equinox.registry.tests.multilang; singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/plugin.properties b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/plugin.properties
new file mode 100644
index 0000000..96177b6
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/plugin.properties
@@ -0,0 +1,16 @@
+###############################################################################
+# Copyright (c) 2012 IBM Corporation and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+attributeTest = Hello World
+valueTest = Cats and dogs
+altTest = eclipse
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/plugin.xml
new file mode 100644
index 0000000..a403780
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/plugin.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension-point id="org.eclipse.test.registryMulti.PointA"
+ name="%attributeTest"
+ schema="schema/PointA.exsd"/>
+ <extension id="org.eclipse.test.registryMulti.ExtA"
+ name="%valueTest"
+ point="org.eclipse.test.registryMulti.PointA">
+ <product
+ application="Application"
+ name="%attributeTest">
+ <section>
+ <subdivision division="%altTest">
+ </subdivision>
+ </section>
+ </product>
+ </extension>
+
+ <extension-point id="org.eclipse.test.registryMulti.PointValue"
+ name="Multi language registry test PointValue"
+ schema="schema/PointA.exsd"/>
+ <extension id="org.eclipse.test.registryMulti.ExtValue"
+ name="Multi language registry test Extension Value"
+ point="org.eclipse.test.registryMulti.PointValue">
+ <product>
+ %valueTest
+ </product>
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/plugin_de.properties b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/plugin_de.properties
new file mode 100644
index 0000000..e8fbd90
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/plugin_de.properties
@@ -0,0 +1,16 @@
+###############################################################################
+# Copyright (c) 2012 IBM Corporation and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+attributeTest = Hallo Welt
+valueTest = Hunde und Katzen
+altTest = Eklipse
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/plugin_fi.properties b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/plugin_fi.properties
new file mode 100644
index 0000000..41fd615
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/bundleA/plugin_fi.properties
@@ -0,0 +1,16 @@
+###############################################################################
+# Copyright (c) 2012 IBM Corporation and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+attributeTest = Hei maailma
+valueTest = Kissat ja koirat
+altTest = pimennys
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..615a01b
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Multi-language fragment registry test
+Bundle-SymbolicName: org.eclipse.equinox.registry.tests.multilang.fragment; singleton:=true
+Bundle-Version: 1.0.0.qualifier
+Fragment-Host: org.eclipse.equinox.registry.tests.multilang;bundle-version="[1.0.0,2.0.0)"
+Bundle-Vendor: Eclipse.org
+Bundle-Localization: fragment
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/fragment.properties b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/fragment.properties
new file mode 100644
index 0000000..a47c30b
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/fragment.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2012 IBM Corporation and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+baseTest = Make haste slowly
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/fragment.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/fragment.xml
new file mode 100644
index 0000000..9c790a9
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/fragment.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension-point id="org.eclipse.test.registryMulti.FragmentPointA"
+ name="Multi language registry test FragmentPointA"
+ schema="schema/FragmentPointA.exsd"/>
+ <extension id="org.eclipse.test.registryMulti.FragmentExtA"
+ name="Multi language registry test Extension A"
+ point="org.eclipse.test.registryMulti.FragmentPointA">
+ <product
+ name="%baseTest"
+ application="Application">
+ </product>
+ </extension>
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/fragment_la.properties b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/fragment_la.properties
new file mode 100644
index 0000000..75391c2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/fragment_la.properties
@@ -0,0 +1,14 @@
+###############################################################################
+# Copyright (c) 2012 IBM Corporation and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+baseTest = Festina lente
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/plugin_it.properties b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/plugin_it.properties
new file mode 100644
index 0000000..b6fa71d
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/multiLang/fragmentA/plugin_it.properties
@@ -0,0 +1,16 @@
+###############################################################################
+# Copyright (c) 2012 IBM Corporation and others.
+#
+# This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License 2.0
+# which accompanies this distribution, and is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+# IBM Corporation - initial API and implementation
+###############################################################################
+attributeTest = Ciao a tutti
+valueTest = Cani e gatti
+altTest = eclissi
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingleton/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingleton/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..b3417eb
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingleton/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: NonSingleton Plug-in
+Bundle-SymbolicName: NonSingleton
+Bundle-Version: 1.0.0
+Bundle-ClassPath: NonSingleton.jar
+Bundle-Localization: plugin
+Eclipse-AutoStart: true
+Require-Bundle: org.eclipse.core.runtime
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingleton/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingleton/plugin.xml
new file mode 100644
index 0000000..c887044
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingleton/plugin.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension-point id="ExtensionPoint" name="extension point" schema="schema/ExtensionPoint.exsd"/>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingletonFragment/fragment/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingletonFragment/fragment/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5d70242
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingletonFragment/fragment/META-INF/MANIFEST.MF
@@ -0,0 +1,8 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: NonSingletonFragment Fragment
+Bundle-SymbolicName: NonSingletonFragment
+Bundle-Version: 1.0.0
+Bundle-ClassPath: a.jar
+Fragment-Host: Regular;bundle-version="[1.0.0,2.0.0)"
+Bundle-Localization: plugin
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingletonFragment/fragment/fragment.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingletonFragment/fragment/fragment.xml
new file mode 100644
index 0000000..992aa6c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingletonFragment/fragment/fragment.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<fragment>
+ <extension-point id="Bar" name="bar name" schema="schema/Bar.exsd"/>
+
+</fragment>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingletonFragment/plugin/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingletonFragment/plugin/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..86cac4f
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/nonSingletonFragment/plugin/META-INF/MANIFEST.MF
@@ -0,0 +1,9 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Regular Plug-in
+Bundle-SymbolicName: Regular; singleton:=true
+Bundle-Version: 1.0.0
+Bundle-ClassPath: NonSingleton.jar
+Bundle-Localization: plugin
+Eclipse-AutoStart: true
+Require-Bundle: org.eclipse.core.runtime
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testA/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testA/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..3661d5e
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testA/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testA
+Bundle-SymbolicName: testA;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testA/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testA/plugin.xml
new file mode 100644
index 0000000..14d74f0
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testA/plugin.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptA" name="Label xptA" schema="schema/xptA.exsd"/>
+
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testB/1/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testB/1/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..b8407d9
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testB/1/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testB1
+Bundle-SymbolicName: testB1;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testB/1/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testB/1/plugin.xml
new file mode 100644
index 0000000..0526e70
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testB/1/plugin.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension point="testB2.xptB2" id="ext1">
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testB/2/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testB/2/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..bfe3c48
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testB/2/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testB2
+Bundle-SymbolicName: testB2;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testB/2/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testB/2/plugin.xml
new file mode 100644
index 0000000..fd91cbd
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testB/2/plugin.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptB2" name="Label xptB2" schema="schema/xptB2.exsd"/>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testC/1/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testC/1/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..59a66ac
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testC/1/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testC1
+Bundle-SymbolicName: testC1;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testC/1/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testC/1/plugin.xml
new file mode 100644
index 0000000..dbc3116
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testC/1/plugin.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptC1" name="Label xptC1" schema="schema/xptC1.exsd"/>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testC/2/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testC/2/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..d3c0462
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testC/2/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testC2
+Bundle-SymbolicName: testC2;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testC/2/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testC/2/plugin.xml
new file mode 100644
index 0000000..8f2d32e
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testC/2/plugin.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension point="testC1.xptC1" id="ext1">
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testD/1/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testD/1/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..5ac68e1
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testD/1/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testD1
+Bundle-SymbolicName: testD1;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testD/1/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testD/1/plugin.xml
new file mode 100644
index 0000000..4debcaa
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testD/1/plugin.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptD1" name="Label xptD1" schema="schema/xptD1.exsd"/>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testD/2/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testD/2/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..ef55caf
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testD/2/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testD2
+Bundle-SymbolicName: testD2;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testD/2/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testD/2/plugin.xml
new file mode 100644
index 0000000..5f93683
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testD/2/plugin.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension point="testD1.xptD1" id="ext1">
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testE/1/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testE/1/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..443aa09
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testE/1/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testE1
+Bundle-SymbolicName: testE1;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testE/1/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testE/1/plugin.xml
new file mode 100644
index 0000000..d4acacb
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testE/1/plugin.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptE1" name="Label xptE1" schema="schema/xptE1.exsd"/>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testE/2/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testE/2/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..8ef92ca
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testE/2/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testE2
+Bundle-SymbolicName: testE2;singleton:=true
+Bundle-Version: 1.0.0
+Fragment-Host: testE1; bundle-version=1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testE/2/fragment.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testE/2/fragment.xml
new file mode 100644
index 0000000..37608e5
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testE/2/fragment.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<fragment>
+
+ <extension point="testE1.xptE1" id="ext1">
+ </extension>
+
+</fragment>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testF/1/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testF/1/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..1720070
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testF/1/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testF1
+Bundle-SymbolicName: testF1;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testF/1/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testF/1/plugin.xml
new file mode 100644
index 0000000..e40060a
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testF/1/plugin.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptF1" name="Label xptF1" schema="schema/xptF1.exsd"/>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testF/2/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testF/2/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..42b40ca
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testF/2/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testF2
+Bundle-SymbolicName: testF2;singleton:=true
+Bundle-Version: 1.0.0
+Fragment-Host: testF1; bundle-version=1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testF/2/fragment.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testF/2/fragment.xml
new file mode 100644
index 0000000..ee69d1b
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testF/2/fragment.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<fragment>
+
+ <extension point="testF1.xptF1" id="ext1">
+ </extension>
+
+</fragment>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testG/1/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testG/1/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..6e2f95b
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testG/1/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testG1
+Bundle-SymbolicName: testG1;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testG/1/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testG/1/plugin.xml
new file mode 100644
index 0000000..959271c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testG/1/plugin.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="unused" name="unused in tests" schema="schema/xptH1.exsd"/>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testG/2/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testG/2/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..267734b
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testG/2/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testG2
+Bundle-SymbolicName: testG2;singleton:=true
+Bundle-Version: 1.0.0
+Fragment-Host: testG1; bundle-version=1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testG/2/fragment.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testG/2/fragment.xml
new file mode 100644
index 0000000..db55280
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testG/2/fragment.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<fragment>
+
+ <extension-point id="xptG2" name="Label xptG2" schema="schema/xptG2.exsd"/>
+
+</fragment>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/1/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/1/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..414041f
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/1/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testH1
+Bundle-SymbolicName: testH1;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/1/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/1/plugin.xml
new file mode 100644
index 0000000..df779c0
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/1/plugin.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptH1" name="Label xptH1" schema="schema/xptH1.exsd"/>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/2/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/2/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..369e13a
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/2/META-INF/MANIFEST.MF
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testH2
+Bundle-SymbolicName: testH2;singleton:=true
+Bundle-Version: 1.0.0
+Fragment-Host: testH3; bundle-version=1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/2/fragment.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/2/fragment.xml
new file mode 100644
index 0000000..aaf854a
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/2/fragment.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<fragment>
+
+ <extension point="testH1.xptH1" id="ext1">
+ </extension>
+</fragment>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/3/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/3/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..1e7e61b
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/3/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testH3
+Bundle-SymbolicName: testH3;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/3/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/3/plugin.xml
new file mode 100644
index 0000000..5a10bb4
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testH/3/plugin.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="unused" name="unused in tests" schema="schema/xptH1.exsd"/>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testI/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testI/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..83169e9
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testI/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testI
+Bundle-SymbolicName: testI;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testI/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testI/plugin.xml
new file mode 100644
index 0000000..f21cebe
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testI/plugin.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptI" name="Label xptI" schema="schema/xptI.exsd"/>
+
+ <extension point="xptI" id="ext1">
+ <ce level="1">
+ value level one
+ <ce2 level="2">
+ <ce3 level="3">
+ <ce4 level="4">
+ value level four
+ </ce4>
+ </ce3>
+ <ce3 level="threebis"/>
+ </ce2>
+ </ce>
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testNamespace/1/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testNamespace/1/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..7ce3248
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testNamespace/1/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testNamespace1
+Bundle-SymbolicName: testNamespace1;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testNamespace/1/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testNamespace/1/plugin.xml
new file mode 100644
index 0000000..18c36d4
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testNamespace/1/plugin.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+
+ <extension-point id="org.abc.xptNS1" name="Label xptNS1" schema="schema/xptNS1.exsd"/>
+
+ <extension point="org.abc.xptNS1" id="org.abc.extNS1">
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testNamespace/2/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testNamespace/2/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..c71ec7c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testNamespace/2/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testNamespace2
+Bundle-SymbolicName: testNamespace2;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testNamespace/2/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testNamespace/2/plugin.xml
new file mode 100644
index 0000000..7bc6795
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testNamespace/2/plugin.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+
+ <extension-point id="org.abc.xptNS2" name="Label xptNS2" schema="schema/xptNS2.exsd"/>
+
+ <extension point="org.abc.xptNS2" id="org.abc.extNS2">
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/CERemovalTest.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/CERemovalTest.xml
new file mode 100644
index 0000000..037b53c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/CERemovalTest.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension-point id="PointA" name="Test Point A" schema="schema/schema.exsd"/>
+
+ <extension id="TestExtensionA1" point="PointA">
+ <data class="abc">
+ <timestamp value="123"/>
+ </data>
+ </extension>
+
+ <extension id="TestExtensionA2" point="PointA">
+ <data class="bcd">
+ <timestamp value="321"/>
+ </data>
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/DuplicatePoints1.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/DuplicatePoints1.xml
new file mode 100644
index 0000000..c7ce8fc
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/DuplicatePoints1.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension-point id="testDuplicates.duplicateExtensionPoint" name="Test11" schema="schema.exsd"/>
+ <extension
+ id="testDuplicates.duplicateExtension"
+ point="testDuplicates.duplicateExtensionPoint">
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/DuplicatePoints2.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/DuplicatePoints2.xml
new file mode 100644
index 0000000..4f993f7
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/DuplicatePoints2.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension-point id="testDuplicates.duplicateExtensionPoint" name="Test21" schema="schema.exsd"/>
+ <extension-point id="testDuplicates.nonDuplicateExtensionPoint" name="Test22" schema="schema.exsd"/>
+ <extension
+ id="testDuplicates.duplicateExtension"
+ point="testDuplicates.duplicateExtensionPoint">
+ </extension>
+ <extension
+ id="testDuplicates.nonDuplicateExtension"
+ point="testDuplicates.duplicateExtensionPoint">
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/DuplicatePointsSame.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/DuplicatePointsSame.xml
new file mode 100644
index 0000000..08694da
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/DuplicatePointsSame.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
+<plugin>
+ <extension-point id="testSame.duplicateExtensionPointSame" name="Test31" schema="schema.exsd"/>
+ <extension-point id="testSame.duplicateExtensionPointSame" name="Test32" schema="schema.exsd"/>
+ <extension
+ id="testSame.duplicateExtensionSame"
+ point="testSame.duplicateExtensionPointSame">
+ </extension>
+ <extension
+ id="testSame.duplicateExtensionSame"
+ point="testSame.duplicateExtensionPointSame">
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/DynamicExtension.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/DynamicExtension.xml
new file mode 100644
index 0000000..ffa2469
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/DynamicExtension.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<CitrateSynthase>
+
+ <extension-point id="XMLDirectExtPoint" name="XML Extension Point" schema="schema/ExtensionPointTest.exsd"/>
+
+ <extension id="XMLDirectExtensionID" name="XML Direct Extension" point="XMLDirectExtPoint">
+ <description class="org.eclipse.equinox.common.tests.registry.simple.utils.ExecutableRegistryObject"/>
+ </extension>
+
+</CitrateSynthase>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/ExecutableExtension.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/ExecutableExtension.xml
new file mode 100644
index 0000000..544dfca
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/ExecutableExtension.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="XMLExecutableExtPoint" name="Testing XML Executable Extension Point" schema="schema/ExtensionPointTest.exsd"/>
+
+ <extension id="TestExeExtensionId" point="XMLExecutableExtPoint">
+ <description class="org.eclipse.equinox.common.tests.registry.simple.utils.ExecutableRegistryObject"/>
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/Extension.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/Extension.xml
new file mode 100644
index 0000000..3bdc57d
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/Extension.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension id="XMLDirectExtensionID" name="XML Direct Extension" point="XMLDirectExtPoint">
+ <StorageDevice deviceURL="theShienneMountain">
+ <BackupDevice backupURL="SkyLab"/>
+ <BackupDevice backupURL="OceanFloor"/>
+ </StorageDevice>
+ </extension>
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/ExtensionPoint.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/ExtensionPoint.xml
new file mode 100644
index 0000000..677a17c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/ExtensionPoint.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension-point id="XMLDirectExtPoint" name="XML Extension Point" schema="schema/ExtensionPointTest.exsd"/>
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/MergeDynamic.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/MergeDynamic.xml
new file mode 100644
index 0000000..422cfad
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/MergeDynamic.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension id="MergeDynamicExt1" name="Contribution merge Dynamic test1" point="MergeStatic">
+ <someTag someData="theData">
+ </someTag>
+ </extension>
+
+ <extension id="MergeDynamicExt2" name="Contribution merge Dynamic test2" point="MergeStatic">
+ <someTag someData="theData">
+ </someTag>
+ </extension>
+
+ <extension id="MergeDynamicExt3" name="Contribution merge Dynamic test3" point="MergeStatic">
+ <someTag someData="theData">
+ </someTag>
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/MergeStatic.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/MergeStatic.xml
new file mode 100644
index 0000000..fe73caa
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/MergeStatic.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension-point id="MergeStatic" name="Contribution merge test" schema="schema/ExtensionPointTest.exsd"/>
+
+ <extension id="MergeStaticExt1" name="Contribution merge test1" point="MergeStatic">
+ <someTag someData="theData">
+ </someTag>
+ </extension>
+
+ <extension id="MergeStaticExt2" name="Contribution merge test2" point="MergeStatic">
+ <someTag someData="theData">
+ </someTag>
+ </extension>
+
+ <extension id="MergeStaticExt3" name="Contribution merge test3" point="MergeStatic">
+ <someTag someData="theData">
+ </someTag>
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/RemovalTest.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/RemovalTest.xml
new file mode 100644
index 0000000..fe642bf
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testSimple/RemovalTest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+ <extension-point id="PointA" name="Test Point A" schema="schema/schema.exsd"/>
+ <extension-point id="PointB" name="Test Point B" schema="schema/schema.exsd"/>
+
+ <extension id="TestExtensionA1" point="PointA"></extension>
+ <extension id="TestExtensionA2" point="PointA"></extension>
+
+ <extension id="TestExtensionB1" point="PointB"></extension>
+ <extension id="TestExtensionB2" point="PointB"></extension>
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testStale1/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testStale1/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..c434c08
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testStale1/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testStale
+Bundle-SymbolicName: testStale;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testStale1/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testStale1/plugin.xml
new file mode 100644
index 0000000..5df1848
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testStale1/plugin.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptB2" name="Label xptB2" schema="schema/xptB2.exsd"/>
+
+ <extension point="xptB2" id="ext1">
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testStale2/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testStale2/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..359137f
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testStale2/META-INF/MANIFEST.MF
@@ -0,0 +1,5 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: testStale2
+Bundle-SymbolicName: testStale2;singleton:=true
+Bundle-Version: 1.0.0
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testStale2/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testStale2/plugin.xml
new file mode 100644
index 0000000..2b89706
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registry/testStale2/plugin.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension-point id="xptB2" name="Label xptB2" schema="schema/xptB2.exsd"/>
+
+ <extension point="xptB2" id="ext1">
+ <myCE name="bar"/>
+ </extension>
+
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryEvents/bundle01/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryEvents/bundle01/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e82d526
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryEvents/bundle01/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Bundle-SymbolicName: bundle01
+Bundle-Version: 1.0.0
+
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryEvents/bundle01/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryEvents/bundle01/plugin.xml
new file mode 100644
index 0000000..f609213
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryEvents/bundle01/plugin.xml
@@ -0,0 +1,3 @@
+<plugin>
+ <extension-point id="xp1" name="Extension Point 1"/>
+</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryEvents/bundle02/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryEvents/bundle02/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..45a6914
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryEvents/bundle02/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Bundle-SymbolicName: bundle02
+Bundle-Version: 1.0.0
+
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryEvents/bundle02/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryEvents/bundle02/plugin.xml
new file mode 100644
index 0000000..a06c330
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryEvents/bundle02/plugin.xml
@@ -0,0 +1,7 @@
+<plugin>
+ <extension point="bundle01.xp1" id="ext1">
+ <configElement1/>
+ <configElement2/>
+ <configElement3/>
+ </extension>
+</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundle01/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundle01/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..e2a565a
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundle01/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Bundle-SymbolicName: bundle01;singleton=true
+Bundle-Version: 1.0.0
+
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundle01/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundle01/plugin.xml
new file mode 100644
index 0000000..f609213
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundle01/plugin.xml
@@ -0,0 +1,3 @@
+<plugin>
+ <extension-point id="xp1" name="Extension Point 1"/>
+</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundle02/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundle02/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..1b3866e
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundle02/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Bundle-SymbolicName: bundle02;singleton=true
+Bundle-Version: 1.0.0
+
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundle02/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundle02/plugin.xml
new file mode 100644
index 0000000..a06c330
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundle02/plugin.xml
@@ -0,0 +1,7 @@
+<plugin>
+ <extension point="bundle01.xp1" id="ext1">
+ <configElement1/>
+ <configElement2/>
+ <configElement3/>
+ </extension>
+</plugin>
\ No newline at end of file
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundleMultiple/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundleMultiple/META-INF/MANIFEST.MF
new file mode 100644
index 0000000..fd62942
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundleMultiple/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Bundle-SymbolicName: bundleMultiple;singleton=true
+Bundle-Version: 1.0.0
+
diff --git a/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundleMultiple/plugin.xml b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundleMultiple/plugin.xml
new file mode 100644
index 0000000..f3e42ba
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/Plugin_Testing/registryListener/bundleMultiple/plugin.xml
@@ -0,0 +1,14 @@
+<plugin>
+ <extension-point id="xp1" name="Extension Point 1"/>
+ <extension-point id="xp2" name="Extension Point 2"/>
+
+ <extension point="xp1" id="ext11">
+ <configElement1/>
+ <configElement2/>
+ </extension>
+
+ <extension point="xp1" id="ext12">
+ <configElement1/>
+ <configElement2/>
+ </extension>
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/build.properties b/bundles/org.eclipse.equinox.common.tests/build.properties
index de89174..e927e6c 100644
--- a/bundles/org.eclipse.equinox.common.tests/build.properties
+++ b/bundles/org.eclipse.equinox.common.tests/build.properties
@@ -3,4 +3,5 @@
bin.includes = META-INF/,\
.,\
test.xml,\
- Plugin_Testing/
+ Plugin_Testing/,\
+ plugin.xml
diff --git a/bundles/org.eclipse.equinox.common.tests/plugin.xml b/bundles/org.eclipse.equinox.common.tests/plugin.xml
new file mode 100644
index 0000000..3a998bd
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/plugin.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.0"?>
+<plugin>
+
+ <extension
+ point="org.eclipse.core.runtime.adapters">
+ <factory
+ class="org.eclipse.equinox.common.tests.adaptable.TestAdapterFactory"
+ adaptableType="org.eclipse.equinox.common.tests.adaptable.TestAdaptable">
+ <adapter
+ type="org.eclipse.equinox.common.tests.adaptable.TestAdapter">
+ </adapter>
+ </factory>
+ </extension>
+ <extension-point id="factoryLoaderTest" name="factoryLoaderTest" schema="schema/factoryLoaderTest.exsd"/>
+ <extension point="org.eclipse.core.runtime.adapters">
+ <factory class="org.eclipse.equinox.common.tests.adaptable.TestAdapterFactoryLoader"
+ adaptableType="org.eclipse.equinox.common.tests.adaptable.TestAdaptable">
+ <adapter type="testAdapter.testUnknown"/>
+ </factory>
+ </extension>
+</plugin>
diff --git a/bundles/org.eclipse.equinox.common.tests/schema/factoryLoaderTest.exsd b/bundles/org.eclipse.equinox.common.tests/schema/factoryLoaderTest.exsd
new file mode 100644
index 0000000..8ec220c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/schema/factoryLoaderTest.exsd
@@ -0,0 +1,94 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Schema file written by PDE -->
+<schema targetNamespace="adaptorFactoryA">
+<annotation>
+ <appInfo>
+ <meta.schema plugin="adaptorFactoryA" id="factoryLoaderTest" name="factoryLoaderTest"/>
+ </appInfo>
+ <documentation>
+ [Enter description of this extension point.]
+ </documentation>
+ </annotation>
+
+ <element name="extension">
+ <complexType>
+ <sequence>
+ <element ref="AdapterClass"/>
+ </sequence>
+ <attribute name="point" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="id" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ <attribute name="name" type="string">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ <appInfo>
+ <meta.attribute translatable="true"/>
+ </appInfo>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <element name="AdapterClass">
+ <complexType>
+ <attribute name="name" type="string" use="required">
+ <annotation>
+ <documentation>
+
+ </documentation>
+ </annotation>
+ </attribute>
+ </complexType>
+ </element>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="since"/>
+ </appInfo>
+ <documentation>
+ [Enter the first release in which this extension point appears.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="examples"/>
+ </appInfo>
+ <documentation>
+ [Enter extension point usage example here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="apiInfo"/>
+ </appInfo>
+ <documentation>
+ [Enter API information here.]
+ </documentation>
+ </annotation>
+
+ <annotation>
+ <appInfo>
+ <meta.section type="implementation"/>
+ </appInfo>
+ <documentation>
+ [Enter information about supplied implementation of this extension point.]
+ </documentation>
+ </annotation>
+
+
+</schema>
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/AllTests.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/AllTests.java
index 3f9c9d1..9e7b920 100644
--- a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/AllTests.java
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/AllTests.java
@@ -13,12 +13,20 @@
*******************************************************************************/
package org.eclipse.equinox.common.tests;
+import org.eclipse.equinox.common.tests.adaptable.AdaptableTests;
+import org.eclipse.equinox.common.tests.registry.RegistryTests;
+import org.eclipse.equinox.common.tests.registry.simple.SimpleRegistryTests;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
import org.junit.runners.Suite.SuiteClasses;
@RunWith(Suite.class)
-@SuiteClasses(RuntimeTests.class)
+@SuiteClasses({
+ RuntimeTests.class,
+ AdaptableTests.class,
+ RegistryTests.class,
+ SimpleRegistryTests.class
+})
public class AllTests {
// intentionally left blank
}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/AdaptableTests.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/AdaptableTests.java
new file mode 100644
index 0000000..92d59d9
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/AdaptableTests.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Julian Honnen
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Julian Honnen - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.adaptable;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+ AdapterManagerDynamicTest.class,
+ IAdapterManagerServiceTest.class,
+ IAdapterManagerTest.class
+})
+public class AdaptableTests {
+ // intentionally left blank
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/AdapterManagerDynamicTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/AdapterManagerDynamicTest.java
new file mode 100644
index 0000000..2a24ba4
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/AdapterManagerDynamicTest.java
@@ -0,0 +1,138 @@
+/*******************************************************************************
+ * Copyright (c) 2008, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.adaptable;
+
+import java.io.IOException;
+import junit.framework.TestCase;
+
+import org.eclipse.core.internal.runtime.AdapterManager;
+import org.eclipse.core.runtime.IAdapterManager;
+import org.eclipse.core.tests.harness.BundleTestingHelper;
+import org.eclipse.equinox.common.tests.registry.WaitingRegistryListener;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.FrameworkUtil;
+
+/**
+ * Tests reaction of AdapterManager on addition and removal of adapters from
+ * the extension registry.
+ */
+public class AdapterManagerDynamicTest extends TestCase {
+
+ final private static int MAX_TIME_PER_BUNDLE = 10000; // maximum time to wait for bundle event in milliseconds
+
+ // Provided by bundle1; has an extension ID
+ private static final String BUNDLE1_TYPE_ID = "abc.SomethingElseA1";
+ // Provided by bundle1; has no extension ID
+ private static final String BUNDLE1_TYPE_NO_ID = "abc.SomethingElseA2";
+
+ // Provided by bundle2; has an extension ID
+ private static final String BUNDLE2_TYPE_ID = "abc.SomethingElseB1";
+ // Provided by bundle2; has no extension ID
+ private static final String BUNDLE2_TYPE_NO_ID = "abc.SomethingElseB2";
+
+ private IAdapterManager manager;
+
+ public AdapterManagerDynamicTest(String name) {
+ super(name);
+ }
+
+ public AdapterManagerDynamicTest() {
+ super("");
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ manager = AdapterManager.getDefault();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ manager = null;
+ super.tearDown();
+ }
+
+ /**
+ * This test uses waiting listener for synchronization (events from bundle being
+ * installed or un-installed are not propagated right away).
+ */
+ public void testDynamicBundles() throws IOException, BundleException {
+
+ // check that adapters not available
+ TestAdaptable adaptable = new TestAdaptable();
+ assertFalse(manager.hasAdapter(adaptable, BUNDLE1_TYPE_ID));
+ assertFalse(manager.hasAdapter(adaptable, BUNDLE1_TYPE_NO_ID));
+ assertFalse(manager.hasAdapter(adaptable, BUNDLE2_TYPE_ID));
+ assertFalse(manager.hasAdapter(adaptable, BUNDLE2_TYPE_NO_ID));
+
+ Bundle bundle01 = null;
+ Bundle bundle02 = null;
+ WaitingRegistryListener listener = new WaitingRegistryListener();
+ listener.register("org.eclipse.core.runtime.adapters");
+ try {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ bundle01 = BundleTestingHelper.installBundle("0.1", bundleContext, "Plugin_Testing/adapters/dynamic/A");
+ bundle02 = BundleTestingHelper.installBundle("0.2", bundleContext, "Plugin_Testing/adapters/dynamic/B");
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundle01, bundle02});
+
+ // synchronization: listener should receive 2 groups of events
+ assertTrue(listener.waitFor(2, 2 * MAX_TIME_PER_BUNDLE) == 2);
+
+ // now has to have all 4 adapters
+ assertTrue(manager.hasAdapter(adaptable, BUNDLE1_TYPE_ID));
+ assertTrue(manager.hasAdapter(adaptable, BUNDLE1_TYPE_NO_ID));
+ assertTrue(manager.hasAdapter(adaptable, BUNDLE2_TYPE_ID));
+ assertTrue(manager.hasAdapter(adaptable, BUNDLE2_TYPE_NO_ID));
+
+ listener.reset();
+ bundle02.uninstall();
+ bundle02 = null;
+
+ // synchronization: listener should receive 1 group of events
+ assertTrue(listener.waitFor(1, MAX_TIME_PER_BUNDLE) == 1);
+
+ // now 2 installed; 2 not
+ assertTrue(manager.hasAdapter(adaptable, BUNDLE1_TYPE_ID));
+ assertTrue(manager.hasAdapter(adaptable, BUNDLE1_TYPE_NO_ID));
+ assertFalse(manager.hasAdapter(adaptable, BUNDLE2_TYPE_ID));
+ assertFalse(manager.hasAdapter(adaptable, BUNDLE2_TYPE_NO_ID));
+
+ listener.reset();
+ bundle01.uninstall();
+ bundle01 = null;
+
+ // synchronization: listener should receive 1 group of events
+ assertTrue(listener.waitFor(1, MAX_TIME_PER_BUNDLE) == 1);
+
+ // and all should be uninstalled again
+ assertFalse(manager.hasAdapter(adaptable, BUNDLE1_TYPE_ID));
+ assertFalse(manager.hasAdapter(adaptable, BUNDLE1_TYPE_NO_ID));
+ assertFalse(manager.hasAdapter(adaptable, BUNDLE2_TYPE_ID));
+ assertFalse(manager.hasAdapter(adaptable, BUNDLE2_TYPE_NO_ID));
+
+ } finally {
+ listener.unregister();
+ // in case of exception in the process
+ if (bundle01 != null) {
+ bundle01.uninstall();
+ }
+ if (bundle02 != null) {
+ bundle02.uninstall();
+ }
+ }
+ }
+
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/IAdapterManagerServiceTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/IAdapterManagerServiceTest.java
new file mode 100644
index 0000000..950330a
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/IAdapterManagerServiceTest.java
@@ -0,0 +1,195 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ * Alexander Kurtakov <akurtako@redhat.com> - bug 458490
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.adaptable;
+
+import junit.framework.TestCase;
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.eclipse.core.runtime.IAdapterManager;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * Tests API on the IAdapterManager class accessed via an OSGi service.
+ *
+ * This class is a copy of IAdapterManagerTest modified to use an OSGi service
+ * instead of the Platform API.
+ */
+public class IAdapterManagerServiceTest extends TestCase {
+ private static final String NON_EXISTING = "com.does.not.Exist";
+ private static final String TEST_ADAPTER = "org.eclipse.equinox.common.tests.adaptable.TestAdapter";
+
+ private ServiceTracker<IAdapterManager, IAdapterManager> adapterManagerTracker;
+
+ public IAdapterManagerServiceTest(String name) {
+ super(name);
+ }
+
+ public IAdapterManagerServiceTest() {
+ super("");
+ }
+
+ /*
+ * Return the framework log service, if available.
+ */
+ public IAdapterManager getAdapterManager() {
+ if (adapterManagerTracker == null) {
+ BundleContext context = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ adapterManagerTracker = new ServiceTracker<>(context, IAdapterManager.class, null);
+ adapterManagerTracker.open();
+ }
+ return adapterManagerTracker.getService();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ if (adapterManagerTracker != null) {
+ adapterManagerTracker.close();
+ adapterManagerTracker = null;
+ }
+ super.tearDown();
+ }
+
+ /**
+ * Tests API method IAdapterManager.hasAdapter.
+ */
+ public void testHasAdapter() {
+ IAdapterManager manager = getAdapterManager();
+
+ TestAdaptable adaptable = new TestAdaptable();
+ //request non-existing adaptable
+ assertTrue("1.0", !manager.hasAdapter("", NON_EXISTING));
+
+ //request adapter that is in XML but has no registered factory
+ assertTrue("1.1", manager.hasAdapter(adaptable, TEST_ADAPTER));
+
+ //request adapter that is not in XML
+ assertTrue("1.2", !manager.hasAdapter(adaptable, "java.lang.String"));
+
+ //register an adapter factory that maps adaptables to strings
+ IAdapterFactory fac = new IAdapterFactory() {
+ @Override
+ public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+ if (adapterType == String.class) {
+ return adapterType.cast(adaptableObject.toString());
+ }
+ return null;
+ }
+
+ @Override
+ public Class<?>[] getAdapterList() {
+ return new Class[] {String.class};
+ }
+ };
+ manager.registerAdapters(fac, TestAdaptable.class);
+ try {
+ //request adapter for factory that we've just added
+ assertTrue("1.3", manager.hasAdapter(adaptable, "java.lang.String"));
+ } finally {
+ manager.unregisterAdapters(fac, TestAdaptable.class);
+ }
+
+ //request adapter that was unloaded
+ assertTrue("1.4", !manager.hasAdapter(adaptable, "java.lang.String"));
+ }
+
+ /**
+ * Tests API method IAdapterManager.getAdapter.
+ */
+ public void testGetAdapter() {
+ IAdapterManager manager = getAdapterManager();
+
+ TestAdaptable adaptable = new TestAdaptable();
+ //request non-existing adaptable
+ assertNull("1.0", manager.getAdapter("", NON_EXISTING));
+
+ //request adapter that is in XML but has no registered factory
+ Object result = manager.getAdapter(adaptable, TEST_ADAPTER);
+ assertTrue("1.1", result instanceof TestAdapter);
+
+ //request adapter that is not in XML
+ assertNull("1.2", manager.getAdapter(adaptable, "java.lang.String"));
+
+ //register an adapter factory that maps adaptables to strings
+ IAdapterFactory fac = new IAdapterFactory() {
+ @Override
+ public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+ if (adapterType == String.class) {
+ return adapterType.cast(adaptableObject.toString());
+ }
+ return null;
+ }
+
+ @Override
+ public Class<?>[] getAdapterList() {
+ return new Class[] {String.class};
+ }
+ };
+ manager.registerAdapters(fac, TestAdaptable.class);
+ try {
+ //request adapter for factory that we've just added
+ result = manager.getAdapter(adaptable, "java.lang.String");
+ assertTrue("1.3", result instanceof String);
+ } finally {
+ manager.unregisterAdapters(fac, TestAdaptable.class);
+ }
+ //request adapter that was unloaded
+ assertNull("1.4", manager.getAdapter(adaptable, "java.lang.String"));
+ }
+
+ /**
+ * Tests API method IAdapterManager.loadAdapter.
+ */
+ public void testLoadAdapter() {
+ IAdapterManager manager = getAdapterManager();
+
+ TestAdaptable adaptable = new TestAdaptable();
+ //request non-existing adaptable
+ assertNull("1.0", manager.loadAdapter("", NON_EXISTING));
+
+ //request adapter that is in XML but has no registered factory
+ Object result = manager.loadAdapter(adaptable, TEST_ADAPTER);
+ assertTrue("1.1", result instanceof TestAdapter);
+
+ //request adapter that is not in XML
+ assertNull("1.2", manager.loadAdapter(adaptable, "java.lang.String"));
+
+ //register an adapter factory that maps adaptables to strings
+ IAdapterFactory fac = new IAdapterFactory() {
+ @Override
+ public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+ if (adapterType == String.class) {
+ return adapterType.cast(adaptableObject.toString());
+ }
+ return null;
+ }
+
+ @Override
+ public Class<?>[] getAdapterList() {
+ return new Class[] {String.class};
+ }
+ };
+ manager.registerAdapters(fac, TestAdaptable.class);
+ try {
+ //request adapter for factory that we've just added
+ result = manager.loadAdapter(adaptable, "java.lang.String");
+ assertTrue("1.3", result instanceof String);
+ } finally {
+ manager.unregisterAdapters(fac, TestAdaptable.class);
+ }
+ //request adapter that was unloaded
+ assertNull("1.4", manager.loadAdapter(adaptable, "java.lang.String"));
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/IAdapterManagerTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/IAdapterManagerTest.java
new file mode 100644
index 0000000..07697e2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/IAdapterManagerTest.java
@@ -0,0 +1,294 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.adaptable;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import junit.framework.TestCase;
+
+import org.eclipse.core.internal.runtime.AdapterManager;
+import org.eclipse.core.runtime.*;
+import org.eclipse.core.tests.harness.BundleTestingHelper;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.FrameworkUtil;
+
+/**
+ * Tests API on the IAdapterManager class.
+ */
+public class IAdapterManagerTest extends TestCase {
+ //following classes are for testComputeClassOrder
+ static interface C {
+ }
+
+ static interface D {
+ }
+
+ static interface M {
+ }
+
+ static interface N {
+ }
+
+ static interface O {
+ }
+
+ interface A extends M, N {
+ }
+
+ interface B extends O {
+ }
+
+ class Y implements C, D {
+ }
+
+ class X extends Y implements A, B {
+ }
+
+ private static final String NON_EXISTING = "com.does.not.Exist";
+ private static final String TEST_ADAPTER = "org.eclipse.equinox.common.tests.adaptable.TestAdapter";
+ private static final String TEST_ADAPTER_CL = "testAdapter.testUnknown";
+ private IAdapterManager manager;
+
+ public IAdapterManagerTest(String name) {
+ super(name);
+ }
+
+ public IAdapterManagerTest() {
+ super("");
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ manager = AdapterManager.getDefault();
+ }
+
+ /**
+ * Tests API method IAdapterManager.hasAdapter.
+ */
+ public void testHasAdapter() {
+ TestAdaptable adaptable = new TestAdaptable();
+ //request non-existing adaptable
+ assertTrue("1.0", !manager.hasAdapter("", NON_EXISTING));
+
+ //request adapter that is in XML but has no registered factory
+ assertTrue("1.1", manager.hasAdapter(adaptable, TEST_ADAPTER));
+
+ //request adapter that is not in XML
+ assertTrue("1.2", !manager.hasAdapter(adaptable, "java.lang.String"));
+
+ //register an adapter factory that maps adaptables to strings
+ IAdapterFactory fac = new IAdapterFactory() {
+ @Override
+ public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+ if (adapterType == String.class) {
+ return adapterType.cast(adaptableObject.toString());
+ }
+ return null;
+ }
+
+ @Override
+ public Class<?>[] getAdapterList() {
+ return new Class[] {String.class};
+ }
+ };
+ manager.registerAdapters(fac, TestAdaptable.class);
+ try {
+ //request adapter for factory that we've just added
+ assertTrue("1.3", manager.hasAdapter(adaptable, "java.lang.String"));
+ } finally {
+ manager.unregisterAdapters(fac, TestAdaptable.class);
+ }
+
+ //request adapter that was unloaded
+ assertTrue("1.4", !manager.hasAdapter(adaptable, "java.lang.String"));
+ }
+
+ /**
+ * Tests API method IAdapterManager.getAdapter.
+ */
+ public void testGetAdapter() {
+ TestAdaptable adaptable = new TestAdaptable();
+ //request non-existing adaptable
+ assertNull("1.0", manager.getAdapter("", NON_EXISTING));
+
+ //request adapter that is in XML but has no registered factory
+ Object result = manager.getAdapter(adaptable, TEST_ADAPTER);
+ assertTrue("1.1", result instanceof TestAdapter);
+
+ //request adapter that is not in XML
+ assertNull("1.2", manager.getAdapter(adaptable, "java.lang.String"));
+
+ //register an adapter factory that maps adaptables to strings
+ IAdapterFactory fac = new IAdapterFactory() {
+ @Override
+ public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+ if (adapterType == String.class) {
+ return adapterType.cast(adaptableObject.toString());
+ }
+ return null;
+ }
+
+ @Override
+ public Class<?>[] getAdapterList() {
+ return new Class[] {String.class};
+ }
+ };
+ manager.registerAdapters(fac, TestAdaptable.class);
+ try {
+ //request adapter for factory that we've just added
+ result = manager.getAdapter(adaptable, "java.lang.String");
+ assertTrue("1.3", result instanceof String);
+ } finally {
+ manager.unregisterAdapters(fac, TestAdaptable.class);
+ }
+ //request adapter that was unloaded
+ assertNull("1.4", manager.getAdapter(adaptable, "java.lang.String"));
+ }
+
+ public void testGetAdapterNullArgs() {
+ TestAdaptable adaptable = new TestAdaptable();
+ try {
+ manager.getAdapter(adaptable, (Class<?>) null);
+ fail("1.0");
+ } catch (RuntimeException e) {
+ //expected
+ }
+ try {
+ manager.getAdapter(null, NON_EXISTING);
+ fail("1.0");
+ } catch (RuntimeException e) {
+ //expected
+ }
+
+ }
+
+ /**
+ * Tests API method IAdapterManager.loadAdapter.
+ */
+ public void testLoadAdapter() {
+ TestAdaptable adaptable = new TestAdaptable();
+ //request non-existing adaptable
+ assertNull("1.0", manager.loadAdapter("", NON_EXISTING));
+
+ //request adapter that is in XML but has no registered factory
+ Object result = manager.loadAdapter(adaptable, TEST_ADAPTER);
+ assertTrue("1.1", result instanceof TestAdapter);
+
+ //request adapter that is not in XML
+ assertNull("1.2", manager.loadAdapter(adaptable, "java.lang.String"));
+
+ //register an adapter factory that maps adaptables to strings
+ IAdapterFactory fac = new IAdapterFactory() {
+ @Override
+ public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+ if (adapterType == String.class) {
+ return adapterType.cast(adaptableObject.toString());
+ }
+ return null;
+ }
+
+ @Override
+ public Class<?>[] getAdapterList() {
+ return new Class[] {String.class};
+ }
+ };
+ manager.registerAdapters(fac, TestAdaptable.class);
+ try {
+ //request adapter for factory that we've just added
+ result = manager.loadAdapter(adaptable, "java.lang.String");
+ assertTrue("1.3", result instanceof String);
+ } finally {
+ manager.unregisterAdapters(fac, TestAdaptable.class);
+ }
+ //request adapter that was unloaded
+ assertNull("1.4", manager.loadAdapter(adaptable, "java.lang.String"));
+ }
+
+ /**
+ * Test adapting to classes not reachable by the default bundle class loader
+ * (bug 200068).
+ * NOTE: This test uses .class file compiled with 1.4 JRE. As a result,
+ * the test can not be run on pre-1.4 JRE.
+ */
+ public void testAdapterClassLoader() throws MalformedURLException, BundleException, IOException {
+ TestAdaptable adaptable = new TestAdaptable();
+ assertTrue(manager.hasAdapter(adaptable, TEST_ADAPTER_CL));
+ assertNull(manager.loadAdapter(adaptable, TEST_ADAPTER_CL));
+ Bundle bundle = null;
+ try {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ bundle = BundleTestingHelper.installBundle("0.1", bundleContext, "Plugin_Testing/adapters/testAdapter_1.0.0");
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundle});
+
+ assertTrue(manager.hasAdapter(adaptable, TEST_ADAPTER_CL));
+ Object result = manager.loadAdapter(adaptable, TEST_ADAPTER_CL);
+ assertNotNull(result);
+ assertTrue(TEST_ADAPTER_CL.equals(result.getClass().getName()));
+ } finally {
+ if (bundle != null) {
+ bundle.uninstall();
+ }
+ }
+ }
+
+ /**
+ * Tests for {@link IAdapterManager#computeClassOrder(Class)}.
+ */
+ public void testComputeClassOrder() {
+ Class<?>[] expected = new Class[] { X.class, Y.class, Object.class, A.class, B.class, M.class, N.class, O.class,
+ C.class, D.class };
+ Class<?>[] actual = manager.computeClassOrder(X.class);
+ assertEquals("1.0", expected.length, actual.length);
+ for (int i = 0; i < actual.length; i++) {
+ assertEquals("1.1." + i, expected[i], actual[i]);
+ }
+ }
+
+ public void testFactoryViolatingContract() {
+ class Private {
+ }
+
+ IAdapterFactory fac = new IAdapterFactory() {
+ @SuppressWarnings("unchecked")
+ @Override
+ public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+ if (adapterType == Private.class) {
+ // Cast below violates the contract of the factory
+ return (T) Boolean.FALSE;
+ }
+ return null;
+ }
+
+ @Override
+ public Class<?>[] getAdapterList() {
+ return new Class[] { Private.class };
+ }
+ };
+ try {
+ manager.registerAdapters(fac, Private.class);
+ try {
+ manager.getAdapter(new Private(), Private.class);
+ fail("Should throw AssertionFailedException!");
+ } catch (AssertionFailedException e) {
+ assertTrue(e.getMessage().contains(fac.getClass().getName()));
+ assertTrue(e.getMessage().contains(Boolean.class.getName()));
+ assertTrue(e.getMessage().contains(Private.class.getName()));
+ }
+ } finally {
+ manager.unregisterAdapters(fac, Private.class);
+ }
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/TestAdaptable.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/TestAdaptable.java
new file mode 100644
index 0000000..0ee28d6
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/TestAdaptable.java
@@ -0,0 +1,22 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2012 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.adaptable;
+
+import org.eclipse.core.runtime.PlatformObject;
+
+/**
+ * Used by IAdapterManagerTest
+ */
+public class TestAdaptable extends PlatformObject {
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/TestAdapter.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/TestAdapter.java
new file mode 100644
index 0000000..9fff0eb
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/TestAdapter.java
@@ -0,0 +1,20 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2012 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.adaptable;
+
+/**
+ * Used by IAdapterManagerTest
+ */
+public class TestAdapter {
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/TestAdapterFactory.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/TestAdapterFactory.java
new file mode 100644
index 0000000..8c32f97
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/TestAdapterFactory.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.adaptable;
+
+import org.eclipse.core.runtime.IAdapterFactory;
+import org.junit.Assert;
+
+/**
+ */
+public class TestAdapterFactory extends Assert implements IAdapterFactory {
+ @Override
+ public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+ assertTrue("Request for wrong adapter", adaptableObject instanceof TestAdaptable);
+ return adapterType.cast(new TestAdapter());
+ }
+
+ @Override
+ public Class<?>[] getAdapterList() {
+ return new Class[] {TestAdapter.class};
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/TestAdapterFactoryLoader.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/TestAdapterFactoryLoader.java
new file mode 100644
index 0000000..ffe78ce
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/adaptable/TestAdapterFactoryLoader.java
@@ -0,0 +1,65 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.adaptable;
+
+import java.lang.reflect.InvocationTargetException;
+import org.eclipse.core.runtime.*;
+import org.junit.Assert;
+import org.osgi.framework.Bundle;
+
+/**
+ * The adaptor factory to test scenario described in the bug 200068: adapting to
+ * a class not reachable be the default class loader.
+ *
+ * This is a test code so almost all sanity checks are omitted (it is working on a known
+ * hard-coded set of extensions and extension points). Also, for simplicity no trackers
+ * or caching is done.
+ */
+public class TestAdapterFactoryLoader extends Assert implements IAdapterFactory {
+
+ @Override
+ public <T> T getAdapter(Object adaptableObject, Class<T> adapterType) {
+ try {
+ Class<?>[] targets = getAdapterList();
+ return adapterType.cast(targets[0].getDeclaredConstructor().newInstance());
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException | InvocationTargetException
+ | NoSuchMethodException | SecurityException e) {
+ e.printStackTrace();
+ fail("Unable to load target class");
+ return null;
+ }
+ }
+
+ @Override
+ public Class<?>[] getAdapterList() {
+ IExtensionRegistry registry = RegistryFactory.getRegistry();
+ IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.equinox.common.tests.factoryLoaderTest");
+ IExtension[] extensions = extPoint.getExtensions();
+ if (extensions.length == 0) {
+ return new Class[0];
+ }
+ IExtension extension = extensions[0];
+ IConfigurationElement[] confElements = extension.getConfigurationElements();
+ String className = confElements[0].getAttribute("name");
+ IContributor contributor = extension.getContributor();
+ Bundle extensionBundle = ContributorFactoryOSGi.resolve(contributor);
+ try {
+ return new Class[] {extensionBundle.loadClass(className)};
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ fail("Unable to load class " + className);
+ return null;
+ }
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/ContributorsTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/ContributorsTest.java
new file mode 100644
index 0000000..8b80592
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/ContributorsTest.java
@@ -0,0 +1,178 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URL;
+import junit.framework.TestCase;
+import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.spi.IDynamicExtensionRegistry;
+import org.eclipse.core.tests.harness.BundleTestingHelper;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.FrameworkUtil;
+
+/**
+ * Tests contributor resolution for Bundle-based contributors.
+ *
+ * @since 3.3
+ */
+public class ContributorsTest extends TestCase {
+
+ public ContributorsTest() {
+ super();
+ }
+
+ public ContributorsTest(String name) {
+ super(name);
+ }
+
+ public void testResolution() throws IOException, BundleException {
+ Bundle bundle = null;
+ Bundle fragment = null;
+ try {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ bundle = BundleTestingHelper.installBundle("0.1", bundleContext, "Plugin_Testing/registry/contributors/A");
+ fragment = BundleTestingHelper.installBundle("0.2", bundleContext, "Plugin_Testing/registry/contributors/B");
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundle, fragment});
+
+ IExtensionRegistry registry = RegistryFactory.getRegistry();
+ IExtensionPoint bundleExtPoint = registry.getExtensionPoint("testContributors.xptContibutorsA");
+ IContributor bundleContributor = bundleExtPoint.getContributor();
+ Bundle contributingBundle = ContributorFactoryOSGi.resolve(bundleContributor);
+ assertNotNull(contributingBundle);
+ assertTrue(contributingBundle.equals(bundle));
+
+ IExtensionPoint fragmentExtPoint = registry.getExtensionPoint("testContributors.contrFragment");
+ IContributor fragmentContributor = fragmentExtPoint.getContributor();
+ Bundle contributingFragment = ContributorFactoryOSGi.resolve(fragmentContributor);
+ assertNotNull(contributingFragment);
+ assertTrue(contributingFragment.equals(fragment));
+ } finally {
+ if (bundle != null) {
+ bundle.uninstall();
+ }
+ if (fragment != null) {
+ fragment.uninstall();
+ }
+ }
+ }
+
+ /**
+ * bundleA, bundleB, and fragment on bundleA all use the same namespace. Verify that getting
+ * elements by contributor returns all elements from the contributor and only from that
+ * contributor.
+ *
+ * @throws IOException
+ * @throws BundleException
+ */
+ public void testByContributor() throws IOException, BundleException {
+ Bundle bundleA = null;
+ Bundle bundleB = null;
+ Bundle fragment = null;
+ try {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ bundleA = BundleTestingHelper.installBundle("0.1", bundleContext, "Plugin_Testing/registry/elementsByContributor/A");
+ bundleB = BundleTestingHelper.installBundle("0.2", bundleContext, "Plugin_Testing/registry/elementsByContributor/B");
+ fragment = BundleTestingHelper.installBundle("0.2", bundleContext, "Plugin_Testing/registry/elementsByContributor/Afragment");
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundleA, bundleB, fragment});
+
+ IExtensionRegistry registry = RegistryFactory.getRegistry();
+
+ // verify bundleA (bundle B is the same - will work if this works)
+ IContributor contributorA = ContributorFactoryOSGi.createContributor(bundleA);
+
+ IExtensionPoint[] extPointsA = registry.getExtensionPoints(contributorA);
+ assertNotNull(extPointsA);
+ assertTrue(extPointsA.length == 1);
+ assertTrue(extPointsA[0].getUniqueIdentifier().equals("org.eclipse.test.registryByContrib.PointA"));
+
+ IExtension[] extsA = registry.getExtensions(contributorA);
+ assertNotNull(extsA);
+ assertTrue(extsA.length == 1);
+ assertTrue(extsA[0].getUniqueIdentifier().equals("org.eclipse.test.registryByContrib.ExtensionA"));
+
+ // verify fragment
+ IContributor contributorAF = ContributorFactoryOSGi.createContributor(fragment);
+ IExtensionPoint[] extPointsFragmentA = registry.getExtensionPoints(contributorAF);
+ assertNotNull(extPointsFragmentA);
+ assertTrue(extPointsFragmentA.length == 1);
+ assertTrue(extPointsFragmentA[0].getUniqueIdentifier().equals("org.eclipse.test.registryByContrib.PointFA"));
+
+ IExtension[] extsFragmentA = registry.getExtensions(contributorAF);
+ assertNotNull(extsFragmentA);
+ assertTrue(extsFragmentA.length == 1);
+ assertTrue(extsFragmentA[0].getUniqueIdentifier().equals("org.eclipse.test.registryByContrib.ExtensionFA"));
+
+ } finally {
+ if (bundleA != null) {
+ bundleA.uninstall();
+ }
+ if (bundleB != null) {
+ bundleB.uninstall();
+ }
+ if (fragment != null) {
+ fragment.uninstall();
+ }
+ }
+ }
+
+ /**
+ * Checks {@link IDynamicExtensionRegistry#removeContributor(IContributor, Object)}. A separate
+ * registry is created as removal functionality is not allowed by the default Eclipse registry.
+ *
+ * @throws IOException
+ * @throws BundleException
+ */
+ public void testContributorRemoval() throws IOException {
+ Object masterKey = new Object();
+ IExtensionRegistry registry = RegistryFactory.createRegistry(null, masterKey, null);
+
+ assertTrue(addContribution(registry, "A"));
+ assertTrue(addContribution(registry, "B"));
+
+ assertNotNull(registry.getExtensionPoint("org.eclipse.test.registryByContrib.PointA"));
+ assertNotNull(registry.getExtensionPoint("org.eclipse.test.registryByContrib.PointB"));
+
+ IContributor[] contributors = ((IDynamicExtensionRegistry) registry).getAllContributors();
+ assertNotNull(contributors);
+ assertTrue(contributors.length == 2);
+ IContributor contributorB = null;
+ for (IContributor contributor : contributors) {
+ if ("B".equals(contributor.getName())) {
+ contributorB = contributor;
+ break;
+ }
+ }
+ assertNotNull(contributorB);
+
+ ((IDynamicExtensionRegistry) registry).removeContributor(contributorB, masterKey);
+
+ assertNotNull(registry.getExtensionPoint("org.eclipse.test.registryByContrib.PointA"));
+ assertNull(registry.getExtensionPoint("org.eclipse.test.registryByContrib.PointB"));
+ }
+
+ private boolean addContribution(IExtensionRegistry registry, String fileName) throws IOException {
+ String fullPath = "Plugin_Testing/registry/elementsByContributor/" + fileName + "/plugin.xml";
+ URL urlA = FrameworkUtil.getBundle(getClass()).getEntry(fullPath);
+ if (urlA == null) {
+ throw new IOException("No entry to '"+fullPath+"' could be found or caller does not have the appropriate permissions.");//$NON-NLS-1$ //$NON-NLS-2$
+ }
+ InputStream is = urlA.openStream();
+ IContributor nonBundleContributor = ContributorFactorySimple.createContributor(fileName);
+ return registry.addContribution(is, nonBundleContributor, false, urlA.getFile(), null, null);
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/ExtensionRegistryDynamicTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/ExtensionRegistryDynamicTest.java
new file mode 100644
index 0000000..b500bba
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/ExtensionRegistryDynamicTest.java
@@ -0,0 +1,157 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry;
+
+import java.io.IOException;
+import junit.framework.TestCase;
+import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.dynamichelpers.*;
+import org.eclipse.core.tests.harness.BundleTestingHelper;
+import org.eclipse.core.tests.harness.TestRegistryChangeListener;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.FrameworkUtil;
+
+public class ExtensionRegistryDynamicTest extends TestCase {
+
+ public ExtensionRegistryDynamicTest() {
+ super();
+ }
+
+ public ExtensionRegistryDynamicTest(String name) {
+ super(name);
+ }
+
+ public void testAddition() throws IOException, BundleException {
+ Bundle bundle01 = null;
+ Bundle bundle02 = null;
+ TestRegistryChangeListener listener = new TestRegistryChangeListener("bundle01", "xp1", "bundle02", "ext1");
+ listener.register();
+ try {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ bundle01 = BundleTestingHelper.installBundle("0.1", bundleContext, "Plugin_Testing/registryEvents/bundle01");
+ bundle02 = BundleTestingHelper.installBundle("0.2", bundleContext, "Plugin_Testing/registryEvents/bundle02");
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundle01, bundle02});
+ IExtensionRegistry registry = RegistryFactory.getRegistry();
+ IExtensionPoint extPoint = registry.getExtensionPoint("bundle01.xp1");
+ IExtension[] extensions = extPoint.getExtensions();
+ assertEquals("0.9", extensions.length, 1);
+
+ assertEquals("1.2", IExtensionDelta.ADDED, listener.eventTypeReceived(20000));
+ } finally {
+ listener.unregister();
+ if (bundle01 != null) {
+ bundle01.uninstall();
+ }
+ if (bundle02 != null) {
+ bundle02.uninstall();
+ }
+ }
+ }
+
+ /**
+ * @see bug 65783
+ */
+ public void testReresolving() throws IOException, BundleException {
+ Bundle bundle01 = null;
+ Bundle bundle02 = null;
+ TestRegistryChangeListener listener = new TestRegistryChangeListener("bundle01", "xp1", "bundle02", "ext1");
+ listener.register();
+ try {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ bundle01 = BundleTestingHelper.installBundle("0.1", bundleContext, "Plugin_Testing/registryEvents/bundle01");
+ bundle02 = BundleTestingHelper.installBundle("0.2", bundleContext, "Plugin_Testing/registryEvents/bundle02");
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundle01, bundle02});
+ assertEquals("0.5", IExtensionDelta.ADDED, listener.eventTypeReceived(20000));
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundle02});
+ assertEquals("1.2", IExtensionDelta.REMOVED, listener.eventTypeReceived(10000));
+ assertEquals("2.2", IExtensionDelta.ADDED, listener.eventTypeReceived(10000));
+ } finally {
+ listener.unregister();
+ if (bundle01 != null) {
+ bundle01.uninstall();
+ }
+ if (bundle02 != null) {
+ bundle02.uninstall();
+ }
+ }
+ }
+
+ boolean additionCalled = false;
+ boolean removalCalled = false;
+
+ /**
+ * @see bug 178028
+ */
+ public void testEventTracker() throws IOException, BundleException {
+ Bundle bundle01 = null;
+ Bundle bundle02 = null;
+ TestRegistryChangeListener listener = new TestRegistryChangeListener("bundle01", "xp1", "bundle02", "ext1");
+ listener.register();
+ TestRegistryChangeListener lastListener = null;
+ try {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ bundle01 = BundleTestingHelper.installBundle("0.1", bundleContext, "Plugin_Testing/registryEvents/bundle01");
+ bundle02 = BundleTestingHelper.installBundle("0.2", bundleContext, "Plugin_Testing/registryEvents/bundle02");
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundle01, bundle02});
+ assertEquals("0.5", IExtensionDelta.ADDED, listener.eventTypeReceived(20000));
+
+ ExtensionTracker tracker = new ExtensionTracker();
+ IExtensionRegistry registry = RegistryFactory.getRegistry();
+ IExtensionPoint extPoint = registry.getExtensionPoint("bundle01.xp1");
+
+ // reset state variables
+ additionCalled = false;
+ removalCalled = false;
+
+ tracker.registerHandler(new IExtensionChangeHandler() {
+
+ @Override
+ public void addExtension(IExtensionTracker currentTracker, IExtension extension) {
+ additionCalled = true;
+ }
+
+ @Override
+ public void removeExtension(IExtension extension, Object[] objects) {
+ removalCalled = true;
+ }
+ }, ExtensionTracker.createExtensionPointFilter(extPoint));
+
+ lastListener = new TestRegistryChangeListener("bundle01", "xp1", "bundle02", "ext1");
+ // this relies on implementation details: listeners are called in the order they are registered
+ lastListener.register();
+
+ bundle02.uninstall();
+ bundle02 = null;
+
+ // make sure that all listener processed by synching on the last added listener
+ assertEquals("3.0", IExtensionDelta.REMOVED, lastListener.eventTypeReceived(20000));
+
+ assertFalse(additionCalled);
+ assertTrue(removalCalled);
+ } finally {
+ listener.unregister();
+ if (lastListener != null) {
+ lastListener.unregister();
+ }
+ if (bundle01 != null) {
+ bundle01.uninstall();
+ }
+ if (bundle02 != null) {
+ bundle02.uninstall();
+ }
+ }
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/ExtensionRegistryStaticTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/ExtensionRegistryStaticTest.java
new file mode 100644
index 0000000..f6964d8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/ExtensionRegistryStaticTest.java
@@ -0,0 +1,359 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ * Alexander Kurtakov <akurtako@redhat.com> - bug 458490
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.Arrays;
+import junit.framework.*;
+import org.eclipse.core.runtime.*;
+import org.eclipse.core.tests.harness.BundleTestingHelper;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.FrameworkUtil;
+
+public class ExtensionRegistryStaticTest extends TestCase {
+
+ private BundleContext fBundleContext;
+
+ public ExtensionRegistryStaticTest(String name) {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ fBundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ }
+
+ public void testA() throws IOException, BundleException {
+ //test the addition of an extension point
+ String name = "A";
+ Bundle bundle01 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/test" + name);
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle01});
+ testExtensionPoint(name);
+ }
+
+ public void testAFromCache() {
+ //Check that it has been persisted
+ testExtensionPoint("A");
+ }
+
+ private void testExtensionPoint(String name) {
+ assertNotNull(RegistryFactory.getRegistry().getExtensionPoint("test" + name + ".xpt" + name));
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("test" + name + ".xpt" + name).getLabel(), "Label xpt" + name);
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("test" + name + ".xpt" + name).getNamespace(), "test" + name);
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("test" + name + ".xpt" + name).getNamespaceIdentifier(), "test" + name);
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("test" + name + ".xpt" + name).getContributor().getName(), "test" + name);
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("test" + name + ".xpt" + name).getSchemaReference(), "schema/xpt" + name + ".exsd");
+ }
+
+ public void testB() throws IOException, BundleException {
+ //test the addition of an extension without extension point
+ Bundle bundle01 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testB/1");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle01});
+ assertNull(RegistryFactory.getRegistry().getExtension("testB2", "xptB2", "ext1"));
+ }
+
+ public void testBFromCache() throws IOException, BundleException {
+ // Test the addition of an extension point when orphans extension exists
+ assertNull(RegistryFactory.getRegistry().getExtension("testB2", "xptB2", "ext1"));
+ Bundle bundle02 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testB/2");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle02});
+ testExtensionPoint("B2");
+
+ // Test the configuration elements
+ assertEquals(RegistryFactory.getRegistry().getExtension("testB2", "xptB2", "testB1.ext1").getConfigurationElements().length, 0);
+ assertEquals(RegistryFactory.getRegistry().getConfigurationElementsFor("testB2.xptB2").length, 0);
+
+ //Test the number of extension in the namespace
+ assertEquals(RegistryFactory.getRegistry().getExtensions("testB1").length, 1);
+
+ //Test the extension
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testB1.ext1"));
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testB2", "xptB2", "testB1.ext1"));
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testB2.xptB2", "testB1.ext1"));
+
+ assertNotNull(RegistryFactory.getRegistry().getExtensionPoint("testB2.xptB2").getExtension("testB1.ext1"));
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("testB2.xptB2").getExtensions()[0].getUniqueIdentifier(), "testB1.ext1");
+
+ //uninstall the bundle contributing the extension point
+ bundle02.uninstall();
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle02});
+
+ assertNull(RegistryFactory.getRegistry().getExtension("testB1.ext1"));
+ assertEquals(RegistryFactory.getRegistry().getExtensions("testB1").length, 0);
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoints("testB2").length, 0);
+ assertNull(RegistryFactory.getRegistry().getExtensionPoint("testB2.xptB2"));
+ }
+
+ public void testBRemoved() {
+ //Test if testB has been removed.
+ assertNull(RegistryFactory.getRegistry().getExtension("testB1.ext1"));
+ assertEquals(RegistryFactory.getRegistry().getExtensions("testB1").length, 0);
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoints("testB2").length, 0);
+ assertNull(RegistryFactory.getRegistry().getExtensionPoint("testB2.xptB2"));
+ }
+
+ public void testC() throws IOException, BundleException {
+ //test the addition of an extension point then the addition of an extension
+ Bundle bundle01 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testC/1");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle01});
+ testExtensionPoint("C1");
+ Bundle bundle02 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testC/2");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle02});
+
+ //Test the configurataion elements
+ assertEquals(RegistryFactory.getRegistry().getExtension("testC1", "xptC1", "testC2.ext1").getConfigurationElements().length, 0);
+ assertEquals(RegistryFactory.getRegistry().getConfigurationElementsFor("testC1.xptC1").length, 0);
+
+ //Test the number of extension in the namespace
+ assertEquals(RegistryFactory.getRegistry().getExtensions("testC2").length, 1);
+
+ //Test the extension
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testC2.ext1"));
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testC1", "xptC1", "testC2.ext1"));
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testC1.xptC1", "testC2.ext1"));
+
+ assertNotNull(RegistryFactory.getRegistry().getExtensionPoint("testC1.xptC1").getExtension("testC2.ext1"));
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("testC1.xptC1").getExtensions()[0].getUniqueIdentifier(), "testC2.ext1");
+ }
+
+ public void testD() throws IOException, BundleException {
+ //test the addition of an extension then the addition of an extension point
+ Bundle bundle02 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testD/2");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle02});
+ Bundle bundle01 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testD/1");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle01});
+ testExtensionPoint("D1");
+
+ //Test the configurataion elements
+ assertEquals(RegistryFactory.getRegistry().getExtension("testD1", "xptD1", "testD2.ext1").getConfigurationElements().length, 0);
+ assertEquals(RegistryFactory.getRegistry().getConfigurationElementsFor("testD1.xptD1").length, 0);
+
+ //Test the number of extension in the namespace
+ assertEquals(RegistryFactory.getRegistry().getExtensions("testD2").length, 1);
+
+ //Test the extension
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testD2.ext1"));
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testD1", "xptD1", "testD2.ext1"));
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testD1.xptD1", "testD2.ext1"));
+
+ assertNotNull(RegistryFactory.getRegistry().getExtensionPoint("testD1.xptD1").getExtension("testD2.ext1"));
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("testD1.xptD1").getExtensions()[0].getUniqueIdentifier(), "testD2.ext1");
+ }
+
+ public void testE() throws IOException, BundleException {
+ //test the addition of an extension point and then add the extension through a fragment
+ Bundle bundle01 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testE/1");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle01});
+ Bundle bundle02 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testE/2");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle02});
+ testExtensionPoint("E1");
+
+ //Test the configurataion elements
+ assertEquals(RegistryFactory.getRegistry().getExtension("testE1", "xptE1", "testE1.ext1").getConfigurationElements().length, 0);
+ assertEquals(RegistryFactory.getRegistry().getConfigurationElementsFor("testE1.xptE1").length, 0);
+
+ //Test the number of extension in the namespace
+ assertEquals(RegistryFactory.getRegistry().getExtensions("testE1").length, 1);
+
+ //Test the extension
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testE1", "xptE1", "testE1.ext1"));
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testE1.xptE1", "testE1.ext1"));
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testE1.ext1")); //This test exhibits a bug in the 3.0 implementation
+
+ assertNotNull(RegistryFactory.getRegistry().getExtensionPoint("testE1.xptE1").getExtension("testE1.ext1"));
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("testE1.xptE1").getExtensions()[0].getUniqueIdentifier(), "testE1.ext1");
+ }
+
+ public void testF() throws IOException, BundleException {
+ //test the addition of the extension through a fragment then the addition of an extension point
+ Bundle bundle02 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testF/2");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle02});
+ Bundle bundle01 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testF/1");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle01});
+ testExtensionPoint("F1");
+
+ //Test the configurataion elements
+ assertEquals(RegistryFactory.getRegistry().getExtension("testF1", "xptF1", "testF1.ext1").getConfigurationElements().length, 0);
+ assertEquals(RegistryFactory.getRegistry().getConfigurationElementsFor("testF1.xptE1").length, 0);
+
+ //Test the number of extension in the namespace
+ assertEquals(RegistryFactory.getRegistry().getExtensions("testF1").length, 1);
+
+ //Test the extension
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testF1", "xptF1", "testF1.ext1"));
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testF1.xptF1", "testF1.ext1"));
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testF1.ext1")); //This test exhibits a bug in the 3.0 implementation
+
+ assertNotNull(RegistryFactory.getRegistry().getExtensionPoint("testF1.xptF1").getExtension("testF1.ext1"));
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("testF1.xptF1").getExtensions()[0].getUniqueIdentifier(), "testF1.ext1");
+
+ //Test the namespace
+ assertEquals(Arrays.asList(RegistryFactory.getRegistry().getNamespaces()).contains("testF1"), true);
+ assertEquals(Arrays.asList(RegistryFactory.getRegistry().getNamespaces()).contains("testF2"), false);
+ }
+
+ public void testG() throws IOException, BundleException {
+ //fragment contributing an extension point to a plugin that do not have extension or extension point
+ Bundle bundle01 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testG/1");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle01});
+ Bundle bundle02 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testG/2");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle02});
+
+ assertNotNull(RegistryFactory.getRegistry().getExtensionPoint("testG1.xptG2"));
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("testG1.xptG2").getLabel(), "Label xptG2");
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("testG1.xptG2").getNamespace(), "testG1");
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("testG1.xptG2").getNamespaceIdentifier(), "testG1");
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("testG1.xptG2").getContributor().getName(), "testG1");
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("testG1.xptG2").getSchemaReference(), "schema/xptG2.exsd");
+
+ //Test the namespace
+ assertEquals(Arrays.asList(RegistryFactory.getRegistry().getNamespaces()).contains("testG1"), true);
+ assertEquals(Arrays.asList(RegistryFactory.getRegistry().getNamespaces()).contains("testG2"), false);
+ }
+
+ public void testH() throws IOException, BundleException {
+ // fragment contributing an extension to a plugin that does not have extension or extension point
+ Bundle bundle01 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testH/1");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle01});
+ Bundle bundle02 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testH/2");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle02});
+ Bundle bundle03 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testH/3");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle03});
+
+ testExtensionPoint("H1");
+
+ //Test the configurataion elements
+ assertEquals(RegistryFactory.getRegistry().getExtension("testH1", "xptH1", "testH3.ext1").getConfigurationElements().length, 0);
+ assertEquals(RegistryFactory.getRegistry().getConfigurationElementsFor("testH1.xptH1").length, 0);
+
+ //Test the number of extension in the namespace
+ assertEquals(RegistryFactory.getRegistry().getExtensions("testH3").length, 1);
+
+ //Test the extension
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testH1", "xptH1", "testH3.ext1"));
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testH1.xptH1", "testH3.ext1"));
+ assertNotNull(RegistryFactory.getRegistry().getExtension("testH3.ext1")); //This test exhibits a bug in the 3.0 implementation
+
+ assertNotNull(RegistryFactory.getRegistry().getExtensionPoint("testH1.xptH1").getExtension("testH3.ext1"));
+ assertEquals(RegistryFactory.getRegistry().getExtensionPoint("testH1.xptH1").getExtensions()[0].getUniqueIdentifier(), "testH3.ext1");
+
+ //Test the namespace
+ assertEquals(Arrays.asList(RegistryFactory.getRegistry().getNamespaces()).contains("testH1"), true);
+ assertEquals(Arrays.asList(RegistryFactory.getRegistry().getNamespaces()).contains("testH3"), true);
+ assertEquals(Arrays.asList(RegistryFactory.getRegistry().getNamespaces()).contains("testH2"), false); //fragments do not come with their namespace
+ }
+
+ public void test71826() throws MalformedURLException, BundleException, IOException {
+ Bundle bundle01 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/71826/fragmentF");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle01});
+
+ Bundle bundle02 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/71826/pluginB");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle02});
+
+ Bundle bundle03 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/71826/pluginA");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle03});
+
+ IExtensionPoint xp = RegistryFactory.getRegistry().getExtensionPoint("71826A.xptE");
+ assertNotNull("1.0", xp);
+ IExtension[] exts = xp.getExtensions();
+ assertEquals("1.1", 2, exts.length);
+ assertNotNull("1.2", xp.getExtension("71826A.F1"));
+ assertNotNull("1.3", xp.getExtension("71826B.B1"));
+ }
+
+ public void testJ() throws MalformedURLException, BundleException, IOException {
+ //Test the third level configuration elements
+ Bundle bundle01 = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/testI");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {bundle01});
+
+ IExtension ext = RegistryFactory.getRegistry().getExtension("testI.ext1");
+ IConfigurationElement ce = ext.getConfigurationElements()[0];
+ assertEquals(ce.getName(), "ce");
+ assertNotNull(ce.getValue());
+ assertEquals(ce.getChildren()[0].getName(), "ce2");
+ assertNull(ce.getChildren()[0].getValue());
+ assertEquals(ce.getChildren()[0].getChildren()[0].getName(), "ce3");
+ assertNull(ce.getChildren()[0].getChildren()[0].getValue());
+ assertEquals(ce.getChildren()[0].getChildren()[1].getName(), "ce3");
+ assertNull(ce.getChildren()[0].getChildren()[1].getValue());
+ assertEquals(ce.getChildren()[0].getChildren()[0].getChildren()[0].getName(), "ce4");
+ assertNotNull(ce.getChildren()[0].getChildren()[0].getChildren()[0].getValue());
+ }
+
+ public void testJbis() {
+ //Test the third level configuration elements from cache
+ IExtension ext = RegistryFactory.getRegistry().getExtension("testI.ext1");
+ IConfigurationElement ce = ext.getConfigurationElements()[0];
+ assertEquals(ce.getName(), "ce");
+ assertNotNull(ce.getValue());
+ assertEquals(ce.getChildren()[0].getName(), "ce2");
+ assertNull(ce.getChildren()[0].getValue());
+ assertEquals(ce.getChildren()[0].getChildren()[0].getName(), "ce3");
+ assertNull(ce.getChildren()[0].getChildren()[0].getValue());
+ assertEquals(ce.getChildren()[0].getChildren()[1].getName(), "ce3");
+ assertNull(ce.getChildren()[0].getChildren()[1].getValue());
+ assertEquals(ce.getChildren()[0].getChildren()[0].getChildren()[0].getName(), "ce4");
+ assertNotNull(ce.getChildren()[0].getChildren()[0].getChildren()[0].getValue());
+ }
+
+ public void testNonSingletonBundle() throws MalformedURLException, BundleException, IOException {
+ //Non singleton bundles are not supposed to be added
+ Bundle nonSingletonBundle = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/nonSingleton");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {nonSingletonBundle});
+ assertNull(RegistryFactory.getRegistry().getExtensionPoint("NonSingleton.ExtensionPoint"));
+ }
+
+ public void testSingletonFragment() throws MalformedURLException, BundleException, IOException {
+ //Fragments to non singleton host can not contribute extension or extension points
+ Bundle fragmentToNonSingleton = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/fragmentToNonSingleton");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {fragmentToNonSingleton});
+ assertNull(RegistryFactory.getRegistry().getExtensionPoint("NonSingleton.Bar"));
+ }
+
+ public void testNonSingletonFragment() throws MalformedURLException, BundleException, IOException {
+ //Non singleton bundles are not supposed to be added
+ Bundle regular = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/nonSingletonFragment/plugin");
+ Bundle nonSingletonFragment = BundleTestingHelper.installBundle("", fBundleContext, "Plugin_Testing/registry/nonSingletonFragment/fragment");
+ BundleTestingHelper.refreshPackages(fBundleContext, new Bundle[] {regular, nonSingletonFragment});
+ assertNull(RegistryFactory.getRegistry().getExtensionPoint("Regular.Bar"));
+ }
+
+ public static Test suite() {
+ //Order is important
+ TestSuite sameSession = new TestSuite(ExtensionRegistryStaticTest.class.getName());
+ sameSession.addTest(new ExtensionRegistryStaticTest("testA"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testAFromCache"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testB"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testBFromCache"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testBRemoved"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testC"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testD"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testE"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testF"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testG"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testH"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("test71826"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testJ"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testJbis"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testNonSingletonBundle"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testSingletonFragment"));
+ sameSession.addTest(new ExtensionRegistryStaticTest("testNonSingletonFragment"));
+ return sameSession;
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/InputErrorTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/InputErrorTest.java
new file mode 100644
index 0000000..aa604ec
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/InputErrorTest.java
@@ -0,0 +1,147 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry;
+
+import java.io.*;
+import java.net.URL;
+import junit.framework.TestCase;
+import org.eclipse.core.internal.registry.osgi.RegistryStrategyOSGI;
+import org.eclipse.core.runtime.*;
+import org.osgi.framework.FrameworkUtil;
+
+/**
+ * Test proper clean-up in case registry gets invalid XML contribution.
+ * @since 3.4
+ */
+public class InputErrorTest extends TestCase {
+
+ static private final String DATA_LOCATION = "Plugin_Testing/registry/errorHandling/";
+
+ /**
+ * Use customized registry strategy to both check error processing
+ * and to remove expected error messages from test log.
+ */
+ private class RegistryStrategyLog extends RegistryStrategyOSGI {
+
+ public String msg = null;
+
+ public RegistryStrategyLog(File[] theStorageDir, boolean[] cacheReadOnly, Object key) {
+ super(theStorageDir, cacheReadOnly, key);
+ }
+
+ @Override
+ public void log(IStatus status) {
+ msg = status.getMessage();
+ }
+ }
+
+ public InputErrorTest() {
+ super();
+ }
+
+ public InputErrorTest(String name) {
+ super(name);
+ }
+
+ private InputStream getStream(String location) {
+ URL xml = FrameworkUtil.getBundle(getClass()).getEntry(DATA_LOCATION + location);
+ assertNotNull(xml);
+ try {
+ return new BufferedInputStream(xml.openStream());
+ } catch (IOException ex) {
+ fail("Unable to open input stream to XML");
+ }
+ return null;
+ }
+
+ public void testErrorCleanupPoints() {
+ RegistryStrategyLog strategy = new RegistryStrategyLog(null, null, null); // RegistryFactory.createOSGiStrategy(null, null, null);
+ IExtensionRegistry localRegistry = RegistryFactory.createRegistry(strategy, null, null);
+ IContributor contributor = ContributorFactorySimple.createContributor("testErrorHandling");
+
+ // 1) attempt to add information from mis-formed XML
+ InputStream is = getStream("bad/point/plugin.xml");
+ assertNotNull(is);
+ boolean added = localRegistry.addContribution(is, contributor, false, "test", null, null);
+ assertFalse(added);
+ IExtensionPoint bundleExtPointA = localRegistry.getExtensionPoint("testErrorHandling.xptErrorTestA");
+ assertNull(bundleExtPointA);
+ IExtensionPoint bundleExtPointB = localRegistry.getExtensionPoint("testErrorHandling.xptErrorTestB");
+ assertNull(bundleExtPointB);
+
+ assertNotNull(strategy.msg);
+ strategy.msg = null;
+
+ // 2) add properly formed XML
+ is = getStream("good/point/plugin.xml");
+ assertNotNull(is);
+ added = localRegistry.addContribution(is, contributor, false, "test", null, null);
+ assertTrue(added);
+ bundleExtPointA = localRegistry.getExtensionPoint("testErrorHandling.xptErrorTestA");
+ assertNotNull(bundleExtPointA);
+ bundleExtPointB = localRegistry.getExtensionPoint("testErrorHandling.xptErrorTestB");
+ assertNotNull(bundleExtPointB);
+
+ assertNull(strategy.msg);
+ localRegistry.stop(null);
+ }
+
+ public void testErrorCleanupExtensions() {
+ RegistryStrategyLog strategy = new RegistryStrategyLog(null, null, null); // RegistryFactory.createOSGiStrategy(null, null, null);
+ IExtensionRegistry localRegistry = RegistryFactory.createRegistry(strategy, null, null);
+ IContributor contributor = ContributorFactorySimple.createContributor("testErrorHandling");
+
+ // 1) attempt to add information from mis-formed XML
+ InputStream is = getStream("bad/extension/plugin.xml");
+ assertNotNull(is);
+ boolean added = localRegistry.addContribution(is, contributor, false, "test", null, null);
+ assertFalse(added);
+ IExtensionPoint bundleExtPointA = localRegistry.getExtensionPoint("testErrorHandling.xptErrorTestA");
+ assertNull(bundleExtPointA);
+
+ IExtension extensionA = localRegistry.getExtension("testErrorHandling.testExtA");
+ assertNull(extensionA);
+ IExtension extensionB = localRegistry.getExtension("testErrorHandling.testExtB");
+ assertNull(extensionB);
+ IExtension extensionC = localRegistry.getExtension("testErrorHandling.testExtC");
+ assertNull(extensionC);
+
+ assertNotNull(strategy.msg);
+ strategy.msg = null;
+
+ // 2) add properly formed XML
+ is = getStream("good/extension/plugin.xml");
+ assertNotNull(is);
+ added = localRegistry.addContribution(is, contributor, false, "test", null, null);
+ assertTrue(added);
+ bundleExtPointA = localRegistry.getExtensionPoint("testErrorHandling.xptErrorTestA");
+ assertNotNull(bundleExtPointA);
+
+ checkExtension(localRegistry, "testErrorHandling.testExtA", "valueGoodA");
+ checkExtension(localRegistry, "testErrorHandling.testExtB", "valueGoodB");
+ checkExtension(localRegistry, "testErrorHandling.testExtC", "valueGoodC");
+
+ assertNull(strategy.msg);
+ localRegistry.stop(null);
+ }
+
+ private void checkExtension(IExtensionRegistry registry, String extID, String expectedValue) {
+ IExtension extensionA = registry.getExtension(extID);
+ assertNotNull(extensionA);
+ IConfigurationElement[] configElements = extensionA.getConfigurationElements();
+ assertTrue(configElements.length == 1);
+ String value = configElements[0].getAttribute("testAttr");
+ assertTrue(expectedValue.equals(value));
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/MultiLanguageTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/MultiLanguageTest.java
new file mode 100644
index 0000000..a59e605
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/MultiLanguageTest.java
@@ -0,0 +1,347 @@
+/*******************************************************************************
+ * Copyright (c) 2009, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ * Alexander Kurtakov <akurtako@redhat.com> - bug 458490
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry;
+
+import java.io.File;
+import java.util.Locale;
+import junit.framework.TestCase;
+import org.eclipse.core.internal.registry.IRegistryConstants;
+import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.spi.RegistryStrategy;
+import org.eclipse.core.tests.harness.BundleTestingHelper;
+import org.eclipse.core.tests.harness.FileSystemHelper;
+import org.eclipse.osgi.service.localization.LocaleProvider;
+import org.osgi.framework.*;
+import org.osgi.service.packageadmin.PackageAdmin;
+import org.osgi.util.tracker.ServiceTracker;
+
+/**
+ * Run with no NL argument or with "-nl en".
+ */
+public class MultiLanguageTest extends TestCase {
+
+ class LocaleProviderTest implements LocaleProvider {
+ public Locale currentLocale;
+
+ @Override
+ public Locale getLocale() {
+ return currentLocale;
+ }
+ }
+
+ private ServiceTracker<?, PackageAdmin> bundleTracker;
+
+ private static String helloWorld = "Hello World";
+ private static String helloWorldGerman = "Hallo Welt";
+ private static String helloWorldItalian = "Ciao a tutti";
+ private static String helloWorldFinnish = "Hei maailma";
+
+ private static String catsAndDogs = "Cats and dogs";
+ private static String catsAndDogsGerman = "Hunde und Katzen";
+ private static String catsAndDogsItalian = "Cani e gatti";
+ private static String catsAndDogsFinnish = "Kissat ja koirat";
+
+ private static String eclipse = "eclipse";
+ private static String eclipseGerman = "Eklipse";
+ private static String eclipseItalian = "eclissi";
+ private static String eclipseFinnish = "pimennys";
+
+ private static String proverb = "Make haste slowly";
+ private static String proverbLatin = "Festina lente";
+
+ private Bundle bundle;
+ private Bundle bundleFragment;
+ private String oldMultiLangValue;
+ private IPath tmpPath;
+ private File registryLocation;
+
+ private BundleContext testBundleContext;
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+
+ testBundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ bundle = BundleTestingHelper.installBundle("0.1", testBundleContext, "Plugin_Testing/registry/multiLang/bundleA");
+ bundleFragment = BundleTestingHelper.installBundle("0.2", testBundleContext, "Plugin_Testing/registry/multiLang/fragmentA");
+ getBundleAdmin().resolveBundles(new Bundle[] {bundle});
+
+ // find a place for the extension registry cache
+ tmpPath = FileSystemHelper.getRandomLocation(FileSystemHelper.getTempDir());
+ registryLocation = tmpPath.append("testMulti").toFile();
+ registryLocation.mkdirs();
+
+ // switch environment to multi-language
+ oldMultiLangValue = System.getProperty(IRegistryConstants.PROP_MULTI_LANGUAGE);
+ System.setProperty(IRegistryConstants.PROP_MULTI_LANGUAGE, "true");
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ // delete registry cache
+ FileSystemHelper.clear(tmpPath.toFile());
+
+ // remove test bundles
+ bundleFragment.uninstall();
+ bundle.uninstall();
+ refreshPackages(new Bundle[] {bundle});
+
+ // restore system environment
+ if (oldMultiLangValue == null) {
+ System.clearProperty(IRegistryConstants.PROP_MULTI_LANGUAGE);
+ } else {
+ System.setProperty(IRegistryConstants.PROP_MULTI_LANGUAGE, oldMultiLangValue);
+ }
+
+ if (bundleTracker != null) {
+ bundleTracker.close();
+ bundleTracker = null;
+ }
+ super.tearDown();
+ }
+
+ private void refreshPackages(Bundle[] refresh) {
+ final boolean[] flag = new boolean[] {false};
+ FrameworkListener listener = event -> {
+ if (event.getType() == FrameworkEvent.PACKAGES_REFRESHED) {
+ synchronized (flag) {
+ flag[0] = true;
+ flag.notifyAll();
+ }
+ }
+ };
+ testBundleContext.addFrameworkListener(listener);
+
+ try {
+ getBundleAdmin().refreshPackages(refresh);
+ synchronized (flag) {
+ while (!flag[0]) {
+ try {
+ flag.wait(5000);
+ } catch (InterruptedException e) {
+ // do nothing
+ }
+ }
+ }
+ } finally {
+ testBundleContext.removeFrameworkListener(listener);
+ }
+ }
+
+ /**
+ * Tests APIs that take Locale as an argument.
+ */
+ public void testMultiLocale() {
+ Object masterToken = new Object();
+ // Create a multi-language extension registry
+ File[] registryLocations = new File[] {registryLocation};
+ boolean[] readOnly = new boolean[] {false};
+ RegistryStrategy strategy = RegistryFactory.createOSGiStrategy(registryLocations, readOnly, masterToken);
+ IExtensionRegistry localRegistry = RegistryFactory.createRegistry(strategy, masterToken, null);
+ assertTrue(localRegistry.isMultiLanguage());
+
+ // this is a direct test
+ checkTranslations(localRegistry, false);
+
+ // test cache
+ localRegistry.stop(masterToken);
+ IExtensionRegistry registryCached = RegistryFactory.createRegistry(strategy, masterToken, null);
+ assertTrue(registryCached.isMultiLanguage());
+ checkTranslations(registryCached, true);
+
+ registryCached.stop(masterToken);
+ }
+
+ /**
+ * Tests APIs that use implicit default Locale.
+ */
+ public void testMultiLocaleService() {
+ Object masterToken = new Object();
+ // Create a multi-language extension registry
+ File[] registryLocations = new File[] {registryLocation};
+ boolean[] readOnly = new boolean[] {false};
+ RegistryStrategy strategy = RegistryFactory.createOSGiStrategy(registryLocations, readOnly, masterToken);
+ IExtensionRegistry localRegistry = RegistryFactory.createRegistry(strategy, masterToken, null);
+ assertTrue(localRegistry.isMultiLanguage());
+
+ // this is a direct test
+ checkTranslationsService(localRegistry, false);
+
+ // test cache
+ localRegistry.stop(masterToken);
+ IExtensionRegistry registryCached = RegistryFactory.createRegistry(strategy, masterToken, null);
+ assertTrue(registryCached.isMultiLanguage());
+ checkTranslationsService(registryCached, true);
+ registryCached.stop(masterToken);
+ }
+
+ private void checkTranslationsService(IExtensionRegistry registry, boolean extended) {
+ ServiceRegistration<LocaleProvider> registration = null;
+ try {
+ IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.test.registryMulti.PointA");
+ assertNotNull(extPoint);
+ IExtension extension = registry.getExtension("org.eclipse.test.registryMulti.ExtA");
+ assertNotNull(extension);
+ IConfigurationElement[] elements = registry.getConfigurationElementsFor("org.eclipse.test.registryMulti", "PointA", "org.eclipse.test.registryMulti.ExtA");
+ assertNotNull(elements);
+ assertEquals(1, elements.length);
+ IConfigurationElement element = elements[0];
+ assertNotNull(element);
+ IConfigurationElement[] sectionElements = element.getChildren("section");
+ assertNotNull(sectionElements);
+ assertEquals(1, sectionElements.length);
+ IConfigurationElement[] subdivisionElements = sectionElements[0].getChildren("subdivision");
+ assertNotNull(subdivisionElements);
+ assertEquals(1, subdivisionElements.length);
+ IConfigurationElement[] elementsValue = registry.getConfigurationElementsFor("org.eclipse.test.registryMulti", "PointValue", "org.eclipse.test.registryMulti.ExtValue");
+ assertNotNull(elementsValue);
+ assertEquals(1, elementsValue.length);
+ IConfigurationElement elementValue = elementsValue[0];
+ assertNotNull(elementValue);
+
+ // default: no service registered
+ assertEquals(helloWorld, extPoint.getLabel());
+ assertEquals(catsAndDogs, extension.getLabel());
+ assertEquals(helloWorld, element.getAttribute("name"));
+ assertEquals(eclipse, subdivisionElements[0].getAttribute("division"));
+ assertEquals(catsAndDogs, elementValue.getValue());
+
+ // locale set to German
+ LocaleProviderTest localeProvider = new LocaleProviderTest();
+ registration = testBundleContext.registerService(LocaleProvider.class, localeProvider, null);
+ localeProvider.currentLocale = new Locale("de_DE");
+ assertEquals(helloWorldGerman, extPoint.getLabel());
+ assertEquals(catsAndDogsGerman, extension.getLabel());
+ assertEquals(helloWorldGerman, element.getAttribute("name"));
+ assertEquals(eclipseGerman, subdivisionElements[0].getAttribute("division"));
+ assertEquals(catsAndDogsGerman, elementValue.getValue());
+
+ // locale changed to Italian
+ localeProvider.currentLocale = new Locale("it_IT");
+ assertEquals(catsAndDogsItalian, extension.getLabel());
+ assertEquals(helloWorldItalian, extPoint.getLabel());
+ assertEquals(helloWorldItalian, element.getAttribute("name"));
+ assertEquals(eclipseItalian, subdivisionElements[0].getAttribute("division"));
+ assertEquals(catsAndDogsItalian, elementValue.getValue());
+
+ if (extended) { // check Finnish
+ localeProvider.currentLocale = new Locale("fi_FI");
+ assertEquals(catsAndDogsFinnish, extension.getLabel());
+ assertEquals(helloWorldFinnish, extPoint.getLabel());
+ assertEquals(helloWorldFinnish, element.getAttribute("name"));
+ assertEquals(eclipseFinnish, subdivisionElements[0].getAttribute("division"));
+ assertEquals(catsAndDogsFinnish, elementValue.getValue());
+ }
+
+ // unregister service - locale back to default
+ registration.unregister();
+ registration = null;
+ assertEquals(helloWorld, extPoint.getLabel());
+ assertEquals(catsAndDogs, extension.getLabel());
+ assertEquals(helloWorld, element.getAttribute("name"));
+ assertEquals(eclipse, subdivisionElements[0].getAttribute("division"));
+ assertEquals(catsAndDogs, elementValue.getValue());
+ } finally {
+ if (registration != null) {
+ registration.unregister();
+ }
+ }
+ }
+
+ private void checkTranslations(IExtensionRegistry registry, boolean extended) {
+ IExtensionPoint extPoint = registry.getExtensionPoint("org.eclipse.test.registryMulti.PointA");
+ assertNotNull(extPoint);
+ IExtension extension = registry.getExtension("org.eclipse.test.registryMulti.ExtA");
+ assertNotNull(extension);
+ IConfigurationElement[] elements = registry.getConfigurationElementsFor("org.eclipse.test.registryMulti", "PointA", "org.eclipse.test.registryMulti.ExtA");
+ assertNotNull(elements);
+ assertEquals(1, elements.length);
+ IConfigurationElement element = elements[0];
+ assertNotNull(element);
+ IConfigurationElement[] sectionElements = element.getChildren("section");
+ assertNotNull(sectionElements);
+ assertEquals(1, sectionElements.length);
+ IConfigurationElement[] subdivisionElements = sectionElements[0].getChildren("subdivision");
+ assertNotNull(subdivisionElements);
+ assertEquals(1, subdivisionElements.length);
+ IConfigurationElement[] elementsValue = registry.getConfigurationElementsFor("org.eclipse.test.registryMulti", "PointValue", "org.eclipse.test.registryMulti.ExtValue");
+ assertNotNull(elementsValue);
+ assertEquals(1, elementsValue.length);
+ IConfigurationElement elementValue = elementsValue[0];
+ assertNotNull(elementValue);
+ IConfigurationElement[] elementsFrag = registry.getConfigurationElementsFor("org.eclipse.test.registryMulti", "FragmentPointA", "org.eclipse.test.registryMulti.FragmentExtA");
+ assertNotNull(elementsFrag);
+ assertEquals(1, elementsFrag.length);
+ IConfigurationElement elementFrag = elementsFrag[0];
+ assertNotNull(elementFrag);
+
+ assertEquals(helloWorldGerman, extPoint.getLabel("de_DE"));
+ assertEquals(helloWorldItalian, extPoint.getLabel("it"));
+ assertEquals(helloWorld, extPoint.getLabel());
+
+ assertEquals(catsAndDogsGerman, extension.getLabel("de_DE"));
+ assertEquals(catsAndDogsItalian, extension.getLabel("it"));
+ assertEquals(catsAndDogs, extension.getLabel());
+
+ assertEquals(helloWorldGerman, element.getAttribute("name", "de_DE"));
+ assertEquals(helloWorldGerman, element.getAttribute("name", "de_DE")); // check internal cache
+
+ assertEquals(helloWorldItalian, element.getAttribute("name", "it"));
+ assertEquals(helloWorldItalian, element.getAttribute("name", "it")); // check internal cache
+
+ assertEquals(helloWorld, element.getAttribute("name", "some_OtherABC"));
+ assertEquals(helloWorld, element.getAttribute("name")); // "default" locale
+
+ assertEquals(eclipseGerman, subdivisionElements[0].getAttribute("division", "de_DE"));
+ assertEquals(eclipseItalian, subdivisionElements[0].getAttribute("division", "it"));
+ assertEquals(eclipse, subdivisionElements[0].getAttribute("division", "some_OtherABC"));
+
+ assertEquals(catsAndDogsGerman, elementValue.getValue("de_DE"));
+ assertEquals(catsAndDogsGerman, elementValue.getValue("de_DE")); // check internal cache
+
+ assertEquals(catsAndDogsItalian, elementValue.getValue("it"));
+ assertEquals(catsAndDogsItalian, elementValue.getValue("it")); // check internal cache
+
+ assertEquals(catsAndDogs, elementValue.getValue("some_OtherABC"));
+ assertEquals(catsAndDogs, elementValue.getValue());
+
+ assertEquals(proverbLatin, elementFrag.getAttribute("name", "la_LA"));
+ assertEquals(proverbLatin, elementFrag.getAttribute("name", "la_LA")); // check internal cache
+ assertEquals(proverb, elementFrag.getAttribute("name", "some_OtherABC"));
+
+ if (!extended) {
+ return;
+ }
+
+ assertEquals(helloWorldFinnish, extPoint.getLabel("fi_FI"));
+ assertEquals(catsAndDogsFinnish, extension.getLabel("fi_FI"));
+ assertEquals(helloWorldFinnish, element.getAttribute("name", "fi_FI"));
+ assertEquals(helloWorldFinnish, element.getAttribute("name", "fi_FI")); // check internal cache
+ assertEquals(eclipseFinnish, subdivisionElements[0].getAttribute("division", "fi_FI"));
+ assertEquals(catsAndDogsFinnish, elementValue.getValue("fi_FI"));
+ assertEquals(catsAndDogsFinnish, elementValue.getValue("fi_FI")); // check internal cache
+ }
+
+ /*
+ * Return the package admin service, if available.
+ */
+ private PackageAdmin getBundleAdmin() {
+ if (bundleTracker == null) {
+ bundleTracker = new ServiceTracker<>(testBundleContext, PackageAdmin.class, null);
+ bundleTracker.open();
+ }
+ return bundleTracker.getService();
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/NamespaceTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/NamespaceTest.java
new file mode 100644
index 0000000..c787fa2
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/NamespaceTest.java
@@ -0,0 +1,116 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2012 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry;
+
+import java.io.IOException;
+import junit.framework.*;
+import org.eclipse.core.runtime.*;
+import org.eclipse.core.tests.harness.BundleTestingHelper;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.FrameworkUtil;
+
+public class NamespaceTest extends TestCase {
+
+ public NamespaceTest(String name) {
+ super(name);
+ }
+
+ public void testNamespaceBasic() throws IOException, BundleException {
+ //test the addition of an extension point
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ Bundle bundle01 = BundleTestingHelper.installBundle("Plugin", bundleContext, "Plugin_Testing/registry/testNamespace/1");
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundle01});
+
+ // Extension point and extension should be present
+ IExtensionPoint extpt = RegistryFactory.getRegistry().getExtensionPoint("org.abc.xptNS1");
+ assertNotNull(extpt);
+ assertTrue(extpt.getNamespaceIdentifier().equals("org.abc"));
+ assertTrue(extpt.getContributor().getName().equals("testNamespace1"));
+ assertTrue(extpt.getSimpleIdentifier().equals("xptNS1"));
+ assertTrue(extpt.getUniqueIdentifier().equals("org.abc.xptNS1"));
+
+ IExtension ext = RegistryFactory.getRegistry().getExtension("org.abc.extNS1");
+ assertNotNull(ext);
+ assertTrue(ext.getNamespaceIdentifier().equals("org.abc"));
+ assertTrue(ext.getContributor().getName().equals("testNamespace1"));
+ assertTrue(ext.getSimpleIdentifier().equals("extNS1"));
+ assertTrue(ext.getUniqueIdentifier().equals("org.abc.extNS1"));
+
+ // Check linkage extension <-> extension point
+ assertTrue(ext.getExtensionPointUniqueIdentifier().equals(extpt.getUniqueIdentifier()));
+ IExtension[] extensions = extpt.getExtensions();
+ assertTrue(extensions.length == 1);
+ assertTrue(extensions[0].equals(ext));
+
+ // Exactly one extension and one extension point in the "org.abc" namespace
+ IExtensionPoint[] namespaceExtensionPoints = RegistryFactory.getRegistry().getExtensionPoints("org.abc");
+ assertTrue(namespaceExtensionPoints.length == 1);
+ assertTrue(namespaceExtensionPoints[0].equals(extpt));
+ IExtension[] namespaceExtensions = RegistryFactory.getRegistry().getExtensions("org.abc");
+ assertTrue(namespaceExtensions.length == 1);
+ assertTrue(namespaceExtensions[0].equals(ext));
+
+ // There should not be extension points or extensions in the default namespace
+ IExtensionPoint[] defaultExtensionPoints = RegistryFactory.getRegistry().getExtensionPoints("testNamespace1");
+ assertTrue(defaultExtensionPoints.length == 0);
+ IExtension[] defaultExtensions = RegistryFactory.getRegistry().getExtensions("testNamespace1");
+ assertTrue(defaultExtensions.length == 0);
+
+ // remove the first bundle
+ bundle01.uninstall();
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundle01});
+ }
+
+ public void testNamespaceDynamic() throws BundleException, IOException {
+
+ // add another bundle
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ Bundle anotherNamespaceBundle = BundleTestingHelper.installBundle("Plugin", bundleContext, "Plugin_Testing/registry/testNamespace/2");
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {anotherNamespaceBundle});
+
+ // all elements from the first bundle should be gone
+ IExtensionPoint extpt_removed = RegistryFactory.getRegistry().getExtensionPoint("org.abc.xptNS1");
+ assertNull(extpt_removed);
+ IExtension ext_removed = RegistryFactory.getRegistry().getExtension("org.abc.extNS1");
+ assertNull(ext_removed);
+
+ // all elements from the second bundle should still be present
+ IExtensionPoint extpt2 = RegistryFactory.getRegistry().getExtensionPoint("org.abc.xptNS2");
+ assertNotNull(extpt2);
+ IExtension ext2 = RegistryFactory.getRegistry().getExtension("org.abc.extNS2");
+ assertNotNull(ext2);
+
+ // Exactly one extension and one extension point in the "org.abc" namespace
+ IExtensionPoint[] namespaceExtensionPoints2 = RegistryFactory.getRegistry().getExtensionPoints("org.abc");
+ assertTrue(namespaceExtensionPoints2.length == 1);
+ assertTrue(namespaceExtensionPoints2[0].equals(extpt2));
+ IExtension[] namespaceExtensions2 = RegistryFactory.getRegistry().getExtensions("org.abc");
+ assertTrue(namespaceExtensions2.length == 1);
+ assertTrue(namespaceExtensions2[0].equals(ext2));
+
+ // remove the second bundle
+ anotherNamespaceBundle.uninstall();
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {anotherNamespaceBundle});
+ }
+
+ public static Test suite() {
+ //Order is important
+ TestSuite sameSession = new TestSuite(NamespaceTest.class.getName());
+ sameSession.addTest(new NamespaceTest("testNamespaceBasic"));
+ sameSession.addTest(new NamespaceTest("testNamespaceDynamic"));
+ return sameSession;
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/RegistryListenerTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/RegistryListenerTest.java
new file mode 100644
index 0000000..95dd578
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/RegistryListenerTest.java
@@ -0,0 +1,307 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry;
+
+import java.io.IOException;
+import junit.framework.TestCase;
+import org.eclipse.core.runtime.RegistryFactory;
+import org.eclipse.core.tests.harness.BundleTestingHelper;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.FrameworkUtil;
+
+/**
+ * Tests "new" registry event listener.
+ * @since 3.4
+ */
+public class RegistryListenerTest extends TestCase {
+
+ final private static int MAX_TIME_PER_BUNDLE = 10000; // maximum time to wait for bundle event in milliseconds
+
+ private BundleContext fBundleContext;
+
+ public RegistryListenerTest() {
+ super();
+ }
+
+ public RegistryListenerTest(String name) {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ fBundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ }
+
+ /**
+ * Producer and consumer bundles are installed and removed in a "normal" order
+ */
+ public void testRegularOrder() throws IOException, BundleException {
+ Bundle bundle01 = null;
+ Bundle bundle02 = null;
+ WaitingRegistryListener listener = new WaitingRegistryListener();
+ listener.register("bundle01.xp1");
+ try {
+ bundle01 = BundleTestingHelper.installBundle("0.1", fBundleContext, "Plugin_Testing/registryListener/bundle01");
+ bundle02 = BundleTestingHelper.installBundle("0.2", fBundleContext, "Plugin_Testing/registryListener/bundle02");
+
+ Bundle[] testBundles = new Bundle[] {bundle01, bundle02};
+ BundleTestingHelper.refreshPackages(fBundleContext, testBundles);
+
+ String[] extPointIDs = listener.extPointsReceived(2 * MAX_TIME_PER_BUNDLE);
+ String[] extensionsReceived = listener.extensionsReceived(2 * MAX_TIME_PER_BUNDLE);
+ assertTrue(listener.isAdded());
+
+ assertNotNull(extPointIDs);
+ assertTrue(extPointIDs.length == 1);
+ assertTrue("bundle01.xp1".equals(extPointIDs[0]));
+
+ assertNotNull(extensionsReceived);
+ assertTrue(extensionsReceived.length == 1);
+ assertTrue("bundle02.ext1".equals(extensionsReceived[0]));
+
+ listener.reset();
+
+ bundle02.uninstall();
+ bundle02 = null; // reset as early as possible in case of exception
+ bundle01.uninstall();
+ bundle01 = null; // reset as early as possible in case of exception
+ BundleTestingHelper.refreshPackages(fBundleContext, testBundles);
+
+ extPointIDs = listener.extPointsReceived(2 * MAX_TIME_PER_BUNDLE);
+ extensionsReceived = listener.extensionsReceived(2 * MAX_TIME_PER_BUNDLE);
+ assertTrue(listener.isRemoved());
+
+ assertNotNull(extPointIDs);
+ assertTrue(extPointIDs.length == 1);
+ assertTrue("bundle01.xp1".equals(extPointIDs[0]));
+
+ assertNotNull(extensionsReceived);
+ assertTrue(extensionsReceived.length == 1);
+ assertTrue("bundle02.ext1".equals(extensionsReceived[0]));
+
+ } finally {
+ listener.unregister();
+ if (bundle01 != null) {
+ bundle01.uninstall();
+ }
+ if (bundle02 != null) {
+ bundle02.uninstall();
+ }
+ }
+ }
+
+ /**
+ * Producer and consumer bundles are installed and removed in an inverse order
+ */
+ public void testInverseOrder() throws IOException, BundleException {
+ Bundle bundle01 = null;
+ Bundle bundle02 = null;
+ WaitingRegistryListener listener = new WaitingRegistryListener();
+ listener.register("bundle01.xp1");
+ try {
+ bundle02 = BundleTestingHelper.installBundle("0.2", fBundleContext, "Plugin_Testing/registryEvents/bundle02");
+ bundle01 = BundleTestingHelper.installBundle("0.1", fBundleContext, "Plugin_Testing/registryEvents/bundle01");
+
+ Bundle[] testBundles = new Bundle[] {bundle01, bundle02};
+ BundleTestingHelper.refreshPackages(fBundleContext, testBundles);
+
+ String[] extPointIDs = listener.extPointsReceived(2 * MAX_TIME_PER_BUNDLE);
+ String[] extensionsReceived = listener.extensionsReceived(2 * MAX_TIME_PER_BUNDLE);
+ assertTrue(listener.isAdded());
+
+ assertNotNull(extPointIDs);
+ assertTrue(extPointIDs.length == 1);
+ assertTrue("bundle01.xp1".equals(extPointIDs[0]));
+
+ assertNotNull(extensionsReceived);
+ assertTrue(extensionsReceived.length == 1);
+ assertTrue("bundle02.ext1".equals(extensionsReceived[0]));
+
+ listener.reset();
+
+ bundle01.uninstall();
+ bundle01 = null; // reset as early as possible in case of exception
+ bundle02.uninstall();
+ bundle02 = null; // reset as early as possible in case of exception
+ BundleTestingHelper.refreshPackages(fBundleContext, testBundles);
+
+ extPointIDs = listener.extPointsReceived(2 * MAX_TIME_PER_BUNDLE);
+ extensionsReceived = listener.extensionsReceived(2 * MAX_TIME_PER_BUNDLE);
+ assertTrue(listener.isRemoved());
+
+ assertNotNull(extPointIDs);
+ assertTrue(extPointIDs.length == 1);
+ assertTrue("bundle01.xp1".equals(extPointIDs[0]));
+
+ assertNotNull(extensionsReceived);
+ assertTrue(extensionsReceived.length == 1);
+ assertTrue("bundle02.ext1".equals(extensionsReceived[0]));
+
+ } finally {
+ listener.unregister();
+ if (bundle02 != null) {
+ bundle02.uninstall();
+ }
+ if (bundle01 != null) {
+ bundle01.uninstall();
+ }
+ }
+ }
+
+ /**
+ * Tests modifications to multiple extensions and extension points
+ * Three listeners are tested: global; on xp1 (two extensions); on xp2 (no extensions)
+ */
+ public void testMultiplePoints() throws IOException, BundleException {
+ Bundle bundle = null;
+ WaitingRegistryListener listenerGlobal = new WaitingRegistryListener();
+ listenerGlobal.register(null);
+ WaitingRegistryListener listener1 = new WaitingRegistryListener();
+ listener1.register("bundleMultiple.xp1");
+ WaitingRegistryListener listener2 = new WaitingRegistryListener();
+ listener2.register("bundleMultiple.xp2");
+ try {
+ bundle = BundleTestingHelper.installBundle("0.1", fBundleContext, "Plugin_Testing/registryListener/bundleMultiple");
+
+ Bundle[] testBundles = new Bundle[] {bundle};
+ BundleTestingHelper.refreshPackages(fBundleContext, testBundles);
+
+ // test additions on global listener
+ String[] extPointIDs = listenerGlobal.extPointsReceived(MAX_TIME_PER_BUNDLE);
+ String[] extensionsReceived = listenerGlobal.extensionsReceived(MAX_TIME_PER_BUNDLE);
+ assertTrue(listenerGlobal.isAdded());
+ checkIDs(extPointIDs, new String[] {"bundleMultiple.xp1", "bundleMultiple.xp2"});
+ checkIDs(extensionsReceived, new String[] {"bundleMultiple.ext11", "bundleMultiple.ext12"});
+
+ // test additions on listener on extension point with extensions
+ String[] extPointIDs1 = listener1.extPointsReceived(20000);
+ String[] extensionsReceived1 = listener1.extensionsReceived(20000);
+ assertTrue(listener1.isAdded());
+ checkIDs(extPointIDs1, new String[] {"bundleMultiple.xp1"});
+ checkIDs(extensionsReceived1, new String[] {"bundleMultiple.ext11", "bundleMultiple.ext12"});
+
+ // test additions on listener on extension point with no extensions
+ String[] extPointIDs2 = listener2.extPointsReceived(MAX_TIME_PER_BUNDLE);
+ String[] extensionsReceived2 = listener2.extensionsReceived(50);
+ assertTrue(listener2.isAdded());
+ checkIDs(extPointIDs2, new String[] {"bundleMultiple.xp2"});
+ assertNull(extensionsReceived2);
+
+ // removal
+ listenerGlobal.reset();
+ listener1.reset();
+ listener2.reset();
+ bundle.uninstall();
+ bundle = null; // reset as early as possible in case of exception
+ BundleTestingHelper.refreshPackages(fBundleContext, testBundles);
+
+ // test removals on global listener
+ extPointIDs = listenerGlobal.extPointsReceived(MAX_TIME_PER_BUNDLE);
+ extensionsReceived = listenerGlobal.extensionsReceived(MAX_TIME_PER_BUNDLE);
+ assertTrue(listenerGlobal.isRemoved());
+ checkIDs(extPointIDs, new String[] {"bundleMultiple.xp1", "bundleMultiple.xp2"});
+ checkIDs(extensionsReceived, new String[] {"bundleMultiple.ext11", "bundleMultiple.ext12"});
+
+ // test removals on listener on extension point with extensions
+ extPointIDs1 = listener1.extPointsReceived(MAX_TIME_PER_BUNDLE);
+ extensionsReceived1 = listener1.extensionsReceived(MAX_TIME_PER_BUNDLE);
+ assertTrue(listener1.isRemoved());
+ checkIDs(extPointIDs1, new String[] {"bundleMultiple.xp1"});
+ checkIDs(extensionsReceived1, new String[] {"bundleMultiple.ext11", "bundleMultiple.ext12"});
+
+ // test removals on listener on extension point with no extensions
+ extPointIDs2 = listener2.extPointsReceived(MAX_TIME_PER_BUNDLE);
+ extensionsReceived2 = listener2.extensionsReceived(50);
+ assertTrue(listener2.isRemoved());
+ checkIDs(extPointIDs2, new String[] {"bundleMultiple.xp2"});
+ assertNull(extensionsReceived2);
+
+ } finally {
+ listenerGlobal.unregister();
+ listener1.unregister();
+ listener2.unregister();
+ if (bundle != null) {
+ bundle.uninstall();
+ }
+ }
+ }
+
+ /**
+ * Tests listener registered multiple times: once on xp1, once on xp2
+ */
+ public void testMultipleRegistrations() throws IOException, BundleException {
+ Bundle bundle = null;
+ WaitingRegistryListener listener = new WaitingRegistryListener();
+ RegistryFactory.getRegistry().addListener(listener, "bundleMultiple.xp1");
+ RegistryFactory.getRegistry().addListener(listener, "bundleMultiple.xp1");
+ try {
+ bundle = BundleTestingHelper.installBundle("0.1", fBundleContext, "Plugin_Testing/registryListener/bundleMultiple");
+
+ Bundle[] testBundles = new Bundle[] {bundle};
+ BundleTestingHelper.refreshPackages(fBundleContext, testBundles);
+
+ // 1st registration: extension point; extension => 2 callbacks
+ // 2nd registration should be ignored: extension => 0 callbacks
+ // total: 2 callbacks
+ assertTrue(listener.waitFor(2, MAX_TIME_PER_BUNDLE) == 2);
+
+ // test additions on listener on extension point with extensions
+ String[] extPointIDs = listener.extPointsReceived(50);
+ String[] extensionsReceived = listener.extensionsReceived(50);
+ assertTrue(listener.isAdded());
+ checkIDs(extPointIDs, new String[] {"bundleMultiple.xp1"});
+ checkIDs(extensionsReceived, new String[] {"bundleMultiple.ext11", "bundleMultiple.ext12"});
+
+ // removal: unregistering listener once should remove both registrations
+ listener.reset();
+ listener.unregister();
+ bundle.uninstall();
+ bundle = null; // reset as early as possible in case of exception
+ BundleTestingHelper.refreshPackages(fBundleContext, testBundles);
+
+ // test removals on listener on extension point with extensions
+ assertTrue(listener.waitFor(3, 200) == 0);
+ extPointIDs = listener.extPointsReceived(50);
+ extensionsReceived = listener.extensionsReceived(50);
+ assertNull(extPointIDs);
+ assertNull(extensionsReceived);
+ } finally {
+ // second unregistration should have no effect
+ listener.unregister();
+ if (bundle != null) {
+ bundle.uninstall();
+ }
+ }
+ }
+
+ // For simplicity, this method does not expect duplicate IDs in either array
+ private void checkIDs(String[] receivedIDs, String[] expectedIDs) {
+ assertNotNull(receivedIDs);
+ assertNotNull(expectedIDs);
+ assertTrue(receivedIDs.length == expectedIDs.length);
+ for (String expected : expectedIDs) {
+ boolean found = false;
+ for (String receivedID : receivedIDs) {
+ if (expected.equals(receivedID)) {
+ found = true;
+ break;
+ }
+ }
+ assertTrue(found);
+ }
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/RegistryTests.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/RegistryTests.java
new file mode 100644
index 0000000..8a4b162
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/RegistryTests.java
@@ -0,0 +1,32 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Julian Honnen
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Julian Honnen - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+ ContributorsTest.class,
+ ExtensionRegistryDynamicTest.class,
+ ExtensionRegistryStaticTest.class,
+ InputErrorTest.class,
+ MultiLanguageTest.class,
+ NamespaceTest.class,
+ RegistryListenerTest.class
+})
+public class RegistryTests {
+ // intentionally left blank
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/StaleObjects.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/StaleObjects.java
new file mode 100644
index 0000000..99510e8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/StaleObjects.java
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2015 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ * Alexander Kurtakov <akurtako@redhat.com> - bug 458490
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry;
+
+import java.io.IOException;
+import junit.framework.TestCase;
+import org.eclipse.core.runtime.*;
+import org.eclipse.core.tests.harness.BundleTestingHelper;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleException;
+import org.osgi.framework.FrameworkUtil;
+
+public class StaleObjects extends TestCase {
+ private class HandleCatcher implements IRegistryChangeListener {
+ private IExtension extensionFromTheListener;
+
+ public HandleCatcher() {
+ RegistryFactory.getRegistry().addRegistryChangeListener(this);
+ }
+
+ @Override
+ public void registryChanged(IRegistryChangeEvent event) {
+ boolean gotException = false;
+ try {
+ extensionFromTheListener = event.getExtensionDeltas()[0].getExtension();
+ extensionFromTheListener.getSimpleIdentifier();
+ } catch (InvalidRegistryObjectException e) {
+ gotException = true;
+ }
+ assertEquals(false, gotException);
+ }
+
+ public IExtension getAcquiredHandle() {
+ return extensionFromTheListener;
+ }
+ }
+
+ public synchronized void testA() throws IOException, BundleException {
+ HandleCatcher listener = new HandleCatcher();
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ Bundle bundle01 = BundleTestingHelper.installBundle("", bundleContext, "Plugin_Testing/registry/testStale1");
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundle01});
+
+ IExtension willBeStale = RegistryFactory.getRegistry().getExtension("testStale.ext1");
+
+ //Test that handles obtained from deltas are working.
+
+ //Test that handles obtained from an addition deltas are working even after the delta is done being broadcasted.
+ boolean gotException = false;
+ try {
+ IExtension result = null;
+ while ((result = listener.getAcquiredHandle()) == null) {
+ try {
+ wait(200);
+ } catch (InterruptedException e) {
+ //ignore.
+ }
+ }
+ result.getSimpleIdentifier();
+ } catch (InvalidRegistryObjectException e) {
+ gotException = true;
+ }
+ assertEquals(false, gotException);
+
+ //Add a listener capturing a handle removal. Inside the handle catcher the handle is valid
+ HandleCatcher listener2 = new HandleCatcher();
+ try {
+ wait(500); //Wait for the listeners to be done
+ } catch (InterruptedException e) {
+ //ignore.
+ }
+
+ bundle01.uninstall();
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundle01});
+
+ //Outside of the event notification the handle from a removed object should be invalid
+ gotException = false;
+ try {
+ while (listener2.getAcquiredHandle() == null) {
+ try {
+ wait(200);
+ } catch (InterruptedException e) {
+ //ignore.
+ }
+ }
+ listener2.getAcquiredHandle().getSimpleIdentifier();
+ } catch (InvalidRegistryObjectException e) {
+ gotException = true;
+ }
+ assertEquals(true, gotException);
+
+ //Check that the initial handles are stale as well
+ gotException = false;
+ try {
+ willBeStale.getSimpleIdentifier();
+ } catch (InvalidRegistryObjectException e) {
+ gotException = true;
+ }
+ assertEquals(true, gotException);
+ RegistryFactory.getRegistry().removeRegistryChangeListener(listener2);
+ RegistryFactory.getRegistry().removeRegistryChangeListener(listener);
+ }
+
+ public void testStaleConfigurationElement() throws IOException, BundleException {
+ BundleContext bundleContext = FrameworkUtil.getBundle(getClass()).getBundleContext();
+ Bundle bundle01 = BundleTestingHelper.installBundle("", bundleContext, "Plugin_Testing/registry/testStale2");
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundle01});
+
+ IConfigurationElement ce = RegistryFactory.getRegistry().getExtension("testStale2.ext1").getConfigurationElements()[0];
+ assertNotNull(ce);
+
+ bundle01.uninstall();
+ BundleTestingHelper.refreshPackages(bundleContext, new Bundle[] {bundle01});
+
+ boolean gotException = false;
+ try {
+ ce.createExecutableExtension("name");
+ } catch (CoreException c) {
+ gotException = true;
+ }
+ assertEquals(true, gotException);
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/WaitingRegistryListener.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/WaitingRegistryListener.java
new file mode 100644
index 0000000..d5c95a6
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/WaitingRegistryListener.java
@@ -0,0 +1,198 @@
+/*******************************************************************************
+ * Copyright (c) 2007, 2015 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ * Alexander Kurtakov <akurtako@redhat.com> - bug 458490
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.eclipse.core.runtime.*;
+import org.junit.Assert;
+
+/**
+ * Allows test cases to wait for the extension registry notifications.
+ * This listener checks navigability to related elements from extensions.
+ * @since 3.4
+ */
+public class WaitingRegistryListener extends Assert implements IRegistryEventListener {
+
+ final static long MIN_WAIT_TIME = 100; // minimum wait time in milliseconds
+
+ private List<String> extensionIDs; // String[]
+ private List<String> extPointIDs; // String[]
+
+ private volatile boolean added;
+ private volatile boolean removed;
+ private volatile int callbacks;
+
+ private String extPointId;
+
+ public WaitingRegistryListener() {
+ reset();
+ }
+
+ public void register(String id) {
+ extPointId = id; // used for verification in callbacks
+ if (extPointId != null) {
+ RegistryFactory.getRegistry().addListener(this, extPointId);
+ } else {
+ RegistryFactory.getRegistry().addListener(this);
+ }
+ }
+
+ public void unregister() {
+ RegistryFactory.getRegistry().removeListener(this);
+ }
+
+ public void reset() {
+ extensionIDs = null;
+ extPointIDs = null;
+ added = false;
+ removed = false;
+ callbacks = 0;
+ }
+
+ public boolean isAdded() {
+ return added;
+ }
+
+ public boolean isRemoved() {
+ return removed;
+ }
+
+ public synchronized String[] extensionsReceived(long timeout) {
+ if (extensionIDs != null) {
+ return extensionIDs.toArray(new String[extensionIDs.size()]);
+ }
+ try {
+ wait(timeout);
+ } catch (InterruptedException e) {
+ // who cares?
+ }
+ if (extensionIDs == null) {
+ return null;
+ }
+ return extensionIDs.toArray(new String[extensionIDs.size()]);
+ }
+
+ public synchronized String[] extPointsReceived(long timeout) {
+ if (extPointIDs != null) {
+ return extPointIDs.toArray(new String[extPointIDs.size()]);
+ }
+ try {
+ wait(timeout);
+ } catch (InterruptedException e) {
+ // who cares?
+ }
+ if (extPointIDs == null) {
+ return null;
+ }
+ return extPointIDs.toArray(new String[extPointIDs.size()]);
+ }
+
+ public synchronized int waitFor(int events, long maxTimeout) {
+ long startTime = System.currentTimeMillis();
+ try {
+ while (callbacks < events) {
+ long currentTime = System.currentTimeMillis();
+ long alreadyWaited = currentTime - startTime;
+ if (alreadyWaited < 0)
+ {
+ alreadyWaited = 0; // just in case if system timer is not very precise
+ }
+ long timeToWait = maxTimeout - alreadyWaited;
+ if (timeToWait <= 0) {
+ wait(MIN_WAIT_TIME); // give it a last chance
+ break; // timed out
+ }
+ wait(timeToWait);
+ }
+ } catch (InterruptedException e) {
+ // breaks the cycle
+ }
+ return callbacks;
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.core.runtime.IRegistryEventListener#added(org.eclipse.core.runtime.IExtension[])
+ */
+ @Override
+ synchronized public void added(IExtension[] extensions) {
+ extensionsToString(extensions);
+ added = true;
+ callbacks++;
+ notify();
+ }
+
+ @Override
+ synchronized public void removed(IExtension[] extensions) {
+ extensionsToString(extensions);
+ removed = true;
+ callbacks++;
+ notify();
+ }
+
+ @Override
+ synchronized public void added(IExtensionPoint[] extensionPoints) {
+ extPointsToString(extensionPoints);
+ added = true;
+ callbacks++;
+ notify();
+ }
+
+ @Override
+ synchronized public void removed(IExtensionPoint[] extensionPoints) {
+ extPointsToString(extensionPoints);
+ removed = true;
+ callbacks++;
+ notify();
+ }
+
+ private void extensionsToString(IExtension[] extensions) {
+ extensionIDs = new ArrayList<>(extensions.length);
+ for (IExtension extension : extensions) {
+ extensionIDs.add(extension.getUniqueIdentifier());
+
+ // test navigation: to extension point
+ String ownerId = extension.getExtensionPointUniqueIdentifier();
+ if (extPointId != null) {
+ assertTrue(extPointId.equals(ownerId));
+ }
+ // test navigation: all children
+ assertTrue(validContents(extension.getConfigurationElements()));
+ }
+ }
+
+ private boolean validContents(IConfigurationElement[] children) {
+ if (children == null) {
+ return true;
+ }
+ for (int i = 0; i < children.length; i++) {
+ if (!children[i].isValid()) {
+ return false;
+ }
+ if (!validContents(children[i].getChildren())) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private void extPointsToString(IExtensionPoint[] extensionPoints) {
+ extPointIDs = new ArrayList<>(extensionPoints.length);
+ for (IExtensionPoint extensionPoint : extensionPoints) {
+ extPointIDs.add(extensionPoint.getUniqueIdentifier());
+ }
+ }
+
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/BaseExtensionRegistryRun.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/BaseExtensionRegistryRun.java
new file mode 100644
index 0000000..da7c864
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/BaseExtensionRegistryRun.java
@@ -0,0 +1,117 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple;
+
+import java.io.*;
+import java.net.URL;
+import junit.framework.TestCase;
+
+import org.eclipse.core.internal.runtime.MetaDataKeeper;
+import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.spi.RegistryStrategy;
+import org.osgi.framework.FrameworkUtil;
+
+public class BaseExtensionRegistryRun extends TestCase {
+
+ // The imaging device registry
+ protected IExtensionRegistry simpleRegistry;
+ protected Object masterToken = new Object();
+ protected Object userToken = new Object();
+
+ // Path to the XML files
+ private final static String xmlPath = "Plugin_Testing/registry/testSimple/"; //$NON-NLS-1$
+
+ public BaseExtensionRegistryRun() {
+ super();
+ }
+
+ public BaseExtensionRegistryRun(String name) {
+ super(name);
+ }
+
+ protected URL getXML(String fileName) {
+ return FrameworkUtil.getBundle(getClass()).getEntry(xmlPath + fileName);
+ }
+
+ /**
+ * Create the "imaging device" registry
+ */
+ @Override
+ protected void setUp() throws Exception {
+ // create the imaging device registry
+ simpleRegistry = startRegistry();
+ }
+
+ /**
+ * Properly dispose of the extension registry
+ */
+ @Override
+ protected void tearDown() throws Exception {
+ stopRegistry();
+ }
+
+ /**
+ * @return - open extension registry
+ */
+ protected IExtensionRegistry startRegistry() {
+ return startRegistry(this.getClass().getName());
+ }
+
+ /**
+ * @return - open extension registry
+ */
+ protected IExtensionRegistry startRegistry(String subDir) {
+ // use plugin's metadata directory to save cache data
+ IPath userDataPath = getStateLocation();
+ userDataPath = userDataPath.append(subDir);
+
+ File[] registryLocations = new File[] {new File(userDataPath.toOSString())};
+ boolean[] readOnly = new boolean[] {false};
+ RegistryStrategy registryStrategy = new RegistryStrategy(registryLocations, readOnly);
+ return RegistryFactory.createRegistry(registryStrategy, masterToken, userToken);
+ }
+
+ /**
+ * Stops the extension registry.
+ */
+ protected void stopRegistry() {
+ assertNotNull(simpleRegistry);
+ simpleRegistry.stop(masterToken);
+ }
+
+ protected void processXMLContribution(IContributor nonBundleContributor, URL url) {
+ processXMLContribution(nonBundleContributor, url, false);
+ }
+
+ protected void processXMLContribution(IContributor nonBundleContributor, URL url, boolean persist) {
+ try {
+ InputStream is = url.openStream();
+ simpleRegistry.addContribution(is, nonBundleContributor, persist, url.getFile(), null, persist ? masterToken : userToken);
+ } catch (IOException eFile) {
+ fail(eFile.getMessage());
+ return;
+ }
+ }
+
+ protected String qualifiedName(String namespace, String simpleName) {
+ return namespace + "." + simpleName; //$NON-NLS-1$
+ }
+
+ protected IPath getStateLocation() {
+ IPath stateLocation = MetaDataKeeper.getMetaArea().getStateLocation(FrameworkUtil.getBundle(getClass()));
+ stateLocation.toFile().mkdirs();
+ return stateLocation;
+ }
+
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/DirectExtensionCreateTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/DirectExtensionCreateTest.java
new file mode 100644
index 0000000..2c317b8
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/DirectExtensionCreateTest.java
@@ -0,0 +1,136 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple;
+
+import org.eclipse.core.internal.registry.ExtensionRegistry;
+import org.eclipse.core.internal.registry.spi.ConfigurationElementAttribute;
+import org.eclipse.core.internal.registry.spi.ConfigurationElementDescription;
+import org.eclipse.core.runtime.*;
+
+/**
+ * Tests programmatic creation of extension and extension point by using direct
+ * methods on the ExtensionRegistry.
+ *
+ * Note that in present those methods are internal, but might be exposed as
+ * APIs in the future.
+ *
+ * @since 3.2
+ */
+public class DirectExtensionCreateTest extends BaseExtensionRegistryRun {
+
+ public DirectExtensionCreateTest() {
+ super();
+ }
+
+ public DirectExtensionCreateTest(String name) {
+ super(name);
+ }
+
+ public void testExtensionPointAddition() {
+ IContributor contributor = ContributorFactorySimple.createContributor("1"); //$NON-NLS-1$
+ String extensionPointId = "DirectExtPoint"; //$NON-NLS-1$
+ String extensionPointLabel = "Direct Extension Point"; //$NON-NLS-1$
+ String extensionPointSchemaRef = "schema/ExtensionPointTest.exsd"; //$NON-NLS-1$
+
+ /**********************************************************************************************
+ * Add extension point:
+ *
+ * <extension-point id="DirectExtPoint"
+ * name="Direct Extension Point"
+ * schema="schema/ExtensionPointTest.exsd"/>
+ *
+ *********************************************************************************************/
+
+ ((ExtensionRegistry) simpleRegistry).addExtensionPoint(extensionPointId, contributor, false, extensionPointLabel, extensionPointSchemaRef, userToken);
+
+ String namespace = contributor.getName();
+ IExtensionPoint extensionPoint = simpleRegistry.getExtensionPoint(qualifiedName(namespace, extensionPointId));
+ assertNotNull(extensionPoint);
+ assertTrue(extensionPointSchemaRef.equals(extensionPoint.getSchemaReference()));
+ assertTrue(extensionPointLabel.equals(extensionPoint.getLabel()));
+
+ // add second contribution in the same namespace
+ String extensionPointAltId = "DirectExtPointAlt"; //$NON-NLS-1$
+ String extensionPointAltLabel = "Second direct extension point"; //$NON-NLS-1$
+ assertTrue(((ExtensionRegistry) simpleRegistry).addExtensionPoint(extensionPointAltId, contributor, false, extensionPointAltLabel, extensionPointSchemaRef, userToken));
+
+ IExtensionPoint extensionPointAlt = simpleRegistry.getExtensionPoint(qualifiedName(namespace, extensionPointAltId));
+ assertNotNull(extensionPointAlt);
+ assertTrue(extensionPointSchemaRef.equals(extensionPointAlt.getSchemaReference()));
+ assertTrue(extensionPointAltLabel.equals(extensionPointAlt.getLabel()));
+
+ /**********************************************************************************************
+ * Add extension:
+ * <extension id="DirectExtensionID" name="Direct Extension" point="DirectExtPoint">
+ * <StorageDevice deviceURL="theShienneMountain">
+ * <BackupDevice backupURL="SkyLab"/>
+ * <BackupDevice backupURL="OceanFloor"/>
+ * </StorageDevice>
+ * </extension>
+ *********************************************************************************************/
+ String extensionId = "DirectExtensionID"; //$NON-NLS-1$
+ String extensionLabel = "Direct Extension"; //$NON-NLS-1$
+
+ String nameChildDesc = "BackupDevice"; //$NON-NLS-1$
+ String propNameChildDesc = "backupURL"; //$NON-NLS-1$
+ String propValueChildDesc1 = "SkyLab"; //$NON-NLS-1$
+ String propValueChildDesc2 = "OceanFloor"; //$NON-NLS-1$
+
+ ConfigurationElementAttribute propChildDesc1 = new ConfigurationElementAttribute(propNameChildDesc, propValueChildDesc1);
+ ConfigurationElementDescription childDesc1 = new ConfigurationElementDescription(nameChildDesc, propChildDesc1, null, null);
+
+ ConfigurationElementAttribute propChildDesc2 = new ConfigurationElementAttribute(propNameChildDesc, propValueChildDesc2);
+ ConfigurationElementDescription childDesc2 = new ConfigurationElementDescription(nameChildDesc, propChildDesc2, null, null);
+
+ String extensionName = "StorageDevice"; //$NON-NLS-1$
+ String extensionProrName1 = "deviceURL"; //$NON-NLS-1$
+ String extensionPropValue1 = "theShienneMountain"; //$NON-NLS-1$
+ String extensionProrName2 = "primary"; //$NON-NLS-1$
+ String extensionPropValue2 = "true"; //$NON-NLS-1$
+ ConfigurationElementAttribute prop1 = new ConfigurationElementAttribute(extensionProrName1, extensionPropValue1);
+ ConfigurationElementAttribute prop2 = new ConfigurationElementAttribute(extensionProrName2, extensionPropValue2);
+ String extensionValue = "SomeValue"; //$NON-NLS-1$
+
+ ConfigurationElementDescription description = new ConfigurationElementDescription(extensionName, new ConfigurationElementAttribute[] {prop1, prop2}, extensionValue, new ConfigurationElementDescription[] {childDesc1, childDesc2});
+
+ assertTrue(((ExtensionRegistry) simpleRegistry).addExtension(extensionId, contributor, false, extensionLabel, extensionPointId, description, userToken));
+
+ IExtension[] namespaceExtensions = simpleRegistry.getExtensions(namespace);
+ assertNotNull(namespaceExtensions);
+ assertTrue(namespaceExtensions.length == 1);
+ IExtension[] extensions = extensionPoint.getExtensions();
+ assertNotNull(extensions);
+ assertTrue(extensions.length == 1);
+ for (IExtension extension : extensions) {
+ String storedExtensionId = extension.getUniqueIdentifier();
+ assertTrue(storedExtensionId.equals(qualifiedName(namespace, extensionId)));
+ String extensionNamespace = extension.getNamespaceIdentifier();
+ assertTrue(extensionNamespace.equals(namespace));
+ String extensionContributor = extension.getContributor().getName();
+ assertTrue(extensionContributor.equals(namespace));
+ IConfigurationElement[] configElements = extension.getConfigurationElements();
+ assertNotNull(configElements);
+ for (IConfigurationElement configElement : configElements) {
+ String configElementName = configElement.getName();
+ assertTrue(configElementName.equals(extensionName));
+ String configElementValue = configElement.getValue();
+ assertTrue(configElementValue.equals(extensionValue));
+ String[] attributeNames = configElement.getAttributeNames();
+ assertTrue(attributeNames.length == 2);
+ IConfigurationElement[] configElementChildren = configElement.getChildren();
+ assertTrue(configElementChildren.length == 2);
+ }
+ }
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/DirectExtensionCreateTwoRegistriesTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/DirectExtensionCreateTwoRegistriesTest.java
new file mode 100644
index 0000000..0287fa5
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/DirectExtensionCreateTwoRegistriesTest.java
@@ -0,0 +1,103 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple;
+
+import org.eclipse.core.internal.registry.ExtensionRegistry;
+import org.eclipse.core.runtime.*;
+
+/**
+ * Test simultaneous work of two extension registries.
+ * @since 3.2
+ */
+public class DirectExtensionCreateTwoRegistriesTest extends BaseExtensionRegistryRun {
+
+ private String extensionPointId = "AAAid"; //$NON-NLS-1$
+ private String extensionPointAltId = "BBBid"; //$NON-NLS-1$
+ private String extensionPointSchemaRef = "schema/schema.exsd"; //$NON-NLS-1$
+
+ private IExtensionRegistry theDeviceRegistryA;
+ private IExtensionRegistry theDeviceRegistryB;
+
+ public DirectExtensionCreateTwoRegistriesTest() {
+ super();
+ }
+
+ public DirectExtensionCreateTwoRegistriesTest(String name) {
+ super(name);
+ }
+
+ @Override
+ protected void setUp() throws Exception {
+ startRegistries();
+ }
+
+ @Override
+ protected void tearDown() throws Exception {
+ stopRegistries();
+ }
+
+ private void startRegistries() {
+ theDeviceRegistryA = startRegistry("A"); //$NON-NLS-1$
+ theDeviceRegistryB = startRegistry("B"); //$NON-NLS-1$
+ }
+
+ private void stopRegistries() {
+ assertNotNull(theDeviceRegistryA);
+ theDeviceRegistryA.stop(masterToken);
+
+ assertNotNull(theDeviceRegistryB);
+ theDeviceRegistryB.stop(masterToken);
+ }
+
+ public void testExtensionPointAddition() {
+ // Test with non-bundle contributor
+ IContributor nonBundleContributor = ContributorFactorySimple.createContributor("ABC"); //$NON-NLS-1$
+ String namespace = nonBundleContributor.getName();
+ checkEmptyRegistries(namespace); // make sure we don't have any leftovers
+
+ fillRegistries(nonBundleContributor); // add one extension point in each registry
+ checkRegistries(namespace); // check that they got into right places
+
+ stopRegistries(); // check caches
+ startRegistries();
+ checkEmptyRegistries(namespace); // confirm that both registries got re-populated from caches
+ }
+
+ private void checkEmptyRegistries(String namespace) {
+ // see what's in the registry A:
+ IExtensionPoint extensionPoint = theDeviceRegistryA.getExtensionPoint(qualifiedName(namespace, extensionPointId));
+ IExtensionPoint extensionPointAlt = theDeviceRegistryA.getExtensionPoint(qualifiedName(namespace, extensionPointAltId));
+ assertNull(extensionPoint);
+ assertNull(extensionPointAlt);
+ }
+
+ private void fillRegistries(IContributor contributor) {
+ assertTrue(((ExtensionRegistry) theDeviceRegistryA).addExtensionPoint(extensionPointId, contributor, false, "LabelA", extensionPointSchemaRef, userToken)); //$NON-NLS-1$
+ assertTrue(((ExtensionRegistry) theDeviceRegistryB).addExtensionPoint(extensionPointAltId, contributor, false, "LabelB", extensionPointSchemaRef, userToken)); //$NON-NLS-1$
+ }
+
+ private void checkRegistries(String namespace) {
+ // see what's in the registry A:
+ IExtensionPoint extensionPoint = theDeviceRegistryA.getExtensionPoint(qualifiedName(namespace, extensionPointId));
+ IExtensionPoint extensionPointAlt = theDeviceRegistryA.getExtensionPoint(qualifiedName(namespace, extensionPointAltId));
+ assertNotNull(extensionPoint);
+ assertNull(extensionPointAlt);
+
+ // see what's in the registry B:
+ extensionPoint = theDeviceRegistryB.getExtensionPoint(qualifiedName(namespace, extensionPointId));
+ extensionPointAlt = theDeviceRegistryB.getExtensionPoint(qualifiedName(namespace, extensionPointAltId));
+ assertNull(extensionPoint);
+ assertNotNull(extensionPointAlt);
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/DirectExtensionRemoveTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/DirectExtensionRemoveTest.java
new file mode 100644
index 0000000..b05d837
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/DirectExtensionRemoveTest.java
@@ -0,0 +1,204 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple;
+
+import org.eclipse.core.runtime.*;
+import org.eclipse.equinox.common.tests.registry.simple.utils.SimpleRegistryListener;
+
+/**
+ * Tests removal APIs using a simple registry.
+ * @since 3.2
+ */
+public class DirectExtensionRemoveTest extends BaseExtensionRegistryRun {
+
+ private final static String pointA = "PointA"; //$NON-NLS-1$
+ private final static String pointB = "PointB"; //$NON-NLS-1$
+
+ private final static String extensionA1 = "TestExtensionA1"; //$NON-NLS-1$
+ private final static String extensionA2 = "TestExtensionA2"; //$NON-NLS-1$
+
+ public DirectExtensionRemoveTest() {
+ super();
+ }
+
+ public DirectExtensionRemoveTest(String name) {
+ super(name);
+ }
+
+ // Fill the registry; remove half; check listener; check what's left
+ public void testExtensionPointAddition() {
+ IContributor nonBundleContributor = ContributorFactorySimple.createContributor("DirectRemoveProvider"); //$NON-NLS-1$
+ String namespace = nonBundleContributor.getName();
+ fillRegistry(nonBundleContributor);
+ checkRegistryFull(namespace);
+
+ SimpleRegistryListener listener = new SimpleRegistryListener();
+ listener.register(simpleRegistry);
+ remove(namespace);
+
+ checkListener(listener);
+ checkRegistryRemoved(namespace);
+ listener.unregister(simpleRegistry);
+ }
+
+ /**
+ * Tests that configuration elements associated with the removed extension
+ * are removed.
+ */
+ public void testAssociatedConfigElements() {
+ IContributor nonBundleContributor = ContributorFactorySimple.createContributor("CETest"); //$NON-NLS-1$
+ String namespace = nonBundleContributor.getName();
+ processXMLContribution(nonBundleContributor, getXML("CERemovalTest.xml")); //$NON-NLS-1$
+
+ IExtensionPoint extensionPointA = simpleRegistry.getExtensionPoint(qualifiedName(namespace, "PointA")); //$NON-NLS-1$
+ assertNotNull(extensionPointA);
+ IExtension[] extensionsA = extensionPointA.getExtensions();
+ assertTrue(extensionsA.length == 2);
+
+ // check first extension
+ IExtension ext1 = extensionPointA.getExtension(qualifiedName(namespace, "TestExtensionA1")); //$NON-NLS-1$
+ assertNotNull(ext1);
+ IConfigurationElement[] ces11 = ext1.getConfigurationElements(); // this will be used later
+ assertNotNull(ces11);
+ assertEquals(1, ces11.length);
+ String[] attrs1 = ces11[0].getAttributeNames();
+ assertNotNull(attrs1);
+ assertEquals(1, attrs1.length);
+ assertEquals("class", attrs1[0]); //$NON-NLS-1$
+ IConfigurationElement[] ces12 = ces11[0].getChildren(); // this will be used later
+ assertNotNull(ces12);
+ assertEquals(1, ces12.length);
+ String[] attrs2 = ces12[0].getAttributeNames();
+ assertNotNull(attrs2);
+ assertEquals(1, attrs2.length);
+ assertEquals("value", attrs2[0]); //$NON-NLS-1$
+
+ // check second extension
+ IExtension ext2 = extensionPointA.getExtension(qualifiedName(namespace, "TestExtensionA2")); //$NON-NLS-1$
+ assertNotNull(ext2);
+ IConfigurationElement[] ces21 = ext2.getConfigurationElements(); // this will be used later
+ IConfigurationElement[] ces22 = ces21[0].getChildren(); // this will be used later
+ String[] attrs22 = ces22[0].getAttributeNames();
+ assertNotNull(attrs22);
+ assertEquals(1, attrs22.length);
+ assertEquals("value", attrs22[0]); //$NON-NLS-1$
+
+ // remove extension1
+ // listener to verify that valid CEs are included in the notification
+ IRegistryChangeListener listener = event -> {
+ IExtensionDelta[] deltas = event.getExtensionDeltas();
+ assertTrue(deltas.length == 1);
+ for (IExtensionDelta delta : deltas) {
+ assertTrue(delta.getKind() == IExtensionDelta.REMOVED);
+ IExtension extension = delta.getExtension();
+ assertNotNull(extension);
+
+ IConfigurationElement[] l_ces11 = extension.getConfigurationElements();
+ assertNotNull(l_ces11);
+ assertEquals(1, l_ces11.length);
+ String[] l_attrs1 = l_ces11[0].getAttributeNames();
+ assertNotNull(l_attrs1);
+ assertEquals(1, l_attrs1.length);
+ assertEquals("class", l_attrs1[0]); //$NON-NLS-1$
+ IConfigurationElement[] l_ces12 = l_ces11[0].getChildren();
+ assertNotNull(l_ces12);
+ assertEquals(1, l_ces12.length);
+ String[] l_attrs2 = l_ces12[0].getAttributeNames();
+ assertNotNull(l_attrs2);
+ assertEquals(1, l_attrs2.length);
+ assertEquals("value", l_attrs2[0]); //$NON-NLS-1$
+ }
+ };
+
+ //SimpleRegistryListener listener = new SimpleRegistryListener() {};
+ simpleRegistry.addRegistryChangeListener(listener);
+ try {
+ simpleRegistry.removeExtension(ext1, userToken);
+ } finally {
+ simpleRegistry.removeRegistryChangeListener(listener);
+ }
+
+ // basic checks
+ IExtension[] extensionsRemoved = extensionPointA.getExtensions();
+ assertTrue(extensionsRemoved.length == 1);
+
+ // re-check configuration elements
+ boolean exceptionFound = false;
+ try {
+ ces11[0].getAttributeNames(); // should produce an exception
+ } catch (InvalidRegistryObjectException e) {
+ exceptionFound = true;
+ }
+ assertTrue(exceptionFound);
+
+ exceptionFound = false;
+ try {
+ ces12[0].getAttributeNames(); // should produce an exception
+ } catch (InvalidRegistryObjectException e) {
+ exceptionFound = true;
+ }
+
+ assertTrue(exceptionFound);
+ // the non-removed extension CEs should still be valid
+ String[] attrs22removed = ces22[0].getAttributeNames();
+ assertNotNull(attrs22removed);
+ assertEquals(1, attrs22removed.length);
+ assertEquals("value", attrs22removed[0]); //$NON-NLS-1$
+ }
+
+ private void fillRegistry(IContributor contributor) {
+ processXMLContribution(contributor, getXML("RemovalTest.xml")); //$NON-NLS-1$
+ }
+
+ private void checkRegistryFull(String namespace) {
+ IExtensionPoint extensionPointA = simpleRegistry.getExtensionPoint(qualifiedName(namespace, pointA));
+ assertNotNull(extensionPointA);
+ IExtensionPoint extensionPointB = simpleRegistry.getExtensionPoint(qualifiedName(namespace, pointB));
+ assertNotNull(extensionPointB);
+ IExtension[] extensionsA = extensionPointA.getExtensions();
+ assertTrue(extensionsA.length == 2);
+ IExtension[] extensionsB = extensionPointB.getExtensions();
+ assertTrue(extensionsB.length == 2);
+ }
+
+ private void remove(String namespace) {
+ IExtensionPoint extensionPointB = simpleRegistry.getExtensionPoint(qualifiedName(namespace, pointB));
+ assertTrue(simpleRegistry.removeExtensionPoint(extensionPointB, userToken));
+
+ IExtension extension = simpleRegistry.getExtension(qualifiedName(namespace, extensionA1));
+ assertTrue(simpleRegistry.removeExtension(extension, userToken));
+ }
+
+ private void checkRegistryRemoved(String namespace) {
+ IExtensionPoint extensionPointA = simpleRegistry.getExtensionPoint(qualifiedName(namespace, pointA));
+ assertNotNull(extensionPointA);
+ IExtensionPoint extensionPointB = simpleRegistry.getExtensionPoint(qualifiedName(namespace, pointB));
+ assertNull(extensionPointB);
+ IExtension[] extensionsA = extensionPointA.getExtensions();
+ assertTrue(extensionsA.length == 1);
+ String Id = extensionsA[0].getUniqueIdentifier();
+ assertTrue(qualifiedName(namespace, extensionA2).equals(Id));
+ }
+
+ private void checkListener(SimpleRegistryListener listener) {
+ IRegistryChangeEvent event = listener.getEvent(5000);
+ IExtensionDelta[] deltas = event.getExtensionDeltas();
+ assertTrue(deltas.length == 2);
+ for (IExtensionDelta delta : deltas) {
+ assertTrue(delta.getKind() == IExtensionDelta.REMOVED);
+ assertNotNull(delta.getExtension());
+ assertNotNull(delta.getExtensionPoint());
+ }
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/DuplicatePointsTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/DuplicatePointsTest.java
new file mode 100644
index 0000000..7e42064
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/DuplicatePointsTest.java
@@ -0,0 +1,95 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple;
+
+import java.io.File;
+import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.spi.RegistryStrategy;
+import org.eclipse.equinox.common.tests.registry.simple.utils.HiddenLogRegistryStrategy;
+
+/**
+ * Tests addition of extensions and extension points with duplicate IDs.
+ * The duplicate extension points should be ignored.
+ * The duplicate extensions should be added.
+ * The rest of the XML contribution should not be affected.
+ *
+ * @since 3.2
+ */
+public class DuplicatePointsTest extends BaseExtensionRegistryRun {
+
+ private final static String errMsg1 = "Error: Ignored duplicate extension point \"testDuplicates.duplicateExtensionPoint\" supplied by \"2\"." + "Warning: Extensions supplied by \"2\" and \"1\" have the same Id: \"testDuplicates.duplicateExtension\".";
+ private final static String errMsg2 = "Error: Ignored duplicate extension point \"testSame.duplicateExtensionPointSame\" supplied by \"3\"." + "Warning: Extensions supplied by \"3\" and \"3\" have the same Id: \"testSame.duplicateExtensionSame\".";
+
+ public DuplicatePointsTest() {
+ super();
+ }
+
+ public DuplicatePointsTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Use registry strategy with modified logging
+ * @return - open extension registry
+ */
+ @Override
+ protected IExtensionRegistry startRegistry() {
+ // use plugin's metadata directory to save cache data
+ IPath userDataPath = getStateLocation();
+ File[] registryLocations = new File[] {new File(userDataPath.toOSString())};
+ boolean[] readOnly = new boolean[] {false};
+ RegistryStrategy registryStrategy = new HiddenLogRegistryStrategy(registryLocations, readOnly);
+ return RegistryFactory.createRegistry(registryStrategy, masterToken, userToken);
+ }
+
+ public void testDuplicates() {
+ HiddenLogRegistryStrategy.output = ""; //$NON-NLS-1$
+ IContributor contributor1 = ContributorFactorySimple.createContributor("1"); //$NON-NLS-1$
+ processXMLContribution(contributor1, getXML("DuplicatePoints1.xml")); //$NON-NLS-1$
+
+ IContributor contributor2 = ContributorFactorySimple.createContributor("2"); //$NON-NLS-1$
+ processXMLContribution(contributor2, getXML("DuplicatePoints2.xml")); //$NON-NLS-1$
+
+ checkRegistryDifferent("testDuplicates"); //$NON-NLS-1$
+
+ HiddenLogRegistryStrategy.output = ""; //$NON-NLS-1$
+ IContributor contributor3 = ContributorFactorySimple.createContributor("3"); //$NON-NLS-1$
+ processXMLContribution(contributor3, getXML("DuplicatePointsSame.xml")); //$NON-NLS-1$
+
+ checkRegistrySame("testSame"); //$NON-NLS-1$
+ }
+
+ private void checkRegistryDifferent(String namespace) {
+ assertTrue(errMsg1.equals(HiddenLogRegistryStrategy.output));
+
+ IExtensionPoint[] extensionPoints = simpleRegistry.getExtensionPoints(namespace);
+ assertTrue(extensionPoints.length == 2);
+
+ IExtension[] extensions = simpleRegistry.getExtensions(namespace);
+ assertTrue(extensions.length == 3);
+
+ IExtension extension = simpleRegistry.getExtension(qualifiedName(namespace, "nonDuplicateExtension")); //$NON-NLS-1$
+ assertNotNull(extension);
+ }
+
+ private void checkRegistrySame(String namespace) {
+ assertTrue(errMsg2.equals(HiddenLogRegistryStrategy.output));
+
+ IExtensionPoint[] extensionPoints = simpleRegistry.getExtensionPoints(namespace);
+ assertTrue(extensionPoints.length == 1);
+
+ IExtension[] extensions = simpleRegistry.getExtensions(namespace);
+ assertTrue(extensions.length == 2);
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/MergeContributionTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/MergeContributionTest.java
new file mode 100644
index 0000000..eb86624
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/MergeContributionTest.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple;
+
+import org.eclipse.core.runtime.*;
+
+/**
+ * Tests merging static and dynamic contributions.
+ *
+ * @since 3.2
+ */
+public class MergeContributionTest extends BaseExtensionRegistryRun {
+
+ public MergeContributionTest() {
+ super();
+ }
+
+ public MergeContributionTest(String name) {
+ super(name);
+ }
+
+ public void testMergeStaticDynamic() {
+ // Test with non-bundle contributor
+ IContributor nonBundleContributor = ContributorFactorySimple.createContributor("ABC"); //$NON-NLS-1$
+ String namespace = nonBundleContributor.getName();
+
+ fillRegistryStatic(nonBundleContributor);
+ checkRegistry(namespace, 3);
+ fillRegistryDynamic(nonBundleContributor);
+ checkRegistry(namespace, 6);
+
+ stopRegistry();
+ simpleRegistry = startRegistry();
+
+ checkRegistry(namespace, 3);
+ fillRegistryDynamic(nonBundleContributor);
+ checkRegistry(namespace, 6);
+ }
+
+ private void fillRegistryStatic(IContributor contributor) {
+ processXMLContribution(contributor, getXML("MergeStatic.xml"), true); //$NON-NLS-1$
+ }
+
+ private void fillRegistryDynamic(IContributor contributor) {
+ processXMLContribution(contributor, getXML("MergeDynamic.xml"), false); //$NON-NLS-1$
+ }
+
+ private void checkRegistry(String namespace, int expectedExtensions) {
+ IExtensionPoint extensionPoint = simpleRegistry.getExtensionPoint(qualifiedName(namespace, "MergeStatic")); //$NON-NLS-1$
+ assertNotNull(extensionPoint);
+ IExtension[] extensions = simpleRegistry.getExtensions(namespace);
+ assertNotNull(extensions);
+ assertEquals(expectedExtensions, extensions.length);
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/SimpleRegistryTests.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/SimpleRegistryTests.java
new file mode 100644
index 0000000..9d92193
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/SimpleRegistryTests.java
@@ -0,0 +1,34 @@
+/*******************************************************************************
+ * Copyright (c) 2018 Julian Honnen
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * Julian Honnen - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple;
+
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(Suite.class)
+@SuiteClasses({
+ XMLExtensionCreateTest.class,
+ DirectExtensionCreateTest.class,
+ XMLExecutableExtensionTest.class,
+ DirectExtensionCreateTwoRegistriesTest.class,
+ TokenAccessTest.class,
+ XMLExtensionCreateEclipseTest.class,
+ DirectExtensionRemoveTest.class,
+ MergeContributionTest.class,
+ DuplicatePointsTest.class
+})
+public class SimpleRegistryTests {
+ // intentionally left blank
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/TokenAccessTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/TokenAccessTest.java
new file mode 100644
index 0000000..14bbd70
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/TokenAccessTest.java
@@ -0,0 +1,72 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple;
+
+import junit.framework.TestCase;
+import org.eclipse.core.runtime.IExtensionRegistry;
+import org.eclipse.core.runtime.RegistryFactory;
+
+/**
+ * Tests registry token-based access rules.
+ * @since 3.2
+ */
+public class TokenAccessTest extends TestCase {
+
+ public TokenAccessTest() {
+ super();
+ }
+
+ public TokenAccessTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Tests token access to sensetive registry methods
+ */
+ public void testControlledAccess() {
+ Object tokenGood = new Object();
+ Object tokenBad = new Object();
+
+ // registry created with no token
+ IExtensionRegistry registry = RegistryFactory.createRegistry(null, null, null);
+ assertNotNull(registry);
+ // and stopped with no token - should be no exception
+ registry.stop(null);
+
+ // registry created with no token
+ registry = RegistryFactory.createRegistry(null, null, null);
+ assertNotNull(registry);
+ // and stopped with a bad - should be no exception
+ registry.stop(tokenBad);
+
+ // registry created with a good token
+ registry = RegistryFactory.createRegistry(null, tokenGood, null);
+ assertNotNull(registry);
+ // and stopped with a good token - should be no exception
+ registry.stop(tokenGood);
+
+ // registry created with a good token
+ registry = RegistryFactory.createRegistry(null, tokenGood, null);
+ assertNotNull(registry);
+ // and stopped with a bad token - should be an exception
+ boolean bException = false;
+ try {
+ registry.stop(tokenBad);
+ } catch (IllegalArgumentException e) {
+ // this is good; this is expected
+ bException = true;
+ }
+ assertTrue(bException);
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/XMLExecutableExtensionTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/XMLExecutableExtensionTest.java
new file mode 100644
index 0000000..990f58c
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/XMLExecutableExtensionTest.java
@@ -0,0 +1,80 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple;
+
+import java.io.File;
+import org.eclipse.core.runtime.*;
+import org.eclipse.core.runtime.spi.RegistryStrategy;
+import org.eclipse.equinox.common.tests.registry.simple.utils.ExeExtensionStrategy;
+import org.eclipse.equinox.common.tests.registry.simple.utils.ExecutableRegistryObject;
+
+/**
+ * Tests that executable extensions present in the simple registry actually
+ * gets processed.
+ * @since 3.2
+ */
+public class XMLExecutableExtensionTest extends BaseExtensionRegistryRun {
+
+ public XMLExecutableExtensionTest() {
+ super();
+ }
+
+ public XMLExecutableExtensionTest(String name) {
+ super(name);
+ }
+
+ /**
+ * Provide own class loader to the registry executable element strategry
+ * @return - open extension registry
+ */
+ @Override
+ protected IExtensionRegistry startRegistry() {
+ // use plugin's metadata directory to save cache data
+ IPath userDataPath = getStateLocation();
+ File[] registryLocations = new File[] {new File(userDataPath.toOSString())};
+ boolean[] readOnly = new boolean[] {false};
+ RegistryStrategy registryStrategy = new ExeExtensionStrategy(registryLocations, readOnly);
+ return RegistryFactory.createRegistry(registryStrategy, masterToken, userToken);
+ }
+
+ public void testExecutableExtensionCreation() {
+ // Test with non-bundle contributor
+ IContributor nonBundleContributor = ContributorFactorySimple.createContributor("ABC"); //$NON-NLS-1$
+ assertFalse(ExecutableRegistryObject.createCalled);
+
+ fillRegistry(nonBundleContributor);
+ assertFalse(ExecutableRegistryObject.createCalled);
+
+ checkRegistry(nonBundleContributor.getName());
+ assertTrue(ExecutableRegistryObject.createCalled);
+ }
+
+ private void fillRegistry(IContributor contributor) {
+ processXMLContribution(contributor, getXML("ExecutableExtension.xml")); //$NON-NLS-1$
+ }
+
+ private void checkRegistry(String namespace) {
+ IConfigurationElement[] elements = simpleRegistry.getConfigurationElementsFor(qualifiedName(namespace, "XMLExecutableExtPoint")); //$NON-NLS-1$
+ assertTrue(elements.length == 1);
+ for (IConfigurationElement element : elements) {
+ try {
+ Object object = element.createExecutableExtension("class"); //$NON-NLS-1$
+ assertNotNull(object);
+ } catch (CoreException e) {
+ assertTrue(false);
+ e.printStackTrace();
+ }
+ }
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/XMLExtensionCreateEclipseTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/XMLExtensionCreateEclipseTest.java
new file mode 100644
index 0000000..38f2845
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/XMLExtensionCreateEclipseTest.java
@@ -0,0 +1,59 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple;
+
+import java.io.IOException;
+import java.net.URL;
+import org.eclipse.core.internal.registry.ExtensionRegistry;
+import org.eclipse.core.runtime.*;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.FrameworkUtil;
+
+/**
+ * Check dynamic contribution into the Eclipse registry itself.
+ * @since 3.2
+ */
+public class XMLExtensionCreateEclipseTest extends BaseExtensionRegistryRun {
+
+ public void testDynamicContribution() {
+ // specify this bundle as a contributor
+ Bundle thisBundle = FrameworkUtil.getBundle(getClass());
+ IContributor thisContributor = ContributorFactoryOSGi.createContributor(thisBundle);
+ fillRegistry(thisContributor);
+ checkRegistry(thisContributor.getName());
+ }
+
+ private void fillRegistry(IContributor contributor) {
+ try {
+ Object userKey = ((ExtensionRegistry) RegistryFactory.getRegistry()).getTemporaryUserToken();
+ URL xmlURL = getXML("DynamicExtension.xml"); //$NON-NLS-1$
+ RegistryFactory.getRegistry().addContribution(xmlURL.openStream(), contributor, false, xmlURL.getFile(), null, userKey);
+ } catch (IOException eFile) {
+ fail(eFile.getMessage());
+ return;
+ }
+ }
+
+ private void checkRegistry(String namespace) {
+ IExtensionRegistry eclipseRegistry = RegistryFactory.getRegistry();
+ String uniqueId = qualifiedName(namespace, "XMLDirectExtPoint"); //$NON-NLS-1$
+ IExtensionPoint dynamicExtensionPoint = eclipseRegistry.getExtensionPoint(uniqueId);
+ assertNotNull(dynamicExtensionPoint);
+ IConfigurationElement[] elements = eclipseRegistry.getConfigurationElementsFor(uniqueId);
+ assertTrue(elements.length == 1);
+ for (IConfigurationElement element : elements) {
+ assertTrue("org.eclipse.equinox.common.tests.registry.simple.utils.ExecutableRegistryObject".equals(element.getAttribute("class")));
+ }
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/XMLExtensionCreateTest.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/XMLExtensionCreateTest.java
new file mode 100644
index 0000000..94d1e76
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/XMLExtensionCreateTest.java
@@ -0,0 +1,106 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple;
+
+import org.eclipse.core.runtime.*;
+import org.eclipse.equinox.common.tests.registry.simple.utils.SimpleRegistryListener;
+
+/**
+ * Tests addition of extension point and the extension to the registry via
+ * XML contribution. Makes sure that items are actually added; checks
+ * listener notification; reloads registry from cache and re-checks the data.
+ *
+ * @since 3.2
+ */
+public class XMLExtensionCreateTest extends BaseExtensionRegistryRun {
+
+ public XMLExtensionCreateTest() {
+ super();
+ }
+
+ public XMLExtensionCreateTest(String name) {
+ super(name);
+ }
+
+ public void testExtensionPointAddition() {
+ SimpleRegistryListener listener = new SimpleRegistryListener();
+ listener.register(simpleRegistry);
+
+ // Test with non-bundle contributor
+ IContributor nonBundleContributor = ContributorFactorySimple.createContributor("ABC"); //$NON-NLS-1$
+ fillRegistry(nonBundleContributor);
+
+ String namespace = nonBundleContributor.getName();
+ checkListener(namespace, listener);
+ checkRegistry(nonBundleContributor.getName());
+
+ listener.unregister(simpleRegistry);
+
+ // check the cache: stop -> re-start
+ stopRegistry();
+ startRegistry();
+ checkRegistry(nonBundleContributor.getName());
+ }
+
+ private void fillRegistry(IContributor contributor) {
+ // Add extension point
+ processXMLContribution(contributor, getXML("ExtensionPoint.xml")); //$NON-NLS-1$
+ // Add extension
+ processXMLContribution(contributor, getXML("Extension.xml")); //$NON-NLS-1$
+ }
+
+ private void checkRegistry(String namespace) {
+ IExtensionPoint extensionPoint = simpleRegistry.getExtensionPoint(qualifiedName(namespace, "XMLDirectExtPoint")); //$NON-NLS-1$
+ assertNotNull(extensionPoint);
+ IExtension[] namespaceExtensions = simpleRegistry.getExtensions(namespace);
+ assertNotNull(namespaceExtensions);
+ assertTrue(namespaceExtensions.length == 1);
+ IExtension[] extensions = extensionPoint.getExtensions();
+ assertNotNull(extensions);
+ assertTrue(extensions.length == 1);
+ for (IExtension extension : extensions) {
+ String extensionId = extension.getUniqueIdentifier();
+ assertTrue(extensionId.equals(qualifiedName(namespace, "XMLDirectExtensionID"))); //$NON-NLS-1$
+ String extensionNamespace = extension.getNamespaceIdentifier();
+ assertTrue(extensionNamespace.equals(namespace));
+ String extensionContributor = extension.getContributor().getName();
+ assertTrue(extensionContributor.equals(namespace));
+ IConfigurationElement[] configElements = extension.getConfigurationElements();
+ assertNotNull(configElements);
+ for (IConfigurationElement configElement : configElements) {
+ String configElementName = configElement.getName();
+ assertTrue(configElementName.equals("StorageDevice")); //$NON-NLS-1$
+ String[] attributeNames = configElement.getAttributeNames();
+ assertTrue(attributeNames.length == 1);
+ IConfigurationElement[] configElementChildren = configElement.getChildren();
+ assertTrue(configElementChildren.length == 2);
+ }
+ }
+ }
+
+ private void checkListener(String namespace, SimpleRegistryListener listener) {
+ IRegistryChangeEvent event = listener.getEvent(5000);
+ IExtensionDelta[] deltas = event.getExtensionDeltas();
+ assertTrue(deltas.length == 1); // only one notification
+ for (IExtensionDelta delta : deltas) {
+ assertTrue(delta.getKind() == IExtensionDelta.ADDED);
+ IExtensionPoint theExtensionPoint = delta.getExtensionPoint();
+ IExtension theExtension = delta.getExtension();
+ String Id1 = theExtension.getExtensionPointUniqueIdentifier();
+ String Id2 = theExtensionPoint.getUniqueIdentifier();
+ assertTrue(Id1.equals(Id2)); // check connectivity
+ assertTrue(Id1.equals(qualifiedName(namespace, "XMLDirectExtPoint"))); //$NON-NLS-1$
+ }
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/utils/ExeExtensionStrategy.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/utils/ExeExtensionStrategy.java
new file mode 100644
index 0000000..5884237
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/utils/ExeExtensionStrategy.java
@@ -0,0 +1,53 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2018 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ * Alexander Kurtakov <akurtako@redhat.com> - bug 458490
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple.utils;
+
+import java.io.File;
+import org.eclipse.core.runtime.spi.RegistryContributor;
+import org.eclipse.core.runtime.spi.RegistryStrategy;
+
+/**
+ * Registry strategy that uses class loader from this bundle to process executable
+ * extensions.
+ * @since 3.2
+ */
+public class ExeExtensionStrategy extends RegistryStrategy {
+
+ public ExeExtensionStrategy(File[] theStorageDir, boolean[] cacheReadOnly) {
+ super(theStorageDir, cacheReadOnly);
+ }
+
+ @Override
+ public Object createExecutableExtension(RegistryContributor defaultContributor, String className, String requestedContributorName) {
+ Class<?> classInstance = null;
+ try {
+ classInstance = Class.forName(className);
+ } catch (ClassNotFoundException e1) {
+ e1.printStackTrace();
+ return null;
+ }
+
+ // create a new instance
+ Object result = null;
+ try {
+ result = classInstance.getDeclaredConstructor().newInstance();
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ return null;
+ }
+
+ return result;
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/utils/ExecutableRegistryObject.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/utils/ExecutableRegistryObject.java
new file mode 100644
index 0000000..a939392
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/utils/ExecutableRegistryObject.java
@@ -0,0 +1,39 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple.utils;
+
+import org.eclipse.core.runtime.*;
+
+/**
+ * Test class for the executable extensions.
+ * @since 3.2
+ */
+public class ExecutableRegistryObject implements IExecutableExtensionFactory {
+
+ public static boolean createCalled = false;
+
+ public ExecutableRegistryObject() {
+ // intentionally left empty
+ }
+
+ @Override
+ public Object create() throws CoreException {
+ if (createCalled) {
+ Status status = new Status(IStatus.ERROR, "org.eclipse.core.tests.runtime", 0, "Duplicate executable extension call.", null); //$NON-NLS-1$ //$NON-NLS-2$
+ throw new CoreException(status);
+ }
+ createCalled = true;
+ return new ExecutableRegistryObject();
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/utils/HiddenLogRegistryStrategy.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/utils/HiddenLogRegistryStrategy.java
new file mode 100644
index 0000000..513e779
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/utils/HiddenLogRegistryStrategy.java
@@ -0,0 +1,79 @@
+/*******************************************************************************
+ * Copyright (c) 2006, 2015 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple.utils;
+
+import java.io.File;
+import org.eclipse.core.internal.registry.RegistryMessages;
+import org.eclipse.core.runtime.IStatus;
+import org.eclipse.core.runtime.spi.RegistryStrategy;
+
+/**
+ * Registry strategy that keeps log output in an accessible string.
+ * @since 3.2
+ */
+public class HiddenLogRegistryStrategy extends RegistryStrategy {
+
+ public static String output;
+
+ public HiddenLogRegistryStrategy(File[] theStorageDir, boolean[] cacheReadOnly) {
+ super(theStorageDir, cacheReadOnly);
+ }
+
+ @Override
+ public boolean debug() {
+ return true;
+ }
+
+ @Override
+ public void log(IStatus status) {
+ log(status, null);
+ }
+
+ // Same as RegistryStrategy, but logs into String
+ public void log(IStatus status, String prefix) {
+ String message = status.getMessage();
+ int severity = status.getSeverity();
+
+ String statusMsg;
+ switch (severity) {
+ case IStatus.ERROR :
+ statusMsg = RegistryMessages.log_error;
+ break;
+ case IStatus.WARNING :
+ statusMsg = RegistryMessages.log_warning;
+ break;
+ default :
+ statusMsg = RegistryMessages.log_log;
+ break;
+ }
+ statusMsg += message;
+
+ if (prefix != null)
+ statusMsg = prefix + statusMsg;
+ output += statusMsg;
+
+ // print out children as well
+ IStatus[] children = status.getChildren();
+ if (children.length != 0) {
+ String newPrefix;
+ if (prefix == null)
+ newPrefix = "\t"; //$NON-NLS-1$
+ else
+ newPrefix = prefix + "\t"; //$NON-NLS-1$
+ for (IStatus child : children) {
+ log(child, newPrefix);
+ }
+ }
+ }
+}
diff --git a/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/utils/SimpleRegistryListener.java b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/utils/SimpleRegistryListener.java
new file mode 100644
index 0000000..f801dc4
--- /dev/null
+++ b/bundles/org.eclipse.equinox.common.tests/src/org/eclipse/equinox/common/tests/registry/simple/utils/SimpleRegistryListener.java
@@ -0,0 +1,62 @@
+/*******************************************************************************
+ * Copyright (c) 2005, 2015 IBM Corporation and others.
+ *
+ * This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License 2.0
+ * which accompanies this distribution, and is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ * Alexander Kurtakov <akurtako@redhat.com> - bug 458490
+ *******************************************************************************/
+package org.eclipse.equinox.common.tests.registry.simple.utils;
+
+import java.util.LinkedList;
+import java.util.List;
+import org.eclipse.core.runtime.*;
+
+/**
+ * Allows test cases to wait for event notification so they can make assertions on the event.
+ * Similar to org.eclipse.core.tests.harness.TestRegistryChangeListener.
+ * @since 3.2
+ */
+public class SimpleRegistryListener implements IRegistryChangeListener {
+
+ private List<IRegistryChangeEvent> events = new LinkedList<>();
+
+ @Override
+ public synchronized void registryChanged(IRegistryChangeEvent newEvent) {
+ events.add(newEvent);
+ notify();
+ }
+
+ /**
+ * Returns the first event that is received, blocking for at most <code>timeout</code> milliseconds.
+ * Returns <code>null</code> if a event was not received for the time allowed.
+ *
+ * @param timeout the maximum time to wait in milliseconds. If zero, this method will
+ * block until an event is received
+ * @return the first event received, or <code>null</code> if none was received
+ */
+ public synchronized IRegistryChangeEvent getEvent(long timeout) {
+ if (!events.isEmpty())
+ return events.remove(0);
+ try {
+ wait(timeout);
+ } catch (InterruptedException e) {
+ // nothing to do
+ }
+ return events.isEmpty() ? null : events.remove(0);
+ }
+
+ public void register(IExtensionRegistry registry) {
+ registry.addRegistryChangeListener(this);
+ }
+
+ public void unregister(IExtensionRegistry registry) {
+ registry.removeRegistryChangeListener(this);
+ }
+}
