[jbosstools-commits] JBoss Tools SVN: r35554 - in trunk: tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests and 1 other directory.

[jbosstools-commits at lists.jboss.org]

Author: akazakov
Date: 2011-10-11 16:17:39 -0400 (Tue, 11 Oct 2011)
New Revision: 35554

Modified:
   trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
   trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
Log:
https://issues.jboss.org/browse/JBIDE-9880 org.jboss.tools.seam.core.test.SeamValidatorsTest failure

Modified: trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java
===================================================================
--- trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java	2011-10-11 19:35:49 UTC (rev 35553)
+++ trunk/seam/tests/org.jboss.tools.seam.core.test/src/org/jboss/tools/seam/core/test/SeamValidatorsTest.java	2011-10-11 20:17:39 UTC (rev 35554)
@@ -11,7 +11,6 @@
 package org.jboss.tools.seam.core.test;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.util.Set;
 
 import org.eclipse.core.resources.IFile;
@@ -21,12 +20,10 @@
 import org.eclipse.core.resources.IncrementalProjectBuilder;
 import org.eclipse.core.resources.ResourcesPlugin;
 import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.jface.preference.IPersistentPreferenceStore;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.wst.validation.internal.core.ValidationException;
 import org.jboss.tools.common.validation.IValidator;
-import org.jboss.tools.jst.web.kb.PageContextFactory;
 import org.jboss.tools.jst.web.kb.WebKbPlugin;
 import org.jboss.tools.jst.web.kb.internal.validation.ELValidationMessages;
 import org.jboss.tools.jst.web.kb.preferences.ELSeverityPreferences;
@@ -59,23 +56,15 @@
 		super(name);
 	}
 
-	protected void copyContentsFile(IFile originalFile, IFile newContentFile) throws CoreException{
-		PageContextFactory.getInstance().cleanUp(originalFile);
-		InputStream is = null;
-		try{
-			is = newContentFile.getContents();
-			originalFile.setContents(is, true, false, null);
-		} finally {
-			if(is!=null) {
-				try {
-					is.close();
-				} catch (IOException e) {
-					e.printStackTrace();
-				}
-			}
+	@Override
+	protected void copyContentsFile(IFile originalFile, IFile newContentFile) throws CoreException {
+		assertTrue(originalFile.exists());
+		assertTrue(newContentFile.exists());
+		super.copyContentsFile(originalFile, newContentFile);
+		if("xml".equalsIgnoreCase(originalFile.getFileExtension())) {
+			originalFile.setLocalTimeStamp(originalFile.getModificationStamp() + 3000);
 		}
-		originalFile.getProject().refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor());
-		originalFile.getProject().build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
+		project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
 	}
 
 	@Override
@@ -89,6 +78,7 @@
 					"SeamWebWarTestProject");
 			project = setup.importProject();
 		}
+		project.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, null);
 	}
 
 	@Override
@@ -252,6 +242,14 @@
 		validator.validate(targetFile);
 		assertTrue("Error marker not found", validator.isMessageCreated(markerTemplate, parameters));
 		assertTrue("Error marker has wrong line number", validator.isMessageCreatedOnLine(markerTemplate, parameters,lineNumber));
+//if(!validator.isMessageCreated(markerTemplate, parameters)) {
+//	System.out.println("!!!");
+////	testDuplicateComponents();
+//}
+//if(!validator.isMessageCreatedOnLine(markerTemplate, parameters,lineNumber)) {
+//	System.out.println("!!!");
+////	validator.validate(targetFile);
+//}
 	}
 
 	private void assertMarkerIsNotCreatedForFile(String target, String newContent, String markerTemplate,

Modified: trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java
===================================================================
--- trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java	2011-10-11 19:35:49 UTC (rev 35553)
+++ trunk/tests/plugins/org.jboss.tools.tests/src/org/jboss/tools/tests/AbstractResourceMarkerTest.java	2011-10-11 20:17:39 UTC (rev 35554)
@@ -75,11 +75,13 @@
 		copyContentsFile(originalFile, newContentFile);
 	}
 
-	protected void copyContentsFile(IFile originalFile, IFile newContentFile) throws CoreException{
+	protected void copyContentsFile(IFile originalFile, IFile newContentFile) throws CoreException {
+		assertTrue(originalFile.exists());
+		assertTrue(newContentFile.exists());
 		InputStream is = null;
 		try{
 			is = newContentFile.getContents();
-			originalFile.setContents(is, true, false, null);
+			originalFile.setContents(is, IFile.FORCE, null);
 		} finally {
 			if(is!=null) {
 				try {
@@ -93,7 +95,6 @@
 		JobUtils.waitForIdle();
 	}
 
-
 	public static int findMarkerLine(IResource resource, String type, String errorMessage, boolean pattern)
 			throws CoreException {
 		int number = -1;