Skip to main content
aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jdt.core.tests.compiler/src/org/eclipse
diff options
context:
space:
mode:
authorOlivier Thomann2010-01-04 15:14:24 +0000
committerOlivier Thomann2010-01-04 15:14:24 +0000
commit645b7eff21d5db2b90380f1d4478beb9fa33f107 (patch)
treefd55e180487ca39dce9bd248ceaa4f55e51e39b2 /org.eclipse.jdt.core.tests.compiler/src/org/eclipse
parent616a41b14ead174db92c630ec6ed7f1d666a9b67 (diff)
downloadeclipse.jdt.core-645b7eff21d5db2b90380f1d4478beb9fa33f107.tar.gz
eclipse.jdt.core-645b7eff21d5db2b90380f1d4478beb9fa33f107.tar.xz
eclipse.jdt.core-645b7eff21d5db2b90380f1d4478beb9fa33f107.zip
HEAD - Fix for 296998
Diffstat (limited to 'org.eclipse.jdt.core.tests.compiler/src/org/eclipse')
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AssignmentTest.java2
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java8
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/Deprecated15Test.java1
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/DeprecatedTest.java3
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ExternalizeStringLiteralsTest.java1
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/FlowAnalysisTest.java1
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java2
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java4
-rw-r--r--org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java1
9 files changed, 17 insertions, 6 deletions
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AssignmentTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AssignmentTest.java
index 5df20e7fab..b44f4cb41c 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AssignmentTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/AssignmentTest.java
@@ -1909,6 +1909,7 @@ public void test066() {
" if ((i = 3) != i) {\n" +
" System.out.println(\"The second warning is just.\");\n" +
" }\n" +
+ " return false;\n" +
" }\n" +
"}"
},
@@ -1939,6 +1940,7 @@ public void test067() {
" if ((s = \"\") != s) {\n" +
" System.out.println(\"The second warning is just.\");\n" +
" }\n" +
+ " return false;\n" +
" }\n" +
"}"
},
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java
index c66cb68cce..4fc57fa13d 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/BatchCompilerTest.java
@@ -1584,8 +1584,10 @@ public void test012(){
" default)\n" +
" -log <file> log to a file. If the file extension is ''.xml'', then\n" +
" the log will be a xml file.\n" +
- " -proceedOnError do not stop at first error, dumping class files with\n" +
- " problem methods\n" +
+ " -proceedOnError[:Fatal]\n" +
+ " do not stop at first error, dumping class files with\n" +
+ " problem methods\n" +
+ " With \":Fatal\", all optional errors are treated as fatal\n" +
" -verbose enable verbose output\n" +
" -referenceInfo compute reference info\n" +
" -progress show progress (only in -log mode)\n" +
@@ -1796,7 +1798,7 @@ public void test012b(){
" <option key=\"org.eclipse.jdt.core.compiler.problem.emptyStatement\" value=\"ignore\"/>\n" +
" <option key=\"org.eclipse.jdt.core.compiler.problem.enumIdentifier\" value=\"warning\"/>\n" +
" <option key=\"org.eclipse.jdt.core.compiler.problem.fallthroughCase\" value=\"ignore\"/>\n" +
- " <option key=\"org.eclipse.jdt.core.compiler.problem.fatalOptionalError\" value=\"enabled\"/>\n" +
+ " <option key=\"org.eclipse.jdt.core.compiler.problem.fatalOptionalError\" value=\"disabled\"/>\n" +
" <option key=\"org.eclipse.jdt.core.compiler.problem.fieldHiding\" value=\"ignore\"/>\n" +
" <option key=\"org.eclipse.jdt.core.compiler.problem.finalParameterBound\" value=\"warning\"/>\n" +
" <option key=\"org.eclipse.jdt.core.compiler.problem.finallyBlockNotCompletingNormally\" value=\"warning\"/>\n" +
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/Deprecated15Test.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/Deprecated15Test.java
index 85480a86bc..d470213e14 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/Deprecated15Test.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/Deprecated15Test.java
@@ -110,6 +110,7 @@ public void test001() {
public void test002() {
Map customOptions = new HashMap();
customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
+ customOptions.put(CompilerOptions.OPTION_ReportNullReference, CompilerOptions.IGNORE);
this.runNegativeTest(
true,
new String[] {
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/DeprecatedTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/DeprecatedTest.java
index 0e0b93203e..66b05dc2ed 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/DeprecatedTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/DeprecatedTest.java
@@ -563,6 +563,7 @@ public void test014() {
public void test015() {
Map customOptions = new HashMap();
customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
+ customOptions.put(CompilerOptions.OPTION_ReportNullReference, CompilerOptions.IGNORE);
runNegativeTest(
// test directory preparation
true /* flush output directory */,
@@ -614,6 +615,7 @@ public void test015() {
public void test016() {
Map customOptions = new HashMap();
customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
+ customOptions.put(CompilerOptions.OPTION_ReportNullReference, CompilerOptions.IGNORE);
runNegativeTest(
// test directory preparation
true /* flush output directory */,
@@ -699,6 +701,7 @@ public void test018() {
Map customOptions = new HashMap();
customOptions.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
customOptions.put(CompilerOptions.OPTION_ReportDeprecationInDeprecatedCode, CompilerOptions.ERROR);
+ customOptions.put(CompilerOptions.OPTION_ReportNullReference, CompilerOptions.IGNORE);
this.runConformTest(
new String[] {
"a/N1.java",
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ExternalizeStringLiteralsTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ExternalizeStringLiteralsTest.java
index eeae9ffec3..49b593e75c 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ExternalizeStringLiteralsTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/ExternalizeStringLiteralsTest.java
@@ -531,6 +531,7 @@ public void test015() {
public void test016() {
Map customOptions = getCompilerOptions();
customOptions.put(CompilerOptions.OPTION_ReportNonExternalizedStringLiteral, CompilerOptions.ERROR);
+ customOptions.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.IGNORE);
runNegativeTest(
// test directory preparation
true /* flush output directory */,
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/FlowAnalysisTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/FlowAnalysisTest.java
index 20e1317ea3..aeb1c4083d 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/FlowAnalysisTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/FlowAnalysisTest.java
@@ -669,6 +669,7 @@ public void test021() {
public void test022() {
Map options = getCompilerOptions();
options.put(CompilerOptions.OPTION_ReportEmptyStatement, CompilerOptions.ERROR);
+ options.put(CompilerOptions.OPTION_ReportDeadCode, CompilerOptions.IGNORE);
runNegativeTest(
// test directory preparation
true /* flush output directory */,
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java
index 2bf321515c..d25b7d7939 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocBugsTest.java
@@ -8084,7 +8084,7 @@ public void testBug254825b() {
"X.java",
"class X {\n" +
" /** @see #o */\n" +
- " public Object foo(Object o) {}\n" +
+ " public Object foo(Object o) { return null; }\n" +
"}\n"
},
"----------\n" +
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java
index 4fce037828..a6a74448ba 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTestForClass.java
@@ -1014,7 +1014,7 @@ public class JavadocTestForClass extends JavadocTest {
" * </ul>\n" +
" */\n" +
"public interface X extends Map {\n" +
- " int i;\n" +
+ " int i = 0;\n" +
"}\n",
},
"----------\n" +
@@ -1086,7 +1086,7 @@ public class JavadocTestForClass extends JavadocTest {
" * </ul>\n" +
" */\n" +
"public interface X extends Map {\n" +
- " Entry e;\n" +
+ " Entry e = null;\n" +
"}\n",
},
"----------\n" +
diff --git a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java
index b7e6edc3e5..99f3a2e027 100644
--- a/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java
+++ b/org.eclipse.jdt.core.tests.compiler/src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest_1_5.java
@@ -71,6 +71,7 @@ public class JavadocTest_1_5 extends JavadocTest {
options.put(CompilerOptions.OPTION_ReportSyntheticAccessEmulation, CompilerOptions.IGNORE);
options.put(CompilerOptions.OPTION_ReportDeprecation, CompilerOptions.ERROR);
options.put(CompilerOptions.OPTION_ReportUnusedImport, CompilerOptions.ERROR);
+ options.put(CompilerOptions.OPTION_ReportUnusedPrivateMember, CompilerOptions.IGNORE);
return options;
}
/* (non-Javadoc)

Back to the top