### Eclipse Workspace Patch 1.0 #P org.eclipse.jdt.core.tests.compiler Index: src/org/eclipse/jdt/core/tests/junit/extension/TestCase.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/junit/extension/TestCase.java,v retrieving revision 1.39 diff -u -r1.39 TestCase.java --- src/org/eclipse/jdt/core/tests/junit/extension/TestCase.java 27 Jun 2008 16:04:47 -0000 1.39 +++ src/org/eclipse/jdt/core/tests/junit/extension/TestCase.java 31 Aug 2009 19:59:49 -0000 @@ -877,4 +877,20 @@ } } } +static public void assertSame(int expected, int actual) { + assertSame(null, expected, actual); +} +static public void assertSame(String message, int expected, int actual) { + if (expected == actual) + return; + failNotSame(message, expected, actual); +} +static public void failNotSame(String message, int expected, int actual) { + StringBuffer formatted= new StringBuffer(); + if (message != null) { + formatted.append(message).append(' '); + } + formatted.append("expected same:<").append(expected).append("> was not:<").append(actual).append(">"); + fail(String.valueOf(formatted)); +} } #P org.eclipse.jdt.core.tests.model Index: src/org/eclipse/jdt/core/tests/dom/ASTParserTest.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTParserTest.java,v retrieving revision 1.13 diff -u -r1.13 ASTParserTest.java --- src/org/eclipse/jdt/core/tests/dom/ASTParserTest.java 28 Apr 2009 17:49:27 -0000 1.13 +++ src/org/eclipse/jdt/core/tests/dom/ASTParserTest.java 31 Aug 2009 19:59:50 -0000 @@ -74,10 +74,10 @@ } public void testKConstants() { - assertTrue(ASTParser.K_EXPRESSION == 1); - assertTrue(ASTParser.K_STATEMENTS == 2); - assertTrue(ASTParser.K_CLASS_BODY_DECLARATIONS == 4); - assertTrue(ASTParser.K_COMPILATION_UNIT == 8); + assertSame(ASTParser.K_EXPRESSION, 1); + assertSame(ASTParser.K_STATEMENTS, 2); + assertSame(ASTParser.K_CLASS_BODY_DECLARATIONS, 4); + assertSame(ASTParser.K_COMPILATION_UNIT, 8); } public void testSetting() { Index: src/org/eclipse/jdt/core/tests/dom/ASTTest.java =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/src/org/eclipse/jdt/core/tests/dom/ASTTest.java,v retrieving revision 1.66 diff -u -r1.66 ASTTest.java --- src/org/eclipse/jdt/core/tests/dom/ASTTest.java 28 Apr 2009 17:49:27 -0000 1.66 +++ src/org/eclipse/jdt/core/tests/dom/ASTTest.java 31 Aug 2009 19:59:53 -0000 @@ -1278,8 +1278,8 @@ /** @deprecated using deprecated code */ public void testAST() { - assertTrue(AST.JLS2 == 2); - assertTrue(AST.JLS3 == 3); + assertSame(AST.JLS2, 2); + assertSame(AST.JLS3, 3); AST a0 = new AST(); // deprecated, but still 2.0 assertTrue(a0.apiLevel() == AST.JLS2); @@ -8350,18 +8350,18 @@ public void testModifiers() { // check all modifiers match their JVM spec values - assertTrue(Modifier.ABSTRACT == 0x0400); - assertTrue(Modifier.FINAL == 0x0010); - assertTrue(Modifier.NATIVE == 0x0100); - assertTrue(Modifier.NONE == 0x0000); - assertTrue(Modifier.PRIVATE == 0x0002); - assertTrue(Modifier.PROTECTED == 0x0004); - assertTrue(Modifier.PUBLIC == 0x0001); - assertTrue(Modifier.STATIC == 0x0008); - assertTrue(Modifier.STRICTFP == 0x0800); - assertTrue(Modifier.SYNCHRONIZED == 0x0020); - assertTrue(Modifier.TRANSIENT == 0x0080); - assertTrue(Modifier.VOLATILE == 0x0040); + assertSame(Modifier.ABSTRACT ,0x0400); + assertSame(Modifier.FINAL ,0x0010); + assertSame(Modifier.NATIVE ,0x0100); + assertSame(Modifier.NONE ,0x0000); + assertSame(Modifier.PRIVATE ,0x0002); + assertSame(Modifier.PROTECTED ,0x0004); + assertSame(Modifier.PUBLIC ,0x0001); + assertSame(Modifier.STATIC ,0x0008); + assertSame(Modifier.STRICTFP ,0x0800); + assertSame(Modifier.SYNCHRONIZED ,0x0020); + assertSame(Modifier.TRANSIENT ,0x0080); + assertSame(Modifier.VOLATILE ,0x0040); // check that all final int[] mods = @@ -8550,89 +8550,89 @@ public void testNodeTypeConstants() { // it would be a breaking API change to change the numeric values of // public static final ints - assertTrue(ASTNode.ANONYMOUS_CLASS_DECLARATION == 1); - assertTrue(ASTNode.ARRAY_ACCESS == 2); - assertTrue(ASTNode.ARRAY_CREATION == 3); - assertTrue(ASTNode.ARRAY_INITIALIZER == 4); - assertTrue(ASTNode.ARRAY_TYPE == 5); - assertTrue(ASTNode.ASSERT_STATEMENT == 6); - assertTrue(ASTNode.ASSIGNMENT == 7); - assertTrue(ASTNode.BLOCK == 8); - assertTrue(ASTNode.BOOLEAN_LITERAL == 9); - assertTrue(ASTNode.BREAK_STATEMENT == 10); - assertTrue(ASTNode.CAST_EXPRESSION == 11); - assertTrue(ASTNode.CATCH_CLAUSE == 12); - assertTrue(ASTNode.CHARACTER_LITERAL == 13); - assertTrue(ASTNode.CLASS_INSTANCE_CREATION == 14); - assertTrue(ASTNode.COMPILATION_UNIT == 15); - assertTrue(ASTNode.CONDITIONAL_EXPRESSION == 16); - assertTrue(ASTNode.CONSTRUCTOR_INVOCATION == 17); - assertTrue(ASTNode.CONTINUE_STATEMENT == 18); - assertTrue(ASTNode.DO_STATEMENT == 19); - assertTrue(ASTNode.EMPTY_STATEMENT == 20); - assertTrue(ASTNode.EXPRESSION_STATEMENT == 21); - assertTrue(ASTNode.FIELD_ACCESS == 22); - assertTrue(ASTNode.FIELD_DECLARATION == 23); - assertTrue(ASTNode.FOR_STATEMENT == 24); - assertTrue(ASTNode.IF_STATEMENT == 25); - assertTrue(ASTNode.IMPORT_DECLARATION == 26); - assertTrue(ASTNode.INFIX_EXPRESSION == 27); - assertTrue(ASTNode.INITIALIZER == 28); - assertTrue(ASTNode.JAVADOC == 29); - assertTrue(ASTNode.LABELED_STATEMENT == 30); - assertTrue(ASTNode.METHOD_DECLARATION == 31); - assertTrue(ASTNode.METHOD_INVOCATION == 32); - assertTrue(ASTNode.NULL_LITERAL == 33); - assertTrue(ASTNode.NUMBER_LITERAL == 34); - assertTrue(ASTNode.PACKAGE_DECLARATION == 35); - assertTrue(ASTNode.PARENTHESIZED_EXPRESSION == 36); - assertTrue(ASTNode.POSTFIX_EXPRESSION == 37); - assertTrue(ASTNode.PREFIX_EXPRESSION == 38); - assertTrue(ASTNode.PRIMITIVE_TYPE == 39); - assertTrue(ASTNode.QUALIFIED_NAME == 40); - assertTrue(ASTNode.RETURN_STATEMENT == 41); - assertTrue(ASTNode.SIMPLE_NAME == 42); - assertTrue(ASTNode.SIMPLE_TYPE == 43); - assertTrue(ASTNode.SINGLE_VARIABLE_DECLARATION == 44); - assertTrue(ASTNode.STRING_LITERAL == 45); - assertTrue(ASTNode.SUPER_CONSTRUCTOR_INVOCATION == 46); - assertTrue(ASTNode.SUPER_FIELD_ACCESS == 47); - assertTrue(ASTNode.SUPER_METHOD_INVOCATION == 48); - assertTrue(ASTNode.SWITCH_CASE == 49); - assertTrue(ASTNode.SWITCH_STATEMENT == 50); - assertTrue(ASTNode.SYNCHRONIZED_STATEMENT == 51); - assertTrue(ASTNode.THIS_EXPRESSION == 52); - assertTrue(ASTNode.THROW_STATEMENT == 53); - assertTrue(ASTNode.TRY_STATEMENT == 54); - assertTrue(ASTNode.TYPE_DECLARATION == 55); - assertTrue(ASTNode.TYPE_DECLARATION_STATEMENT == 56); - assertTrue(ASTNode.TYPE_LITERAL == 57); - assertTrue(ASTNode.VARIABLE_DECLARATION_EXPRESSION == 58); - assertTrue(ASTNode.VARIABLE_DECLARATION_FRAGMENT == 59); - assertTrue(ASTNode.VARIABLE_DECLARATION_STATEMENT == 60); - assertTrue(ASTNode.WHILE_STATEMENT == 61); - assertTrue(ASTNode.INSTANCEOF_EXPRESSION == 62); - assertTrue(ASTNode.LINE_COMMENT == 63); - assertTrue(ASTNode.BLOCK_COMMENT == 64); - assertTrue(ASTNode.TAG_ELEMENT == 65); - assertTrue(ASTNode.TEXT_ELEMENT == 66); - assertTrue(ASTNode.MEMBER_REF == 67); - assertTrue(ASTNode.METHOD_REF == 68); - assertTrue(ASTNode.METHOD_REF_PARAMETER == 69); - assertTrue(ASTNode.ENHANCED_FOR_STATEMENT == 70); - assertTrue(ASTNode.ENUM_DECLARATION == 71); - assertTrue(ASTNode.ENUM_CONSTANT_DECLARATION == 72); - assertTrue(ASTNode.TYPE_PARAMETER == 73); - assertTrue(ASTNode.PARAMETERIZED_TYPE == 74); - assertTrue(ASTNode.QUALIFIED_TYPE == 75); - assertTrue(ASTNode.WILDCARD_TYPE == 76); - assertTrue(ASTNode.NORMAL_ANNOTATION == 77); - assertTrue(ASTNode.MARKER_ANNOTATION == 78); - assertTrue(ASTNode.SINGLE_MEMBER_ANNOTATION == 79); - assertTrue(ASTNode.MEMBER_VALUE_PAIR == 80); - assertTrue(ASTNode.ANNOTATION_TYPE_DECLARATION == 81); - assertTrue(ASTNode.ANNOTATION_TYPE_MEMBER_DECLARATION == 82); - assertTrue(ASTNode.MODIFIER == 83); + assertSame(ASTNode.ANONYMOUS_CLASS_DECLARATION, 1); + assertSame(ASTNode.ARRAY_ACCESS, 2); + assertSame(ASTNode.ARRAY_CREATION, 3); + assertSame(ASTNode.ARRAY_INITIALIZER, 4); + assertSame(ASTNode.ARRAY_TYPE, 5); + assertSame(ASTNode.ASSERT_STATEMENT, 6); + assertSame(ASTNode.ASSIGNMENT, 7); + assertSame(ASTNode.BLOCK, 8); + assertSame(ASTNode.BOOLEAN_LITERAL, 9); + assertSame(ASTNode.BREAK_STATEMENT, 10); + assertSame(ASTNode.CAST_EXPRESSION, 11); + assertSame(ASTNode.CATCH_CLAUSE, 12); + assertSame(ASTNode.CHARACTER_LITERAL, 13); + assertSame(ASTNode.CLASS_INSTANCE_CREATION, 14); + assertSame(ASTNode.COMPILATION_UNIT, 15); + assertSame(ASTNode.CONDITIONAL_EXPRESSION, 16); + assertSame(ASTNode.CONSTRUCTOR_INVOCATION, 17); + assertSame(ASTNode.CONTINUE_STATEMENT, 18); + assertSame(ASTNode.DO_STATEMENT, 19); + assertSame(ASTNode.EMPTY_STATEMENT, 20); + assertSame(ASTNode.EXPRESSION_STATEMENT, 21); + assertSame(ASTNode.FIELD_ACCESS, 22); + assertSame(ASTNode.FIELD_DECLARATION, 23); + assertSame(ASTNode.FOR_STATEMENT, 24); + assertSame(ASTNode.IF_STATEMENT, 25); + assertSame(ASTNode.IMPORT_DECLARATION, 26); + assertSame(ASTNode.INFIX_EXPRESSION, 27); + assertSame(ASTNode.INITIALIZER, 28); + assertSame(ASTNode.JAVADOC, 29); + assertSame(ASTNode.LABELED_STATEMENT, 30); + assertSame(ASTNode.METHOD_DECLARATION, 31); + assertSame(ASTNode.METHOD_INVOCATION, 32); + assertSame(ASTNode.NULL_LITERAL, 33); + assertSame(ASTNode.NUMBER_LITERAL, 34); + assertSame(ASTNode.PACKAGE_DECLARATION, 35); + assertSame(ASTNode.PARENTHESIZED_EXPRESSION, 36); + assertSame(ASTNode.POSTFIX_EXPRESSION, 37); + assertSame(ASTNode.PREFIX_EXPRESSION, 38); + assertSame(ASTNode.PRIMITIVE_TYPE, 39); + assertSame(ASTNode.QUALIFIED_NAME, 40); + assertSame(ASTNode.RETURN_STATEMENT, 41); + assertSame(ASTNode.SIMPLE_NAME, 42); + assertSame(ASTNode.SIMPLE_TYPE, 43); + assertSame(ASTNode.SINGLE_VARIABLE_DECLARATION, 44); + assertSame(ASTNode.STRING_LITERAL, 45); + assertSame(ASTNode.SUPER_CONSTRUCTOR_INVOCATION, 46); + assertSame(ASTNode.SUPER_FIELD_ACCESS, 47); + assertSame(ASTNode.SUPER_METHOD_INVOCATION, 48); + assertSame(ASTNode.SWITCH_CASE, 49); + assertSame(ASTNode.SWITCH_STATEMENT, 50); + assertSame(ASTNode.SYNCHRONIZED_STATEMENT, 51); + assertSame(ASTNode.THIS_EXPRESSION, 52); + assertSame(ASTNode.THROW_STATEMENT, 53); + assertSame(ASTNode.TRY_STATEMENT, 54); + assertSame(ASTNode.TYPE_DECLARATION, 55); + assertSame(ASTNode.TYPE_DECLARATION_STATEMENT, 56); + assertSame(ASTNode.TYPE_LITERAL, 57); + assertSame(ASTNode.VARIABLE_DECLARATION_EXPRESSION, 58); + assertSame(ASTNode.VARIABLE_DECLARATION_FRAGMENT, 59); + assertSame(ASTNode.VARIABLE_DECLARATION_STATEMENT, 60); + assertSame(ASTNode.WHILE_STATEMENT, 61); + assertSame(ASTNode.INSTANCEOF_EXPRESSION, 62); + assertSame(ASTNode.LINE_COMMENT, 63); + assertSame(ASTNode.BLOCK_COMMENT, 64); + assertSame(ASTNode.TAG_ELEMENT, 65); + assertSame(ASTNode.TEXT_ELEMENT, 66); + assertSame(ASTNode.MEMBER_REF, 67); + assertSame(ASTNode.METHOD_REF, 68); + assertSame(ASTNode.METHOD_REF_PARAMETER, 69); + assertSame(ASTNode.ENHANCED_FOR_STATEMENT, 70); + assertSame(ASTNode.ENUM_DECLARATION, 71); + assertSame(ASTNode.ENUM_CONSTANT_DECLARATION, 72); + assertSame(ASTNode.TYPE_PARAMETER, 73); + assertSame(ASTNode.PARAMETERIZED_TYPE, 74); + assertSame(ASTNode.QUALIFIED_TYPE, 75); + assertSame(ASTNode.WILDCARD_TYPE, 76); + assertSame(ASTNode.NORMAL_ANNOTATION, 77); + assertSame(ASTNode.MARKER_ANNOTATION, 78); + assertSame(ASTNode.SINGLE_MEMBER_ANNOTATION, 79); + assertSame(ASTNode.MEMBER_VALUE_PAIR, 80); + assertSame(ASTNode.ANNOTATION_TYPE_DECLARATION, 81); + assertSame(ASTNode.ANNOTATION_TYPE_MEMBER_DECLARATION, 82); + assertSame(ASTNode.MODIFIER, 83); // ensure that all constants are distinct, positive, and small // (this may seem paranoid, but this test did uncover a stupid bug!) Index: .settings/org.eclipse.jdt.core.prefs =================================================================== RCS file: /cvsroot/eclipse/org.eclipse.jdt.core.tests.model/.settings/org.eclipse.jdt.core.prefs,v retrieving revision 1.15 diff -u -r1.15 org.eclipse.jdt.core.prefs --- .settings/org.eclipse.jdt.core.prefs 23 Jun 2009 09:29:34 -0000 1.15 +++ .settings/org.eclipse.jdt.core.prefs 31 Aug 2009 19:59:50 -0000 @@ -1,4 +1,4 @@ -#Tue Jun 23 14:52:59 IST 2009 +#Fri Nov 28 13:48:05 CET 2008 eclipse.preferences.version=1 org.eclipse.jdt.core.builder.cleanOutputFolder=clean org.eclipse.jdt.core.builder.duplicateResourceTask=warning @@ -19,7 +19,7 @@ org.eclipse.jdt.core.compiler.problem.annotationSuperInterface=warning org.eclipse.jdt.core.compiler.problem.assertIdentifier=warning org.eclipse.jdt.core.compiler.problem.autoboxing=ignore -org.eclipse.jdt.core.compiler.problem.comparingIdentical=ignore +org.eclipse.jdt.core.compiler.problem.comparingIdentical=warning org.eclipse.jdt.core.compiler.problem.deadCode=warning org.eclipse.jdt.core.compiler.problem.deprecation=warning org.eclipse.jdt.core.compiler.problem.deprecationInDeprecatedCode=disabled