Author: akazakov Date: 2011-07-08 20:55:28 -0400 (Fri, 08 Jul 2011) New Revision: 32781 Removed: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java Log: https://issues.jboss.org/browse/JBIDE-9315 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java 2011-07-09 00:11:01 UTC (rev 32780) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllImportantTests.java 2011-07-09 00:55:28 UTC (rev 32781) @@ -1,5 +1,8 @@ package org.jboss.tools.jsf.vpe.jsf.test; +import junit.framework.Test; +import junit.framework.TestSuite; + import org.jboss.tools.jsf.vpe.jsf.test.jbide.ChangeMessageBundleTest_JBIDE5818; import org.jboss.tools.jsf.vpe.jsf.test.jbide.ContextMenuDoubleInsertionTest_JBIDE3888; import org.jboss.tools.jsf.vpe.jsf.test.jbide.EditFontFamilyTest_JBIDE5872; @@ -57,7 +60,6 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JSF2ValidatorTest; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test; import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1568Test; @@ -88,9 +90,6 @@ import org.jboss.tools.jsf.vpe.jsf.test.jbide.VpeI18nTest_JBIDE4887; import org.jboss.tools.jsf.vpe.jsf.test.jbide.XulRunnerVpeUtilsTest; -import junit.framework.Test; -import junit.framework.TestSuite; - /** * Test suite containing all important JSP tests * @@ -103,7 +102,6 @@ //$JUnit-BEGIN$ suite.addTestSuite(SourceDomUtilTest.class); suite.addTestSuite(XulRunnerVpeUtilsTest.class); - suite.addTestSuite(JSF2ValidatorTest.class); suite.addTestSuite(UnclosedELExpressionTest.class); suite.addTestSuite(TestContextPathResolution.class); suite.addTestSuite(JBIDE5920Test.class); Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2011-07-09 00:11:01 UTC (rev 32780) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/JsfAllTests.java 2011-07-09 00:55:28 UTC (rev 32781) @@ -13,93 +13,6 @@ import junit.framework.Test; import junit.framework.TestSuite; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.ChangeMessageBundleTest_JBIDE5818; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.ContextMenuDoubleInsertionTest_JBIDE3888; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.EditFontFamilyTest_JBIDE5872; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.ExceptionInVPEComments_JBIDE5143; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.FacetProcessingTest; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1105Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1460Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1479Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1494Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1615Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1720Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1744Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE1805Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2010Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2119Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2219Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2297Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2354Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2434Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2505Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2526Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2550Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2582Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2584Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2594Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2624Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2774Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2828Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE2979Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3030Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3127Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3144Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3163Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3197Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3247Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3376Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3396Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3441Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3473Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3482Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3519Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3617Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3632Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3650Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3734Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE3969Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4037Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4179Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4337Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4373Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4509Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4510Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE4534Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE5920Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE675Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE788Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JBIDE924Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JSF2ValidatorTest; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1467Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1501Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1568Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide1718Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2170Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.JsfJbide2362Test; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.MessageResolutionInPreviewTabTest; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.MozDirtyTest_JBIDE5105; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.NullPointerWithStyleProperty_JBIDE5193; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnCssClassTest_JBIDE4775; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnInJarPackageFragment_JBIDE5682; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnInsideJspRoot_JBIDE4852; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnJsf20Test_JBIDE5382; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.OpenOnTLDPackedInJar_JBIDE5693; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.PreferencesForEditors_JBIDE5692; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.RefreshBundles_JBIDE5460; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.RenderFacetAndInsertChildrenTest; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.SelectAllAndCut_JBIDE4853; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.SelectWholeElement_JBIDE4713; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.SourceDomUtilTest; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestContextPathResolution; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestFViewLocaleAttribute_JBIDE5218; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestForUsingComponentsLibrariesWithDefaultNamespace; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.TestOpenOnForXhtmlFiles_JBIDE5577; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.UnclosedELExpressionTest; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.VPERefreshTest; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.VisualRefreshComment_JBIDE6067; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.VpeI18nTest_JBIDE4887; -import org.jboss.tools.jsf.vpe.jsf.test.jbide.XulRunnerVpeUtilsTest; import org.jboss.tools.vpe.base.test.VpeTestSetup; /** Deleted: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java 2011-07-09 00:11:01 UTC (rev 32780) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/JSF2ValidatorTest.java 2011-07-09 00:55:28 UTC (rev 32781) @@ -1,74 +0,0 @@ -/** - * - */ -package org.jboss.tools.jsf.vpe.jsf.test.jbide; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IMarker; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.swt.custom.StyledText; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.part.FileEditorInput; -import org.jboss.tools.jsf.vpe.jsf.test.JsfAllTests; -import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; -import org.jboss.tools.vpe.base.test.TestUtil; -import org.jboss.tools.vpe.base.test.VpeTest; - -/** - * JUnit test class for https://jira.jboss.org/browse/JBIDE-6965 - * - * @author mareshkau - * - */ -public class JSF2ValidatorTest extends VpeTest{ - - private static final String MARKER_TYPE="org.jboss.tools.jsf.jsf2problemmarker"; //$NON-NLS-1$ - public JSF2ValidatorTest(String name) { - super(name); - } - - public void testCAforIncludeTaglibInInenerNodes() throws Throwable { - IFile file = (IFile) TestUtil.getComponentPath("JBIDE/6922/jbide6922.xhtml", //$NON-NLS-1$ - JsfAllTests.IMPORT_JSF_20_PROJECT_NAME); - - file.getProject().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); - TestUtil.delay(3000); - TestUtil.waitForJobs(); - - IEditorInput input = new FileEditorInput(file); - JSPMultiPageEditor multiPageEditor = openEditor(input); - IMarker[] problemMarkers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); - assertEquals("There shouldn't be any problems on page", 0, problemMarkers.length); //$NON-NLS-1$ - - StyledText styledText = multiPageEditor.getSourceEditor().getTextViewer().getTextWidget(); - int caretOffset = TestUtil.getLinePositionOffcet(multiPageEditor.getSourceEditor().getTextViewer(), 4, 5); - styledText.setCaretOffset(caretOffset); - styledText.insert("xmlns:test=\"http://java.sun.com/jsf/composi...; //$NON-NLS-1$ - - multiPageEditor.doSave(new NullProgressMonitor()); - file.getProject().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); - TestUtil.delay(3000); - TestUtil.waitForJobs(); - - problemMarkers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); - - assertEquals("res folder marker is expected", 1, problemMarkers.length); //$NON-NLS-1$ - String message = (String) problemMarkers[0].getAttribute(IMarker.MESSAGE); - assertEquals("Error message","JSF 2 Resources folder \"/resources/test\" is missing in a project web directory",message); //$NON-NLS-1$ //$NON-NLS-2$ - - caretOffset = TestUtil.getLinePositionOffcet(multiPageEditor.getSourceEditor().getTextViewer(), 6, 1); - styledText.setCaretOffset(caretOffset); - styledText.insert("<test:testElement />"); //$NON-NLS-1$ - - multiPageEditor.doSave(new NullProgressMonitor()); - file.getProject().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor()); - TestUtil.delay(3000); - TestUtil.waitForJobs(); - - problemMarkers = file.findMarkers(MARKER_TYPE, true, IResource.DEPTH_INFINITE); - assertEquals("Number of markers",2, problemMarkers.length); //$NON-NLS-1$ - } - -}