Author: akazakov Date: 2011-08-24 14:03:00 -0400 (Wed, 24 Aug 2011) New Revision: 34236 Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBTest.java trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorTestSetup.java trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java Log: https://issues.jboss.org/browse/JBIDE-9582 Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF 2011-08-24 17:43:31 UTC (rev 34235) +++ trunk/esb/tests/org.jboss.tools.esb.validator.test/META-INF/MANIFEST.MF 2011-08-24 18:03:00 UTC (rev 34236) @@ -15,5 +15,6 @@ org.jboss.tools.common, org.eclipse.ui, org.eclipse.jdt.core, - org.eclipse.ltk.core.refactoring + org.eclipse.ltk.core.refactoring, + org.jboss.tools.common.base.test Export-Package: org.jboss.tools.esb.validator.test Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBTest.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBTest.java 2011-08-24 17:43:31 UTC (rev 34235) +++ trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBTest.java 2011-08-24 18:03:00 UTC (rev 34236) @@ -5,15 +5,14 @@ import junit.framework.TestCase; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; 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.core.runtime.Platform; +import org.jboss.tools.common.base.test.validation.TestUtil; import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.esb.core.facet.IJBossESBFacetDataModelProperties; -import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; import org.osgi.framework.Bundle; @@ -24,27 +23,6 @@ protected static String WEB_CONTENT_SUFFIX = "/esbcontent"; - protected IProject project; - - public ESBTest() { - project = getTestProject(); - } - - public IProject getTestProject() { - if(project==null) { - try { - project = findTestProject(); - if(project==null || !project.exists()) { - project = importPreparedProject("/"); - } - } catch (Exception e) { - e.printStackTrace(); - fail("Can't import ESB test project: " + e.getMessage()); - } - } - return project; - } - public static IProject findTestProject() { return ResourcesPlugin.getWorkspace().getRoot().getProject(PROJECT_NAME); } @@ -61,12 +39,11 @@ } catch (CoreException e) { e.printStackTrace(); } - project.build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); + TestUtil._waitForValidation(project); ResourcesUtils.setBuildAutomatically(saveAutoBuild); return project; } - public static void assertLocationEquals(Set<? extends ITextSourceReference> references, int startPosition, int length) { for (ITextSourceReference reference : references) { if(reference.getStartPosition()==startPosition) { @@ -85,7 +62,4 @@ assertEquals("Wrong start position", startPosition, reference.getStartPosition()); assertEquals("Wrong length", length, reference.getLength()); } - - public static void cleanProject(String _resourcePath) throws Exception { - } } \ No newline at end of file Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorTestSetup.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorTestSetup.java 2011-08-24 17:43:31 UTC (rev 34235) +++ trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ESBValidatorTestSetup.java 2011-08-24 18:03:00 UTC (rev 34236) @@ -30,13 +30,12 @@ @Override protected void setUp() throws Exception { - project = ESBTest.findTestProject(); + project = ESBTest.importPreparedProject("/"); } @Override protected void tearDown() throws Exception { boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); - JobUtils.waitForIdle(); project.delete(true, true, null); JobUtils.waitForIdle(); ResourcesUtils.setBuildAutomatically(saveAutoBuild); Modified: trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java =================================================================== --- trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java 2011-08-24 17:43:31 UTC (rev 34235) +++ trunk/esb/tests/org.jboss.tools.esb.validator.test/src/org/jboss/tools/esb/validator/test/ValidationTest.java 2011-08-24 18:03:00 UTC (rev 34236) @@ -11,9 +11,9 @@ package org.jboss.tools.esb.validator.test; import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; import org.eclipse.core.resources.IResource; import org.jboss.tools.esb.validator.ESBValidatorMessages; -import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.tests.AbstractResourceMarkerTest; /** @@ -21,20 +21,13 @@ */ public class ValidationTest extends ESBTest { - public void test0() throws Exception { - JobUtils.waitForIdle(); - try { - Thread.sleep(2000); - } catch (InterruptedException e) { - - } - } /** * FTP Listener cannot reference FS Channel. * * @throws Exception */ public void testIncompatibleChannelReference() throws Exception { + IProject project = ESBTest.findTestProject(); IFile file = project.getFile("esbcontent/META-INF/jboss-esb-01.xml"); AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, ESBValidatorMessages.LISTENER_REFERENCES_INCOMPATIBLE_CHANNEL, 13); int markerNumbers = getMarkersNumber(file); @@ -42,6 +35,7 @@ } public void testBusenessRulesProcessor() throws Exception { + IProject project = ESBTest.findTestProject(); IFile file = project.getFile("esbcontent/META-INF/jboss-esb-brp-broken.xml"); //$NON-NLS-1$ AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, ESBValidatorMessages.INVALID_RULE_SET_FOR_RULE_LANGUAGE, 52); AbstractResourceMarkerTest.assertMarkerIsCreated(file, AbstractResourceMarkerTest.MARKER_TYPE, ESBValidatorMessages.INVALID_RULE_AUDIT_TYPE_AND_INTERVAL, 34); @@ -63,5 +57,4 @@ public static int getMarkersNumber(IResource resource) { return AbstractResourceMarkerTest.getMarkersNumberByGroupName(resource, null); } - } \ No newline at end of file