diff --git a/com.ibm.wala.cast.java.jdt.test/.classpath b/com.ibm.wala.cast.java.jdt.test/.classpath index c6801e043..d154f35ab 100644 --- a/com.ibm.wala.cast.java.jdt.test/.classpath +++ b/com.ibm.wala.cast.java.jdt.test/.classpath @@ -1,6 +1,6 @@ - + diff --git a/com.ibm.wala.cast.java.jdt.test/.settings/org.eclipse.jdt.core.prefs b/com.ibm.wala.cast.java.jdt.test/.settings/org.eclipse.jdt.core.prefs index f9a0f529d..e3c6f72ae 100644 --- a/com.ibm.wala.cast.java.jdt.test/.settings/org.eclipse.jdt.core.prefs +++ b/com.ibm.wala.cast.java.jdt.test/.settings/org.eclipse.jdt.core.prefs @@ -1,258 +1,263 @@ -#Mon Apr 13 10:03:21 EDT 2009 -eclipse.preferences.version=1 -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_enum_constant=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 -org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_assignment=0 -org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 -org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 -org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 -org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 -org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 -org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 -org.eclipse.jdt.core.formatter.alignment_for_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.blank_lines_after_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_after_package=1 -org.eclipse.jdt.core.formatter.blank_lines_before_field=1 -org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 -org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 -org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 -org.eclipse.jdt.core.formatter.blank_lines_before_method=1 -org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 -org.eclipse.jdt.core.formatter.blank_lines_before_package=0 -org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 -org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 -org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line -org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false -org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false -org.eclipse.jdt.core.formatter.comment.format_block_comments=true -org.eclipse.jdt.core.formatter.comment.format_header=false -org.eclipse.jdt.core.formatter.comment.format_html=true -org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true -org.eclipse.jdt.core.formatter.comment.format_line_comments=true -org.eclipse.jdt.core.formatter.comment.format_source_code=true -org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true -org.eclipse.jdt.core.formatter.comment.indent_root_tags=true -org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert -org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert -org.eclipse.jdt.core.formatter.comment.line_length=132 -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.format_guardian_clause_on_one_line=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_local_variable=insert -org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_opening_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert -org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert -org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert -org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert -org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert -org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert -org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert -org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert -org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert -org.eclipse.jdt.core.formatter.insert_space_after_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_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_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_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_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_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_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.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=132 -org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false -org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false -org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 -org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 -org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true -org.eclipse.jdt.core.formatter.tabulation.char=space -org.eclipse.jdt.core.formatter.tabulation.size=2 -org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false -org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true +#Mon Jul 27 15:51:58 MDT 2009 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5 +org.eclipse.jdt.core.compiler.compliance=1.5 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.5 +org.eclipse.jdt.core.formatter.align_type_members_on_columns=false +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_method_invocation=16 +org.eclipse.jdt.core.formatter.alignment_for_arguments_in_qualified_allocation_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_assignment=0 +org.eclipse.jdt.core.formatter.alignment_for_binary_expression=16 +org.eclipse.jdt.core.formatter.alignment_for_compact_if=16 +org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=80 +org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0 +org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=16 +org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_constructor_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_parameters_in_method_declaration=16 +org.eclipse.jdt.core.formatter.alignment_for_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.blank_lines_after_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_after_package=1 +org.eclipse.jdt.core.formatter.blank_lines_before_field=1 +org.eclipse.jdt.core.formatter.blank_lines_before_first_class_body_declaration=0 +org.eclipse.jdt.core.formatter.blank_lines_before_imports=1 +org.eclipse.jdt.core.formatter.blank_lines_before_member_type=1 +org.eclipse.jdt.core.formatter.blank_lines_before_method=1 +org.eclipse.jdt.core.formatter.blank_lines_before_new_chunk=1 +org.eclipse.jdt.core.formatter.blank_lines_before_package=0 +org.eclipse.jdt.core.formatter.blank_lines_between_import_groups=1 +org.eclipse.jdt.core.formatter.blank_lines_between_type_declarations=1 +org.eclipse.jdt.core.formatter.brace_position_for_annotation_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_anonymous_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_array_initializer=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_block_in_case=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_constructor_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_constant=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_enum_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_method_declaration=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_switch=end_of_line +org.eclipse.jdt.core.formatter.brace_position_for_type_declaration=end_of_line +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_block_comment=false +org.eclipse.jdt.core.formatter.comment.clear_blank_lines_in_javadoc_comment=false +org.eclipse.jdt.core.formatter.comment.format_block_comments=true +org.eclipse.jdt.core.formatter.comment.format_header=false +org.eclipse.jdt.core.formatter.comment.format_html=true +org.eclipse.jdt.core.formatter.comment.format_javadoc_comments=true +org.eclipse.jdt.core.formatter.comment.format_line_comments=true +org.eclipse.jdt.core.formatter.comment.format_source_code=true +org.eclipse.jdt.core.formatter.comment.indent_parameter_description=true +org.eclipse.jdt.core.formatter.comment.indent_root_tags=true +org.eclipse.jdt.core.formatter.comment.insert_new_line_before_root_tags=insert +org.eclipse.jdt.core.formatter.comment.insert_new_line_for_parameter=do not insert +org.eclipse.jdt.core.formatter.comment.line_length=132 +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.format_guardian_clause_on_one_line=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_local_variable=insert +org.eclipse.jdt.core.formatter.insert_new_line_after_annotation_on_member=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_opening_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_at_end_of_file_if_missing=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_catch_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_closing_brace_in_array_initializer=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_else_in_if_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_finally_in_try_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_before_while_in_do_statement=do not insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_annotation_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_anonymous_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_block=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_constant=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_enum_declaration=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_method_body=insert +org.eclipse.jdt.core.formatter.insert_new_line_in_empty_type_declaration=insert +org.eclipse.jdt.core.formatter.insert_space_after_and_in_type_parameter=insert +org.eclipse.jdt.core.formatter.insert_space_after_assignment_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_at_in_annotation_type_declaration=do not insert +org.eclipse.jdt.core.formatter.insert_space_after_binary_operator=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_angle_bracket_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_brace_in_block=insert +org.eclipse.jdt.core.formatter.insert_space_after_closing_paren_in_cast=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_assert=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_case=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_conditional=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_for=insert +org.eclipse.jdt.core.formatter.insert_space_after_colon_in_labeled_statement=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_allocation_expression=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_annotation=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_array_initializer=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_constructor_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_constant_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_enum_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_explicitconstructorcall_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_increments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_for_inits=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_declaration_throws=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_method_invocation_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_field_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_multiple_local_declarations=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_parameterized_type_reference=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_superinterfaces=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_arguments=insert +org.eclipse.jdt.core.formatter.insert_space_after_comma_in_type_parameters=insert +org.eclipse.jdt.core.formatter.insert_space_after_ellipsis=insert +org.eclipse.jdt.core.formatter.insert_space_after_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_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_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_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_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_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_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.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=132 +org.eclipse.jdt.core.formatter.never_indent_block_comments_on_first_column=false +org.eclipse.jdt.core.formatter.never_indent_line_comments_on_first_column=false +org.eclipse.jdt.core.formatter.number_of_blank_lines_at_beginning_of_method_body=0 +org.eclipse.jdt.core.formatter.number_of_empty_lines_to_preserve=1 +org.eclipse.jdt.core.formatter.put_empty_statement_on_new_line=true +org.eclipse.jdt.core.formatter.tabulation.char=space +org.eclipse.jdt.core.formatter.tabulation.size=2 +org.eclipse.jdt.core.formatter.use_tabs_only_for_leading_indentations=false +org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true diff --git a/com.ibm.wala.cast.java.jdt.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.jdt.test/META-INF/MANIFEST.MF index ba1176235..a7c7841c1 100644 --- a/com.ibm.wala.cast.java.jdt.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.java.jdt.test/META-INF/MANIFEST.MF @@ -12,10 +12,11 @@ Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0", com.ibm.wala.core;bundle-version="1.1.3", com.ibm.wala.core.tests;bundle-version="1.1.3", com.ibm.wala.cast.java.jdt;bundle-version="1.0.0", - org.junit;bundle-version="3.8.2", org.eclipse.core.runtime, com.ibm.wala.ide;bundle-version="1.1.3", org.eclipse.core.resources;bundle-version="3.4.1", com.ibm.wala.ide.tests;bundle-version="1.1.3", - org.eclipse.jdt.core;bundle-version="3.4.2" + org.eclipse.jdt.core;bundle-version="3.4.2", + org.junit4;bundle-version="4.3.1" Bundle-ActivationPolicy: lazy +Bundle-RequiredExecutionEnvironment: J2SE-1.5 diff --git a/com.ibm.wala.cast.java.jdt.test/launchers/JDTJava15IRTests.launch b/com.ibm.wala.cast.java.jdt.test/launchers/JDTJava15IRTests.launch index ac5dbfc22..2314e8e51 100644 --- a/com.ibm.wala.cast.java.jdt.test/launchers/JDTJava15IRTests.launch +++ b/com.ibm.wala.cast.java.jdt.test/launchers/JDTJava15IRTests.launch @@ -23,7 +23,7 @@ - + diff --git a/com.ibm.wala.cast.java.jdt.test/launchers/JDTJavaIRTests.launch b/com.ibm.wala.cast.java.jdt.test/launchers/JDTJavaIRTests.launch index 4447e1713..79a80c11e 100644 --- a/com.ibm.wala.cast.java.jdt.test/launchers/JDTJavaIRTests.launch +++ b/com.ibm.wala.cast.java.jdt.test/launchers/JDTJavaIRTests.launch @@ -23,7 +23,7 @@ - + diff --git a/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java b/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java index 90131b9c5..b773d774c 100644 --- a/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java +++ b/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJava15IRTests.java @@ -13,6 +13,9 @@ import java.util.List; import junit.framework.Assert; import org.eclipse.core.runtime.NullProgressMonitor; +import org.junit.AfterClass; +import org.junit.BeforeClass; +import org.junit.Test; import com.ibm.wala.cast.java.client.JavaSourceAnalysisEngine; import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope; @@ -34,16 +37,17 @@ public class JDTJava15IRTests extends IRTests { } protected void populateScope(JavaSourceAnalysisEngine engine, Collection sources, List libs) throws IOException { - IDEIRTestUtil.populateScope(projectName, engine, sources, libs); + IDEIRTestUtil.populateScope(projectName, engine, sources, libs); } - - @Override - public void setUp() { + + @BeforeClass + public static void beforeClass() { EclipseTestUtil.importZippedProject(TestPlugin.getDefault(), "test_project.zip", new NullProgressMonitor()); System.err.println("finish importing project"); } - public void tearDown() { + @AfterClass + public static void afterClass() { EclipseTestUtil.destroyProject("com.ibm.wala.cast.java.test.data"); } @@ -70,82 +74,102 @@ public class JDTJava15IRTests extends IRTests { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), assertions, true); } + @Test public void testAnonGeneNullarySimple() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testAnonymousGenerics() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testBasicsGenerics() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testCocovariant() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testCustomGenericsAndFields() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testEnumSwitch() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testExplicitBoxingTest() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testGenericArrays() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testGenericMemberClasses() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testGenericSuperSink() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testMethodGenerics() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testMoreOverriddenGenerics() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testNotSoSimpleEnums() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testOverridesOnePointFour() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testSimpleEnums() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testSimpleEnums2() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testVarargs() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testVarargsCovariant() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testVarargsOverriding() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } + @Test public void testWildcards() { runTest(singlePkgTestSrc("javaonepointfive"), rtJar, simplePkgTestEntryPoint("javaonepointfive"), emptyList, true); } diff --git a/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java b/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java index eb4a030c9..ccd22d263 100644 --- a/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java +++ b/com.ibm.wala.cast.java.jdt.test/source/com/ibm/wala/cast/java/test/JDTJavaIRTests.java @@ -44,6 +44,8 @@ import java.util.List; import junit.framework.Assert; import org.eclipse.core.runtime.NullProgressMonitor; +import org.junit.AfterClass; +import org.junit.BeforeClass; import com.ibm.wala.cast.java.client.JavaSourceAnalysisEngine; import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope; @@ -68,13 +70,14 @@ public class JDTJavaIRTests extends JavaIRTests { IDEIRTestUtil.populateScope(projectName, engine, sources, libs); } - @Override - public void setUp() { + @BeforeClass + public static void beforeClass() { EclipseTestUtil.importZippedProject(TestPlugin.getDefault(), "test_project.zip", new NullProgressMonitor()); System.err.println("finish importing project"); } - public void tearDown() { + @AfterClass + public static void afterClass() { EclipseTestUtil.destroyProject("com.ibm.wala.cast.java.test.data"); } diff --git a/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF b/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF index 8fc333b35..ecf54ac6b 100644 --- a/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF +++ b/com.ibm.wala.cast.java.polyglot.test/META-INF/MANIFEST.MF @@ -10,9 +10,9 @@ Require-Bundle: com.ibm.wala.cast;bundle-version="1.0.0", com.ibm.wala.cast.java.test;bundle-version="1.0.0", com.ibm.wala.core;bundle-version="1.1.3", com.ibm.wala.core.tests;bundle-version="1.1.3", - org.junit;bundle-version="3.8.2", org.eclipse.core.runtime, com.ibm.wala.cast.test;bundle-version="1.0.0", - com.ibm.wala.cast.java.polyglot;bundle-version="1.0.0" + com.ibm.wala.cast.java.polyglot;bundle-version="1.0.0", + org.junit4;bundle-version="4.3.1" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-ActivationPolicy: lazy diff --git a/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotJLexTest.launch b/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotJLexTest.launch index 2eea710b4..9d38fe098 100644 --- a/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotJLexTest.launch +++ b/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotJLexTest.launch @@ -11,7 +11,7 @@ - + diff --git a/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotJavaIRTests.launch b/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotJavaIRTests.launch index 64139a005..b38b725e9 100644 --- a/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotJavaIRTests.launch +++ b/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotJavaIRTests.launch @@ -10,7 +10,7 @@ - + diff --git a/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotSyncDuplicatorTest.launch b/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotSyncDuplicatorTest.launch index e744bfe25..b3ba81a41 100644 --- a/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotSyncDuplicatorTest.launch +++ b/com.ibm.wala.cast.java.polyglot.test/launchers/PolyglotSyncDuplicatorTest.launch @@ -10,7 +10,7 @@ - + diff --git a/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJLexTest.java b/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJLexTest.java index 57127a870..68eb9c914 100644 --- a/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJLexTest.java +++ b/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJLexTest.java @@ -20,6 +20,10 @@ public class PolyglotJLexTest extends JLexTest { public PolyglotJLexTest(String name) { super(name); } + + public PolyglotJLexTest() { + super("PolyglotJLexTest"); + } @Override protected JavaSourceAnalysisEngine getAnalysisEngine(final String[] mainClassDescriptors) { diff --git a/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJavaIRTests.java b/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJavaIRTests.java index 8cd31c49f..5d9b2f3e0 100644 --- a/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJavaIRTests.java +++ b/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotJavaIRTests.java @@ -20,6 +20,10 @@ public class PolyglotJavaIRTests extends JavaIRTests { public PolyglotJavaIRTests(String name) { super(name); } + + public PolyglotJavaIRTests() { + super("PolyglotJavaIRTests"); + } @Override protected JavaSourceAnalysisEngine getAnalysisEngine(final String[] mainClassDescriptors) { diff --git a/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotSyncDuplicatorTest.java b/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotSyncDuplicatorTest.java index 5c31d2abb..a3cd231c0 100644 --- a/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotSyncDuplicatorTest.java +++ b/com.ibm.wala.cast.java.polyglot.test/source/com/ibm/wala/cast/java/test/PolyglotSyncDuplicatorTest.java @@ -27,6 +27,10 @@ public class PolyglotSyncDuplicatorTest extends SyncDuplicatorTest { super(name); } + public PolyglotSyncDuplicatorTest() { + super("PolyglotSyncDuplicatorTest"); + } + protected JavaSourceAnalysisEngine getAnalysisEngine(final String[] mainClassDescriptors) { JavaSourceAnalysisEngine engine = new PolyglotJavaSourceAnalysisEngine() { protected Iterable makeDefaultEntrypoints(AnalysisScope scope, IClassHierarchy cha) { diff --git a/com.ibm.wala.cast.java.test/.launchConfigurations/com.ibm.wala.cast.java.test-JUnit.launch b/com.ibm.wala.cast.java.test/.launchConfigurations/com.ibm.wala.cast.java.test-JUnit.launch deleted file mode 100644 index 847f3ab65..000000000 --- a/com.ibm.wala.cast.java.test/.launchConfigurations/com.ibm.wala.cast.java.test-JUnit.launch +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/IRTests.java b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/IRTests.java index f49ce3556..f0e703647 100644 --- a/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/IRTests.java +++ b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/IRTests.java @@ -25,6 +25,9 @@ import java.util.Properties; import java.util.Set; import java.util.jar.JarFile; +import org.junit.Before; +import org.junit.runner.RunWith; + import junit.framework.Assert; import com.ibm.wala.cast.java.client.JavaSourceAnalysisEngine; @@ -52,12 +55,24 @@ import com.ibm.wala.util.collections.Pair; import com.ibm.wala.util.debug.Assertions; import com.ibm.wala.util.strings.Atom; +@RunWith(NameAwareTestClassRunner.class) public abstract class IRTests extends WalaTestCase { + protected String name; + public IRTests(String name, String projectName) { - super(name); + this.name = name; this.projectName = projectName; } + protected String getName() { + return name; + } + + @Before + public void before() { + this.name = NameAwareTestClassRunner.getTestName(); + } + protected final String projectName; protected static String javaHomePath; @@ -246,7 +261,7 @@ public abstract class IRTests extends WalaTestCase { return false; } } - + protected Collection singleTestSrc() { return Collections.singletonList(getTestSrcPath() + File.separator + singleJavaInputForTest()); } @@ -330,9 +345,8 @@ public abstract class IRTests extends WalaTestCase { /** * - * @param srcMethodDescriptor - * a full method descriptor of the form ldr#type#methName#methSig - * example: Source#Simple1#main#([Ljava/lang/String;)V + * @param srcMethodDescriptor a full method descriptor of the form ldr#type#methName#methSig example: + * Source#Simple1#main#([Ljava/lang/String;)V * @param cha * @return */ @@ -369,11 +383,7 @@ public abstract class IRTests extends WalaTestCase { return null; } - protected void populateScope(JavaSourceAnalysisEngine engine, - Collection sources, - List libs) - throws IOException - { + protected void populateScope(JavaSourceAnalysisEngine engine, Collection sources, List libs) throws IOException { boolean foundLib = false; for (String lib : libs) { File libFile = new File(lib); @@ -403,7 +413,7 @@ public abstract class IRTests extends WalaTestCase { protected String getTestSrcPath() { return testSrcPath; } - + protected String singleJavaInputForTest() { return getName().substring(4) + ".java"; } diff --git a/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JLexTest.java b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JLexTest.java index 2a4346bdc..5eb50ff98 100644 --- a/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JLexTest.java +++ b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JLexTest.java @@ -10,6 +10,8 @@ *****************************************************************************/ package com.ibm.wala.cast.java.test; +import org.junit.Test; + public abstract class JLexTest extends IRTests { public JLexTest(String name) { @@ -20,7 +22,7 @@ public abstract class JLexTest extends IRTests { return "JLex"; } - public void testJLex() { + @Test public void testJLex() { runTest(singleTestSrc(), rtJar, new String[] { "LJLex/Main" }, emptyList, false); } diff --git a/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java index 8c7c7c0c5..9fe67a35f 100644 --- a/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java +++ b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/JavaIRTests.java @@ -22,6 +22,8 @@ import java.util.Set; import junit.framework.Assert; +import org.junit.Test; + import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope; import com.ibm.wala.cast.java.ipa.slicer.AstJavaSlicer; import com.ibm.wala.cast.java.loader.JavaSourceLoaderImpl; @@ -62,7 +64,7 @@ public abstract class JavaIRTests extends IRTests { this(name, null); } - public void testSimple1() { + @Test public void testSimple1() { List assertions = Arrays.asList( new SourceMapAssertion("Source#Simple1#doStuff#(I)V", "prod", 24), @@ -77,7 +79,7 @@ public abstract class JavaIRTests extends IRTests { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), assertions, true); } - public void testTwoClasses() { + @Test public void testTwoClasses() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList( new IRAssertion() { @@ -103,7 +105,7 @@ public abstract class JavaIRTests extends IRTests { }), true); } - public void testInterfaceTest1() { + @Test public void testInterfaceTest1() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList( /** @@ -146,7 +148,7 @@ public abstract class JavaIRTests extends IRTests { }), true); } - public void testInheritance1() { + @Test public void testInheritance1() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList( /** * 'Derived' extends 'Base' @@ -174,7 +176,7 @@ public abstract class JavaIRTests extends IRTests { }), true); } - public void testArray1() { + @Test public void testArray1() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList( /** * 'foo' has four array instructions: - 2 SSAArrayLengthInstruction - 1 @@ -203,7 +205,7 @@ public abstract class JavaIRTests extends IRTests { }), true); } - public void testArrayLiteral1() { + @Test public void testArrayLiteral1() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList( /** * 'foo' has four array instructions: - 2 SSAArrayLengthInstruction - 1 @@ -224,7 +226,7 @@ public abstract class JavaIRTests extends IRTests { }), true); } - public void testArrayLiteral2() { + @Test public void testArrayLiteral2() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList( /** * int[] y= { 1, 2, 3, 4 } is represented in the IR as four array store @@ -280,13 +282,13 @@ public abstract class JavaIRTests extends IRTests { }), true); } - public void testInheritedField() { + @Test public void testInheritedField() { List edgeAssertionses = Arrays.asList(EdgeAssertions.make("Source#InheritedField#main#([Ljava/lang/String;)V", "Source#B#foo#()V"), EdgeAssertions.make("Source#InheritedField#main#([Ljava/lang/String;)V", "Source#B#bar#()V")); runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), edgeAssertionses, true); } - public void testQualifiedStatic() { + @Test public void testQualifiedStatic() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList( /** * @@ -310,7 +312,7 @@ public abstract class JavaIRTests extends IRTests { }), true); } - public void testStaticNesting() { + @Test public void testStaticNesting() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList( new IRAssertion() { @@ -336,11 +338,11 @@ public abstract class JavaIRTests extends IRTests { }), true); } - public void testCastFromNull() { + @Test public void testCastFromNull() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), new ArrayList(), true); } - public void testInnerClass() { + @Test public void testInnerClass() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList( new IRAssertion() { @@ -360,11 +362,11 @@ public abstract class JavaIRTests extends IRTests { }), true); } - public void testNullArrayInit() { + @Test public void testNullArrayInit() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), new ArrayList(), true); } - public void testInnerClassA() { + @Test public void testInnerClassA() { Pair x = runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), new ArrayList(), true); // can't do an IRAssertion() -- we need the pointer analysis @@ -422,7 +424,7 @@ public abstract class JavaIRTests extends IRTests { } - public void testInnerClassSuper() { + @Test public void testInnerClassSuper() { Pair x = runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), new ArrayList(), true); // can't do an IRAssertion() -- we need the pointer analysis @@ -452,7 +454,7 @@ public abstract class JavaIRTests extends IRTests { } - public void testLocalClass() { + @Test public void testLocalClass() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList( new IRAssertion() { @@ -492,7 +494,7 @@ public abstract class JavaIRTests extends IRTests { }), true); } - public void testAnonymousClass() { + @Test public void testAnonymousClass() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), Arrays.asList( new IRAssertion() { @@ -511,59 +513,59 @@ public abstract class JavaIRTests extends IRTests { }), true); } - public void testWhileTest1() { + @Test public void testWhileTest1() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } - public void testSwitch1() { + @Test public void testSwitch1() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } - public void testException1() { + @Test public void testException1() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } - public void testException2() { + @Test public void testException2() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } - public void testFinally1() { + @Test public void testFinally1() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } - public void testScoping1() { + @Test public void testScoping1() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } - public void testScoping2() { + @Test public void testScoping2() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } - public void testNonPrimaryTopLevel() { + @Test public void testNonPrimaryTopLevel() { runTest(singlePkgTestSrc("p"), rtJar, simplePkgTestEntryPoint("p"), emptyList, true); } - public void testMiniaturList() { + @Test public void testMiniaturList() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } - public void testMonitor() { + @Test public void testMonitor() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } - public void testStaticInitializers() { + @Test public void testStaticInitializers() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } - public void testThread1() { + @Test public void testThread1() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } - public void testCasts() { + @Test public void testCasts() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } - public void testBreaks() { + @Test public void testBreaks() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } @@ -577,7 +579,7 @@ public abstract class JavaIRTests extends IRTests { return MethodReference.findOrCreate(clsRef, nameAtom, descr); } - public void testMiniaturSliceBug() throws IllegalArgumentException, CancelException { + @Test public void testMiniaturSliceBug() throws IllegalArgumentException, CancelException { Pair x = runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); PointerAnalysis pa = (PointerAnalysis) x.snd; @@ -589,8 +591,8 @@ public abstract class JavaIRTests extends IRTests { Pair, SDG> y = AstJavaSlicer.computeAssertionSlice(cg, pa, roots, false); Collection slice = y.fst; SlicerTest.dumpSlice(slice); - assertEquals(0, SlicerTest.countAllocations(slice)); - assertEquals(1, SlicerTest.countPutfields(slice)); + Assert.assertEquals(0, SlicerTest.countAllocations(slice)); + Assert.assertEquals(1, SlicerTest.countPutfields(slice)); // test slice from main sliceRootRef = getSliceRootReference("MiniaturSliceBug", "main", "([Ljava/lang/String;)V"); @@ -598,8 +600,8 @@ public abstract class JavaIRTests extends IRTests { y = AstJavaSlicer.computeAssertionSlice(cg, pa, roots, false); slice = y.fst; SlicerTest.dumpSlice(slice); - assertEquals(2, SlicerTest.countAllocations(slice)); - assertEquals(2, SlicerTest.countPutfields(slice)); + Assert.assertEquals(2, SlicerTest.countAllocations(slice)); + Assert.assertEquals(2, SlicerTest.countPutfields(slice)); } } diff --git a/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/NameAwareTestClassRunner.java b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/NameAwareTestClassRunner.java new file mode 100644 index 000000000..ca7a7d4ca --- /dev/null +++ b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/NameAwareTestClassRunner.java @@ -0,0 +1 @@ +/****************************************************************************** * All rights reserved. This program and the accompanying materials * are made available under the terms of the Eclipse Public License v1.0 * which accompanies this distribution, and is available at * http://www.eclipse.org/legal/epl-v10.html *****************************************************************************/ package com.ibm.wala.cast.java.test; import org.junit.internal.runners.InitializationError; import org.junit.internal.runners.TestClassRunner; import org.junit.runner.Description; import org.junit.runner.notification.RunListener; import org.junit.runner.notification.RunNotifier; /** * This horrible kludge is used to get the old getName() Junit 3 functionality when running under JUnit 4. */ @SuppressWarnings("restriction") public class NameAwareTestClassRunner extends TestClassRunner { public NameAwareTestClassRunner(Class klass) throws InitializationError { super(klass); } private static String testName; protected static String getName() { return testName; } protected static void setName(final String name) { testName = name; } /** * get the name of the currently running test when using this runner. Similar to TestCase.getName() from JUnit 3. */ protected static String getTestName() { if (testName == null) return null; int last = testName.indexOf('('); if (last < 0) last = testName.length() + 1; return testName.substring(0, last); } private static class NameListener extends RunListener { public void testStarted(Description description) throws Exception { setName(description.isTest() ? description.getDisplayName() : null); } public void testFinished(Description description) throws Exception { if (getName() != null) if (getName().equals(description.getDisplayName())) setName(null); else throw new Exception("Test name mismatch"); } } public void run(final RunNotifier notifier) { notifier.addListener(new NameListener()); super.run(notifier); } } \ No newline at end of file diff --git a/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/SyncDuplicatorTest.java b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/SyncDuplicatorTest.java index dc7447326..a29951d94 100644 --- a/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/SyncDuplicatorTest.java +++ b/com.ibm.wala.cast.java.test/src/com/ibm/wala/cast/java/test/SyncDuplicatorTest.java @@ -10,6 +10,8 @@ *****************************************************************************/ package com.ibm.wala.cast.java.test; +import org.junit.Test; + import com.ibm.wala.cast.java.ipa.callgraph.JavaSourceAnalysisScope; import com.ibm.wala.classLoader.CallSiteReference; import com.ibm.wala.classLoader.Language; @@ -30,7 +32,7 @@ public abstract class SyncDuplicatorTest extends IRTests { .findOrCreate(JavaSourceAnalysisScope.SOURCE, TypeName.string2TypeName("LMonitor2")), Atom.findOrCreateUnicodeAtom("test"), Descriptor.findOrCreateUTF8(Language.JAVA, "(Ljava/lang/Object;)Z")), IInvokeInstruction.Dispatch.STATIC); - public void testMonitor2() { + @Test public void testMonitor2() { runTest(singleTestSrc(), rtJar, simpleTestEntryPoint(), emptyList, true); } diff --git a/com.ibm.wala.cast.java.test/testdata/test_project.zip b/com.ibm.wala.cast.java.test/testdata/test_project.zip deleted file mode 100644 index 619f6c95b..000000000 Binary files a/com.ibm.wala.cast.java.test/testdata/test_project.zip and /dev/null differ diff --git a/com.ibm.wala.cast.test/.launchConfigurations/com.ibm.wala.cast.test-JUnit.launch b/com.ibm.wala.cast.test/.launchConfigurations/com.ibm.wala.cast.test-JUnit.launch index e03f9e6f1..725660f21 100644 --- a/com.ibm.wala.cast.test/.launchConfigurations/com.ibm.wala.cast.test-JUnit.launch +++ b/com.ibm.wala.cast.test/.launchConfigurations/com.ibm.wala.cast.test-JUnit.launch @@ -1,17 +1,16 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstPattern.java b/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstPattern.java index 031a686ad..4e92cb4c5 100644 --- a/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstPattern.java +++ b/com.ibm.wala.cast.test/harness-src/com/ibm/wala/cast/test/TestCAstPattern.java @@ -18,6 +18,8 @@ import java.util.Map; import junit.framework.Assert; +import org.junit.Test; + import com.ibm.wala.cast.tree.CAstNode; import com.ibm.wala.cast.tree.impl.CAstImpl; import com.ibm.wala.cast.util.CAstPattern; @@ -101,7 +103,7 @@ public class TestCAstPattern extends WalaTestCase { simpleNameMap = Ast.testNameMap; } - public void testSimpleName() { + @Test public void testSimpleName() { test(simpleNamePattern, simpleNameAst, simpleNameMap); } @@ -121,7 +123,7 @@ public class TestCAstPattern extends WalaTestCase { simpleStarNameMap = Ast.testNameMap; } - public void testSimpleStarName() { + @Test public void testSimpleStarName() { test(simpleStarNamePattern, simpleStarNameAst, simpleStarNameMap); } @@ -141,7 +143,7 @@ public class TestCAstPattern extends WalaTestCase { simpleRepeatedMapOne = Ast.testNameMap; } - public void testSimpleRepeatedOne() { + @Test public void testSimpleRepeatedOne() { test(simpleRepeatedPattern, simpleRepeatedAstOne, simpleRepeatedMapOne); } @@ -160,7 +162,7 @@ public class TestCAstPattern extends WalaTestCase { simpleRepeatedMapTwo = Ast.testNameMap; } - public void testSimpleRepeatedTwo() { + @Test public void testSimpleRepeatedTwo() { test(simpleRepeatedPattern, simpleRepeatedAstTwo, simpleRepeatedMapTwo); } @@ -180,7 +182,7 @@ public class TestCAstPattern extends WalaTestCase { simpleRepeatedMapThree = Ast.testNameMap; } - public void testSimpleRepeatedThree() { + @Test public void testSimpleRepeatedThree() { test(simpleRepeatedPattern, simpleRepeatedAstThree, simpleRepeatedMapThree); } @@ -201,7 +203,7 @@ public class TestCAstPattern extends WalaTestCase { simpleDoubleStarMap = Ast.testNameMap; } - public void testSimpleDoubleStar() { + @Test public void testSimpleDoubleStar() { test(simpleDoubleStarPattern, simpleDoubleStarAst, simpleDoubleStarMap); } @@ -222,7 +224,7 @@ public class TestCAstPattern extends WalaTestCase { simpleAlternativeMap = Ast.testNameMap; } - public void testSimpleAlternative() { + @Test public void testSimpleAlternative() { test(simpleAlternativePattern, simpleAlternativeAst, simpleAlternativeMap); } @@ -243,7 +245,7 @@ public class TestCAstPattern extends WalaTestCase { simpleOptionalMapWith = Ast.testNameMap; } - public void testSimpleOptionalWith() { + @Test public void testSimpleOptionalWith() { test(simpleOptionalPattern, simpleOptionalAstWith, simpleOptionalMapWith); } @@ -261,7 +263,7 @@ public class TestCAstPattern extends WalaTestCase { simpleOptionalMapNot = Ast.testNameMap; } - public void testSimpleOptionalNot() { + @Test public void testSimpleOptionalNot() { test(simpleOptionalPattern, simpleOptionalAstNot, simpleOptionalMapNot); } @@ -283,7 +285,7 @@ public class TestCAstPattern extends WalaTestCase { recursiveTreeOneMap = Ast.testNameMap; } - public void testRecursiveTreeOne() { + @Test public void testRecursiveTreeOne() { test(recursiveTreePattern, recursiveTreeOneAst, recursiveTreeOneMap); } @@ -303,7 +305,7 @@ public class TestCAstPattern extends WalaTestCase { recursiveTreeTwoMap = Ast.testNameMap; } - public void testRecursiveTreeTwo() { + @Test public void testRecursiveTreeTwo() { test(recursiveTreePattern, recursiveTreeTwoAst, recursiveTreeTwoMap); } @@ -327,22 +329,22 @@ public class TestCAstPattern extends WalaTestCase { recursiveTreeFiveMap = Ast.testNameMap; } - public void testRecursiveTreeFive() { + @Test public void testRecursiveTreeFive() { test(recursiveTreePattern, recursiveTreeFiveAst, recursiveTreeFiveMap); } private final CAstPattern buggyRecursiveTreePattern = CAstPattern .parse("|({leaf}|(CONSTANT()||VAR(*))|||{node}BINARY_EXPR(\"+\",`leaf`,`node`))|"); - public void testBuggyRecursiveTreeOne() { + @Test public void testBuggyRecursiveTreeOne() { test(buggyRecursiveTreePattern, recursiveTreeOneAst, null); } - public void testBuggyRecursiveTreeTwo() { + @Test public void testBuggyRecursiveTreeTwo() { test(buggyRecursiveTreePattern, recursiveTreeTwoAst, null); } - public void testBuggyRecursiveTreeFive() { + @Test public void testBuggyRecursiveTreeFive() { test(buggyRecursiveTreePattern, recursiveTreeFiveAst, null); } @@ -351,15 +353,15 @@ public class TestCAstPattern extends WalaTestCase { private final CAstPattern testedTreePattern = CAstPattern.parse("{top}|(" + recursiveTreeStr + "||BINARY_EXPR(\",\"," + extraTestsStr + ",`top`))|"); - public void testTestedTreeOne() { + @Test public void testTestedTreeOne() { test(testedTreePattern, recursiveTreeOneAst, recursiveTreeOneMap); } - public void testTestedTreeTwo() { + @Test public void testTestedTreeTwo() { test(testedTreePattern, recursiveTreeTwoAst, recursiveTreeTwoMap); } - public void testTestedTreeFive() { + @Test public void testTestedTreeFive() { test(testedTreePattern, recursiveTreeFiveAst, recursiveTreeFiveMap); } @@ -379,7 +381,7 @@ public class TestCAstPattern extends WalaTestCase { testedTreeOneMap = Ast.testNameMap; } - public void testTestedTreeOneWithTest() { + @Test public void testTestedTreeOneWithTest() { test(testedTreePattern, testedTreeOneAst, testedTreeOneMap); }