[jbosstools-commits] JBoss Tools SVN: r33944 - in trunk/cdi/tests: org.jboss.tools.cdi.seam.config.core.test/META-INF and 13 other directories.

Author: akazakov Date: 2011-08-15 18:24:45 -0400 (Mon, 15 Aug 2011) New Revision: 33944 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTest.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/src/org/jboss/tools/cdi/seam/config/ui/test/CdiSeamConfigUIAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/CDISeamFacesCoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java Log: https://issues.jboss.org/browse/JBIDE-9533 Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTest.java 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/ValidationExceptionTest.java 2011-08-15 22:24:45 UTC (rev 33944) @@ -15,6 +15,8 @@ import junit.framework.TestCase; import org.eclipse.core.runtime.IStatus; +import org.jboss.tools.jst.web.kb.WebKbPlugin; +import org.jboss.tools.jst.web.kb.validation.KBValidationException; /** * @author Alexey Kazakov @@ -37,4 +39,10 @@ } assertTrue(error.toString(), exceptions.isEmpty()); } + + public void testLogger() { + WebKbPlugin.getDefault().logError(new KBValidationException("Test exception", null)); + Set<IStatus> exceptions = LOGGER.getExceptions(); + assertEquals(1, exceptions.size()); + } } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/META-INF/MANIFEST.MF 2011-08-15 22:24:45 UTC (rev 33944) @@ -22,6 +22,7 @@ org.jboss.tools.cdi.xml, org.jboss.tools.cdi.seam.solder.core, org.eclipse.jst.standard.schemas, - org.jboss.tools.jst.jsp.test + org.jboss.tools.jst.jsp.test, + org.eclipse.wst.validation Export-Package: org.jboss.tools.cdi.seam.config.core.test Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.core.test/src/org/jboss/tools/cdi/seam/config/core/test/CDISeamConfigCoreAllTests.java 2011-08-15 22:24:45 UTC (rev 33944) @@ -14,6 +14,9 @@ import junit.framework.TestSuite; import org.eclipse.jdt.internal.core.JavaModelManager; +import org.eclipse.wst.validation.ValidationFramework; +import org.jboss.tools.cdi.core.test.tck.validation.ValidationExceptionTest; + /** * @author Viacheslav Kabanovich */ @@ -22,7 +25,11 @@ public static Test suite() { // it could be done here because it is not needed to be enabled back JavaModelManager.getIndexManager().disable(); - + + ValidationFramework.getDefault().suspendAllValidation(true); + + ValidationExceptionTest.initLogger(); + TestSuite suiteAll = new TestSuite("CDI Config Core Tests"); TestSuite suiteCore = new TestSuite("CDI Config Model Tests"); @@ -36,6 +43,8 @@ suiteValidation.addTestSuite(SeamConfigValidationTest.class); suiteAll.addTest(new SeamConfigValidationTestSetup(suiteValidation)); + suiteAll.addTestSuite(ValidationExceptionTest.class); // This test should be added last! + return suiteAll; } -} +} \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/META-INF/MANIFEST.MF 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/META-INF/MANIFEST.MF 2011-08-15 22:24:45 UTC (rev 33944) @@ -17,7 +17,8 @@ org.jboss.tools.cdi.seam.config.ui, org.jboss.tools.tests, org.eclipse.core.runtime, - org.eclipse.jdt.core + org.eclipse.jdt.core, + org.eclipse.wst.validation Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.cdi.seam.config.ui.test Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/src/org/jboss/tools/cdi/seam/config/ui/test/CdiSeamConfigUIAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/src/org/jboss/tools/cdi/seam/config/ui/test/CdiSeamConfigUIAllTests.java 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.config.ui.test/src/org/jboss/tools/cdi/seam/config/ui/test/CdiSeamConfigUIAllTests.java 2011-08-15 22:24:45 UTC (rev 33944) @@ -14,6 +14,7 @@ import junit.framework.TestSuite; import org.eclipse.jdt.internal.core.JavaModelManager; +import org.eclipse.wst.validation.ValidationFramework; import org.jboss.tools.cdi.seam.config.core.test.SeamConfigTestSetup; public class CdiSeamConfigUIAllTests { @@ -22,6 +23,8 @@ // it could be done here because it is not needed to be enabled back JavaModelManager.getIndexManager().disable(); + ValidationFramework.getDefault().suspendAllValidation(true); + TestSuite suiteAll = new TestSuite("CDI Config UI Tests"); TestSuite suiteConfig = new TestSuite("CDI Seam Config UI Tests"); @@ -31,4 +34,4 @@ return suiteAll; } -} +} \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/META-INF/MANIFEST.MF 2011-08-15 22:24:45 UTC (rev 33944) @@ -14,13 +14,14 @@ org.eclipse.core.runtime;bundle-version="3.7.0", org.jboss.tools.cdi.core, org.jboss.tools.jst.jsp.base.test, - org.jboss.tools.cdi.core.test;bundle-version="1.2.0", - org.jboss.tools.common;bundle-version="3.3.0", + org.jboss.tools.cdi.core.test, + org.jboss.tools.common, org.eclipse.ui;bundle-version="3.7.0", - org.jboss.tools.common.base.test;bundle-version="3.3.0", + org.jboss.tools.common.base.test, org.eclipse.jface.text;bundle-version="3.7.0", - org.jboss.tools.common.el.core;bundle-version="3.3.0", - org.jboss.tools.common.text.ext;bundle-version="3.3.0", - org.jboss.tools.jst.text.ext;bundle-version="3.3.0", - org.jboss.tools.jst.text.ext.test;bundle-version="3.3.0" + org.jboss.tools.common.el.core, + org.jboss.tools.common.text.ext, + org.jboss.tools.jst.text.ext, + org.jboss.tools.jst.text.ext.test, + org.eclipse.wst.validation;bundle-version="1.2.300" Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.core.test/src/org/jboss/tools/cdi/seam/core/test/CDISeamCoreAllTests.java 2011-08-15 22:24:45 UTC (rev 33944) @@ -14,6 +14,8 @@ import junit.framework.TestSuite; import org.eclipse.jdt.internal.core.JavaModelManager; +import org.eclipse.wst.validation.ValidationFramework; +import org.jboss.tools.cdi.core.test.tck.validation.ValidationExceptionTest; import org.jboss.tools.cdi.seam.core.test.international.BundleModelTest; import org.jboss.tools.cdi.seam.core.test.international.SeamResourceBundlesTest; import org.jboss.tools.cdi.seam.core.test.persistence.SeamPersistenceTest; @@ -29,6 +31,10 @@ public static Test suite() { JavaModelManager.getIndexManager().disable(); + ValidationFramework.getDefault().suspendAllValidation(true); + + ValidationExceptionTest.initLogger(); + TestSuite suiteAll = new TestSuite("Seam Core Tests"); TestSuite suite = new TestSuite("Seam Core Project Tests"); @@ -40,6 +46,9 @@ suite = new TestSuite("Seam Persistence Project Tests"); suite.addTestSuite(SeamPersistenceTest.class); suiteAll.addTest(new SeamPersistenceTestSetup(suite)); + + suiteAll.addTestSuite(ValidationExceptionTest.class); // This test should be added last! + return suiteAll; } } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/META-INF/MANIFEST.MF 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/META-INF/MANIFEST.MF 2011-08-15 22:24:45 UTC (rev 33944) @@ -12,4 +12,6 @@ org.jboss.tools.tests, org.eclipse.core.runtime;bundle-version="3.7.0", org.jboss.tools.cdi.core, - org.jboss.tools.jst.jsp.base.test + org.jboss.tools.jst.jsp.base.test, + org.eclipse.wst.validation, + org.jboss.tools.cdi.core.test Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/CDISeamFacesCoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/CDISeamFacesCoreAllTests.java 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.faces.core.test/src/org/jboss/tools/cdi/seam/faces/core/test/CDISeamFacesCoreAllTests.java 2011-08-15 22:24:45 UTC (rev 33944) @@ -14,6 +14,8 @@ import junit.framework.TestSuite; import org.eclipse.jdt.internal.core.JavaModelManager; +import org.eclipse.wst.validation.ValidationFramework; +import org.jboss.tools.cdi.core.test.tck.validation.ValidationExceptionTest; /** * @author Alexey Kazakov @@ -23,12 +25,19 @@ public static Test suite() { JavaModelManager.getIndexManager().disable(); + ValidationFramework.getDefault().suspendAllValidation(true); + + ValidationExceptionTest.initLogger(); + TestSuite suiteAll = new TestSuite("Seam Faces Tests"); TestSuite suite = new TestSuite("Seam Faces Project Tests"); suite.addTestSuite(SeamFacesValidationTest.class); suiteAll.addTest(new SeamFacesTestSetup(suite)); suiteAll.addTestSuite(SeamFacesTagLibTest.class); + + suiteAll.addTestSuite(ValidationExceptionTest.class); // This test should be added last! + return suiteAll; } } \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/META-INF/MANIFEST.MF 2011-08-15 22:24:45 UTC (rev 33944) @@ -21,6 +21,7 @@ org.jboss.tools.jst.web.kb, org.jboss.tools.cdi.xml, org.eclipse.jst.standard.schemas, - org.jboss.tools.jst.jsp.test + org.jboss.tools.jst.jsp.test, + org.eclipse.wst.validation Export-Package: org.jboss.tools.cdi.seam.solder.core.test Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.solder.core.test/src/org/jboss/tools/cdi/seam/solder/core/test/CDISeamSolderCoreAllTests.java 2011-08-15 22:24:45 UTC (rev 33944) @@ -14,6 +14,8 @@ import junit.framework.TestSuite; import org.eclipse.jdt.internal.core.JavaModelManager; +import org.eclipse.wst.validation.ValidationFramework; +import org.jboss.tools.cdi.core.test.tck.validation.ValidationExceptionTest; /** * @author Viacheslav Kabanovich */ @@ -23,7 +25,12 @@ // it could be done here because it is not needed to be enabled back JavaModelManager.getIndexManager().disable(); + ValidationFramework.getDefault().suspendAllValidation(true); + + ValidationExceptionTest.initLogger(); + TestSuite suiteAll = new TestSuite("CDI Solder Core Tests"); + SeamSolderTestSetup suite = new SeamSolderTestSetup(suiteAll); suiteAll.addTestSuite(GenericBeanTest.class); suiteAll.addTestSuite(GenericBeanValidationTest.class); @@ -35,8 +42,8 @@ suiteAll.addTestSuite(DefaultBeanTest.class); suiteAll.addTestSuite(UnwrapsTest.class); - SeamSolderTestSetup suite = new SeamSolderTestSetup(suiteAll); + suiteAll.addTestSuite(ValidationExceptionTest.class); // This test should be added last! return suite; } -} +} \ No newline at end of file Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/META-INF/MANIFEST.MF 2011-08-15 22:24:45 UTC (rev 33944) @@ -22,8 +22,9 @@ org.eclipse.core.runtime, org.eclipse.jdt.core, org.eclipse.jdt.ui, - org.jboss.tools.cdi.seam.solder.core.test;bundle-version="1.0.0", - org.jboss.tools.cdi.text.ext;bundle-version="1.2.0" + org.jboss.tools.cdi.seam.solder.core.test, + org.jboss.tools.cdi.text.ext, + org.eclipse.wst.validation Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.cdi.seam.text.ext.test Modified: trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.seam.text.ext.test/src/org/jboss/tools/cdi/seam/text/ext/test/CdiSeamTextExtAllTests.java 2011-08-15 22:24:45 UTC (rev 33944) @@ -10,19 +10,22 @@ ******************************************************************************/ package org.jboss.tools.cdi.seam.text.ext.test; +import junit.framework.Test; +import junit.framework.TestSuite; + import org.eclipse.jdt.internal.core.JavaModelManager; +import org.eclipse.wst.validation.ValidationFramework; import org.jboss.tools.cdi.core.test.CDICoreTestSetup; import org.jboss.tools.cdi.seam.config.core.test.SeamConfigTestSetup; import org.jboss.tools.cdi.seam.solder.core.test.SeamSolderTestSetup; -import junit.framework.Test; -import junit.framework.TestSuite; - public class CdiSeamTextExtAllTests { public static Test suite() { // it could be done here because it is not needed to be enabled back JavaModelManager.getIndexManager().disable(); + ValidationFramework.getDefault().suspendAllValidation(true); + TestSuite suiteAll = new TestSuite("CDI Core Tests"); TestSuite suite = new TestSuite("CDI Seam OpenOns Tests"); Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/META-INF/MANIFEST.MF 2011-08-15 22:24:45 UTC (rev 33944) @@ -7,19 +7,20 @@ org.eclipse.core.resources;bundle-version="3.5.0", org.eclipse.jface.text;bundle-version="3.5.0", org.eclipse.ui.ide;bundle-version="3.5.0", - org.jboss.tools.common.text.ext;bundle-version="2.0.0", + org.jboss.tools.common.text.ext, org.jboss.tools.common.model.ui, org.eclipse.core.runtime;bundle-version="3.5.0", - org.jboss.tools.cdi.text.ext;bundle-version="1.0.0", + org.jboss.tools.cdi.text.ext, org.eclipse.jdt.ui;bundle-version="3.5.0", org.eclipse.core.commands;bundle-version="3.5.0", - org.jboss.tools.cdi.core.test;bundle-version="1.0.0", + org.jboss.tools.cdi.core.test, org.eclipse.jdt.core;bundle-version="3.5.0", org.eclipse.wst.xml.ui, org.eclipse.jface;bundle-version="3.6.0", - org.jboss.tools.cdi.core;bundle-version="1.2.0", - org.jboss.tools.common.el.core;bundle-version="3.3.0", - org.jboss.tools.jst.web.ui;bundle-version="3.3.0" + org.jboss.tools.cdi.core, + org.jboss.tools.common.el.core, + org.jboss.tools.jst.web.ui, + org.eclipse.wst.validation;bundle-version="1.2.300" Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.cdi.text.ext.test Modified: trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java 2011-08-15 22:23:49 UTC (rev 33943) +++ trunk/cdi/tests/org.jboss.tools.cdi.text.ext.test/src/org/jboss/tools/cdi/text/ext/test/CdiTextExtAllTests.java 2011-08-15 22:24:45 UTC (rev 33944) @@ -14,6 +14,7 @@ import junit.framework.TestSuite; import org.eclipse.jdt.internal.core.JavaModelManager; +import org.eclipse.wst.validation.ValidationFramework; import org.jboss.tools.cdi.core.test.CDICoreTestSetup; public class CdiTextExtAllTests { @@ -21,6 +22,8 @@ // it could be done here because it is not needed to be enabled back JavaModelManager.getIndexManager().disable(); + ValidationFramework.getDefault().suspendAllValidation(true); + TestSuite suiteAll = new TestSuite("CDI Core Tests"); TestSuite suite = new TestSuite("CDI OpenOns Tests");