Bug 522465: [9] Added test class to test suite and fixed other issuesI20171015-2000I20171015-0655I20171014-1500I20171013-2000

Change-Id: Icab82bebce7323a26ebe7aeeb79d49988cad6ef3

2 files changed, 23 insertions, 21 deletions

diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
index 4752a2a0b1..4c52e80efc 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest.java
@@ -74,6 +74,7 @@ public class QuickFixTest extends TestCase {
 
 	public static Test suite() {
 		TestSuite suite= new TestSuite(QuickFixTest.class.getName());
+		suite.addTest(QuickFixTest9.suite());
 		suite.addTest(QuickFixTest18.suite());
 		suite.addTest(SerialVersionQuickFixTest.suite());
 		suite.addTest(UtilitiesTest.suite());
diff --git a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest9.java b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest9.java
index 623982a771..f7843f667f 100644
--- a/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest9.java
+++ b/org.eclipse.jdt.ui.tests/ui/org/eclipse/jdt/ui/tests/quickfix/QuickFixTest9.java
@@ -11,7 +11,9 @@
 package org.eclipse.jdt.ui.tests.quickfix;

 

 import java.util.ArrayList;

+

 import org.eclipse.jdt.testplugin.JavaProjectHelper;

+

 import org.eclipse.core.runtime.CoreException;

 

 import org.eclipse.jdt.core.ICompilationUnit;

@@ -30,7 +32,6 @@ import org.eclipse.jdt.internal.ui.text.correction.CorrectionMessages;
 import junit.framework.Test;

 import junit.framework.TestSuite;

 

-

 public class QuickFixTest9 extends QuickFixTest {

 

 	private static final Class<QuickFixTest9> THIS= QuickFixTest9.class;

@@ -55,27 +56,22 @@ public class QuickFixTest9 extends QuickFixTest {
 	}

 

 	@Override

-	protected void setUp() throws Exception {

+	protected void setUp() throws CoreException {

 		fJProject2= JavaProjectHelper.createJavaProject("TestProject2", "bin");

 		JavaProjectHelper.set9CompilerOptions(fJProject2);

 		JavaProjectHelper.addRequiredProject(fJProject2, Java9ProjectTestSetup.getProject());

-		try {

-			IPackageFragmentRoot java9Src= JavaProjectHelper.addSourceContainer(fJProject2, "src");

-			IPackageFragment def= java9Src.createPackageFragment("", false, null);

-			IPackageFragment pkgFrag= java9Src.createPackageFragment("java.defaultProject", false, null);

-			StringBuffer buf= new StringBuffer();

-			buf.append("module java.defaultProject {\n");

-			buf.append("     exports java.defaultProject; \n");

-			buf.append("}\n");

-			def.createCompilationUnit("module-info.java", buf.toString(), false, null);

-			StringBuffer buf2= new StringBuffer();

-			buf2.append("package java.defaultProject; \n\n public class One { \n\n");

-			buf2.append("}\n");

-			pkgFrag.createCompilationUnit("One.java", buf2.toString(), false, null);

-		} catch (CoreException e) {

-			// TODO Auto-generated catch block

-			e.printStackTrace();

-		}

+		IPackageFragmentRoot java9Src= JavaProjectHelper.addSourceContainer(fJProject2, "src");

+		IPackageFragment def= java9Src.createPackageFragment("", false, null);

+		IPackageFragment pkgFrag= java9Src.createPackageFragment("java.defaultProject", false, null);

+		StringBuffer buf= new StringBuffer();

+		buf.append("module java.defaultProject {\n");

+		buf.append("     exports java.defaultProject; \n");

+		buf.append("}\n");

+		def.createCompilationUnit("module-info.java", buf.toString(), false, null);

+		StringBuffer buf2= new StringBuffer();

+		buf2.append("package java.defaultProject; \n\n public class One { \n\n");

+		buf2.append("}\n");

+		pkgFrag.createCompilationUnit("One.java", buf2.toString(), false, null);

 

 		fJProject1= JavaProjectHelper.createJavaProject("TestProject1", "bin");

 		JavaProjectHelper.set9CompilerOptions(fJProject1);

@@ -87,8 +83,13 @@ public class QuickFixTest9 extends QuickFixTest {
 

 	@Override

 	protected void tearDown() throws Exception {

-		JavaProjectHelper.delete(fJProject1);

-		JavaProjectHelper.delete(fJProject2);

+		if (fJProject1 != null) {

+			JavaProjectHelper.clear(fJProject1, Java9ProjectTestSetup.getDefaultClasspath());

+		}

+		if (fJProject2 != null) {

+			JavaProjectHelper.clear(fJProject2, Java9ProjectTestSetup.getDefaultClasspath());

+		}

+		super.tearDown();

 	}

 

 	public void testAddModuleRequiresAndImportProposal() throws Exception {