Author: akazakov Date: 2011-07-07 19:09:44 -0400 (Thu, 07 Jul 2011) New Revision: 32730 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java Log: https://issues.jboss.org/browse/JBIDE-9306 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-07-07 23:02:21 UTC (rev 32729) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/IncrementalValidationTest.java 2011-07-07 23:09:44 UTC (rev 32730) @@ -100,37 +100,36 @@ * @throws Exception */ public void testAlternativesInBeansXml() throws Exception { -// boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); -// JobUtils.waitForIdle(); -// -// try { -// IFile bean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/beansxml/incremental/Test3.java"); -// AbstractResourceMarkerTest.assertMarkerIsNotCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8); -// -// IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml"); -// IFile emptyBeansXml = tckProject.getFile("JavaSource/META-INF/beans.xml.empty"); -// -// ValidatorManager.setStatus("TESTING"); -// beansXml.setContents(emptyBeansXml.getContents(), IFile.FORCE, new NullProgressMonitor()); -// tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); -// TestUtil.waitForValidation(tckProject); -// -// AbstractResourceMarkerTest.assertMarkerIsCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8); -// -// IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative"); -// -// ValidatorManager.setStatus("TESTING"); -// beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor()); -// tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); -// TestUtil.waitForValidation(tckProject); -// -// AbstractResourceMarkerTest.assertMarkerIsNotCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8); -// } finally { -// IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml"); -// IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative"); -// beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor()); -// ResourcesUtils.setBuildAutomatically(saveAutoBuild); -// JobUtils.waitForIdle(); -// } + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); + + try { + IFile bean = tckProject.getFile("JavaSource/org/jboss/jsr299/tck/tests/jbt/validation/beansxml/incremental/Test3.java"); + AbstractResourceMarkerTest.assertMarkerIsNotCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8); + + IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml"); + IFile emptyBeansXml = tckProject.getFile("JavaSource/META-INF/beans.xml.empty"); + + ValidatorManager.setStatus("TESTING ALTERNATIVES 1"); + beansXml.setContents(emptyBeansXml.getContents(), IFile.FORCE, new NullProgressMonitor()); + tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); + TestUtil.waitForValidation(tckProject); + AbstractResourceMarkerTest.assertMarkerIsCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8); + + IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative"); + + ValidatorManager.setStatus("TESTING ALTERNATIVES 2"); + beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor()); + tckProject.build(IncrementalProjectBuilder.INCREMENTAL_BUILD, new NullProgressMonitor()); + TestUtil.waitForValidation(tckProject); + + AbstractResourceMarkerTest.assertMarkerIsNotCreated(bean, CDIValidationMessages.UNSATISFIED_INJECTION_POINTS, 8); + } finally { + IFile beansXml = tckProject.getFile("JavaSource/META-INF/beans.xml"); + IFile beansXmlWithAlternative = tckProject.getFile("JavaSource/META-INF/beans.xml.with.alternative"); + beansXml.setContents(beansXmlWithAlternative.getContents(), IFile.FORCE, new NullProgressMonitor()); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + JobUtils.waitForIdle(); + } } } \ No newline at end of file