[336271] JUnit fixes for defect verifications tests test311542 and test120018

tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/DefectVerificationTests.java

diff --git a/tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/DefectVerificationTests.java b/tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/DefectVerificationTests.java
index 0ac5e98..64d12ab 100644
--- a/tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/DefectVerificationTests.java
+++ b/tests/org.eclipse.jst.j2ee.tests/defect-tests/org/eclipse/jst/j2ee/defect/tests/DefectVerificationTests.java
@@ -53,6 +53,7 @@
 import org.eclipse.jst.j2ee.componentcore.util.EARArtifactEdit;
 import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentExportDataModelProperties;
 import org.eclipse.jst.j2ee.datamodel.properties.IEARComponentImportDataModelProperties;
+import org.eclipse.jst.j2ee.dependency.tests.util.DependencyUtil;
 import org.eclipse.jst.j2ee.dependency.tests.util.ProjectUtil;
 import org.eclipse.jst.j2ee.ejb.project.operations.IEjbFacetInstallDataModelProperties;
 import org.eclipse.jst.j2ee.internal.J2EEVersionConstants;
@@ -98,7 +99,6 @@
 public class DefectVerificationTests extends OperationTestCase {
 
 	public static String BASE_DATA_DIRECTORY = System.getProperty("user.dir") + java.io.File.separatorChar + "DefectTestData" + java.io.File.separatorChar;
-	private static final String TEST_DATA_PATH = System.getProperty("user.dir") + java.io.File.separatorChar + "TestData" + java.io.File.separatorChar;
 	
 	
 	private static String getDataPath(String suffix) {
@@ -209,6 +209,8 @@
 				Logger.getLogger().log(e);
 			}
 		}
+		
+		DependencyUtil.waitForComponentRefactoringJobs();
 
 		IJavaProject javaProject = JavaCore.create(component.getProject());
 		IClasspathEntry[] entries = javaProject.getRawClasspath();
@@ -763,7 +765,17 @@
 	}
 
 	private String getWarFile(String fileName) {
-		return TEST_DATA_PATH + "WARImportTests" + java.io.File.separatorChar + fileName;
+		try {
+			String testDataWARImportPath = "TestData" + fileSep + "WARImportTests" + fileSep + fileName;
+			HeadlessTestsPlugin plugin = HeadlessTestsPlugin.getDefault();
+			if (plugin != null) {
+				return ProjectUtility.getFullFileName(plugin, testDataWARImportPath);
+			}
+			return System.getProperty("user.dir") + java.io.File.separatorChar + testDataWARImportPath;
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+		return "";
 	}
 
 	private void checkIfModelIsParsed(WebApp deploymentDescriptor1) {