Author: yzhishko Date: 2010-02-08 10:09:12 -0500 (Mon, 08 Feb 2010) New Revision: 20178 Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java Log: Natures Checker disabled for tests Modified: trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java 2010-02-08 15:00:12 UTC (rev 20177) +++ trunk/jsf/tests/org.jboss.tools.jsf.vpe.jsf.test/src/org/jboss/tools/jsf/vpe/jsf/test/jbide/NaturesChecker_JBIDE5701.java 2010-02-08 15:09:12 UTC (rev 20178) @@ -7,7 +7,9 @@ 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.JspEditorPlugin; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.vpe.ui.test.TestUtil; import org.jboss.tools.vpe.ui.test.VpeTest; @@ -21,7 +23,7 @@ "Please use the Configure menu on the project to enable JSF if " + //$NON-NLS-1$ "you want all features of the editor working."; //$NON-NLS-1$ private static final String SECOND_TEST_PAGE_NAME = "components/commandButton.jsp"; //$NON-NLS-1$ - + public NaturesChecker_JBIDE5701(String name) { super(name); } @@ -125,4 +127,16 @@ } + @Override + protected void setUp() throws Exception { + super.setUp(); + JspEditorPlugin.getDefault().getPreferenceStore().setValue(IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, true); + } + + @Override + protected void tearDown() throws Exception { + JspEditorPlugin.getDefault().getPreferenceStore().setValue(IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, false); + super.tearDown(); + } + } Modified: trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java =================================================================== --- trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2010-02-08 15:00:12 UTC (rev 20177) +++ trunk/vpe/tests/org.jboss.tools.vpe.ui.test/src/org/jboss/tools/vpe/ui/test/VpeTest.java 2010-02-08 15:09:12 UTC (rev 20178) @@ -35,7 +35,9 @@ import org.eclipse.wst.sse.ui.internal.reconcile.StructuredRegionProcessor; import org.eclipse.wst.xml.core.internal.provisional.document.IDOMDocument; import org.jboss.tools.common.model.util.ClassLoaderUtil; +import org.jboss.tools.jst.jsp.JspEditorPlugin; import org.jboss.tools.jst.jsp.jspeditor.JSPMultiPageEditor; +import org.jboss.tools.jst.jsp.preferences.IVpePreferencesPage; import org.jboss.tools.vpe.editor.VpeController; import org.jboss.tools.vpe.editor.mapping.VpeDomMapping; import org.jboss.tools.vpe.editor.mapping.VpeElementMapping; @@ -64,12 +66,13 @@ /** check warning log. */ private boolean checkWarning = false; - + // FIX for JBIDE-1628 static { ClassLoaderUtil.init(); // wait for initialization TestUtil.delay(3000); + JspEditorPlugin.getDefault().getPreferenceStore().setValue(IVpePreferencesPage.INFORM_WHEN_PROJECT_MIGHT_NOT_BE_CONFIGURED_PROPERLY_FOR_VPE, false); } /** @@ -93,7 +96,6 @@ @Override protected void setUp() throws Exception { super.setUp(); - Platform.addLogListener(this); // String jbossPath = System.getProperty( // "jbosstools.test.jboss.home.4.2", "C:\\java\\jboss-4.2.2.GA");