Author: akazakov Date: 2011-07-06 19:08:07 -0400 (Wed, 06 Jul 2011) New Revision: 32679 Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java Log: https://issues.jboss.org/browse/JBIDE-9305 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-07-06 22:58:53 UTC (rev 32678) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-07-06 23:08:07 UTC (rev 32679) @@ -55,6 +55,7 @@ import org.eclipse.wst.common.project.facet.core.IProjectFacetVersion; import org.eclipse.wst.common.project.facet.core.ProjectFacetsManager; import org.jboss.tools.cdi.internal.core.impl.ClassBean; +import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator; import org.jboss.tools.common.EclipseUtil; import org.jboss.tools.common.java.IAnnotated; import org.jboss.tools.common.java.IAnnotationDeclaration; @@ -113,6 +114,7 @@ public static void disableCDI(IProject project) { try { EclipseUtil.removeNatureFromProject(project, CDICoreNature.NATURE_ID); + CDICoreValidator.cleanProject(project); } catch (CoreException e) { CDICorePlugin.getDefault().logError(e); } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-06 22:58:53 UTC (rev 32678) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-06 23:08:07 UTC (rev 32679) @@ -47,6 +47,7 @@ import org.eclipse.wst.common.componentcore.resources.IVirtualComponent; import org.eclipse.wst.common.componentcore.resources.IVirtualFile; import org.eclipse.wst.validation.internal.core.ValidationException; +import org.eclipse.wst.validation.internal.operations.WorkbenchReporter; import org.eclipse.wst.validation.internal.provisional.core.IReporter; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICoreBuilder; @@ -388,6 +389,14 @@ } /** + * Removes all the validation problems created by this validator + * @param project + */ + public static void cleanProject(IProject project) { + WorkbenchReporter.removeAllMessages(project, new String[]{CDICoreValidator.class.getName()}, null); + } + + /** * Validates a resource. * * @param file Modified: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-06 22:58:53 UTC (rev 32678) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/CDICoreAllTests.java 2011-07-06 23:08:07 UTC (rev 32679) @@ -50,6 +50,7 @@ import org.jboss.tools.cdi.core.test.tck.validation.DefenitionErrorsValidationTest; import org.jboss.tools.cdi.core.test.tck.validation.DependentProjectValidationTest; import org.jboss.tools.cdi.core.test.tck.validation.DeploymentProblemsValidationTests; +import org.jboss.tools.cdi.core.test.tck.validation.DisableCDISupportTest; import org.jboss.tools.cdi.core.test.tck.validation.ELValidationTest; import org.jboss.tools.test.util.ProjectImportTestSetup; @@ -122,7 +123,8 @@ new String[]{"CDITestBrokenBuilderOrder"}); suiteAll.addTest(testSetup); + suiteAll.addTestSuite(DisableCDISupportTest.class); + return suiteAll; } - } \ No newline at end of file Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java 2011-07-06 23:08:07 UTC (rev 32679) @@ -0,0 +1,63 @@ +/******************************************************************************* + * Copyright (c) 2011 Red Hat, Inc. + * Distributed under license by Red Hat, Inc. All rights reserved. + * This program is made available under the terms of the + * Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + * + * Contributors: + * Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.cdi.core.test.tck.validation; + +import org.eclipse.core.resources.IMarker; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.jboss.tools.cdi.core.CDIUtil; +import org.jboss.tools.cdi.core.test.tck.TCKTest; +import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.ResourcesUtils; +import org.jboss.tools.tests.AbstractResourceMarkerTest; + +/** + * @author Alexey Kazakov + */ +public class DisableCDISupportTest extends ValidationTest { + + protected IProject tckProject; + + /* + * (non-Javadoc) + * @see junit.framework.TestCase#setUp() + */ + @Override + protected void setUp() throws Exception { + tckProject = TCKTest.importPreparedProject("/"); + } + + /* + * (non-Javadoc) + * @see junit.framework.TestCase#tearDown() + */ + @Override + protected void tearDown() throws Exception { + boolean saveAutoBuild = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(); + tckProject.delete(true, true, null); + JobUtils.waitForIdle(); + ResourcesUtils.setBuildAutomatically(saveAutoBuild); + } + + /** + * https://issues.jboss.org/browse/JBIDE-9305 + * @throws Exception + */ + public void testRemovingProblemMarkers() throws Exception { + IMarker[] markers = tckProject.findMarkers(CDICoreValidator.PROBLEM_TYPE, true, IResource.DEPTH_INFINITE); + assertFalse(markers.length==0); + CDIUtil.disableCDI(tckProject); + markers = tckProject.findMarkers(CDICoreValidator.PROBLEM_TYPE, true, IResource.DEPTH_INFINITE); + assertEquals(0, markers.length); + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/validation/DisableCDISupportTest.java ___________________________________________________________________ Added: svn:mime-type + text/plain