Author: akazakov Date: 2010-09-23 10:23:22 -0400 (Thu, 23 Sep 2010) New Revision: 25124 Added: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/WebContentAssistProviderTest.java Removed: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/WebContentAssistProviderTest.java Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java Log: JBIDE-7152 https://jira.jboss.org/browse/JBIDE-7152 Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-09-23 12:44:53 UTC (rev 25123) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/META-INF/MANIFEST.MF 2010-09-23 14:23:22 UTC (rev 25124) @@ -7,7 +7,6 @@ . Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.custommonkey.xmlunit, - org.jboss.tools.jsf.ca.test, org.jboss.tools.jsf.kb.test, org.jboss.tools.jsf.model.pv.test, org.jboss.tools.jsf.plugin, Deleted: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/WebContentAssistProviderTest.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/WebContentAssistProviderTest.java 2010-09-23 12:44:53 UTC (rev 25123) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/WebContentAssistProviderTest.java 2010-09-23 14:23:22 UTC (rev 25124) @@ -1,94 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 Exadel, Inc. and 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: - * Exadel, Inc. and Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.jsf.ca.test; - -import java.util.List; -import java.util.Properties; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.resources.IncrementalProjectBuilder; -import org.eclipse.core.resources.ResourcesPlugin; -import org.jboss.tools.common.model.XModel; -import org.jboss.tools.common.model.XModelObject; -import org.jboss.tools.common.model.project.Watcher; -import org.jboss.tools.common.model.util.EclipseResourceUtil; -import org.jboss.tools.jst.web.project.list.WebPromptingProvider; -import org.jboss.tools.test.util.JobUtils; -import org.jboss.tools.test.util.TestProjectProvider; - -public class WebContentAssistProviderTest extends TestCase { - - TestProjectProvider provider = null; - IProject project = null; - boolean makeCopy = true; - XModel projectModel; - WebPromptingProvider webPromptingProvider; - - public static Test suite() { - return new TestSuite(WebContentAssistProviderTest.class); - } - - public void testTlds() { - // Wait all the builders to finish - JobUtils.waitForIdle(2000); - - List tldList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_GET_TAGLIBS, "", null); - assertTrue("TLD list does not contain expected TLD in XModel.", tldList.contains("http://jboss.com/products/seam/taglib")); - } - - public void testJsfBeanPropertyList() { - // seam beans list - List beanList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BEAN_PROPERTIES, "facesManagedBean", new Properties()); - assertTrue("Bean property list does not contain Managed bean property in XModel.", beanList.contains("property1")); - } - - public void testBundles() { - // bundle name list - List bundleList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BUNDLES, "", null); - assertTrue("Bundle name list does not contain expected name in XModel.", bundleList.contains("org.jboss.seam.example.numberguess.test")); - // bundle property list - List bundlePropertyList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BUNDLE_PROPERTIES, "org.jboss.seam.example.numberguess.test", null); - assertTrue("Bundle property list does not contain expected property in XModel.", bundlePropertyList.contains("bundleProperty1")); - } - - public void setUp() throws Exception { - JobUtils.waitForIdle(10000); - project = ResourcesPlugin.getWorkspace().getRoot().getProject("TestsWebArtefacts"); - if(!project.exists()) { - provider = new TestProjectProvider("org.jboss.tools.jst.web.test", null, "TestsWebArtefacts", makeCopy); - project = provider.getProject(); - } - project.refreshLocal(IResource.DEPTH_INFINITE, null); - project.build(IncrementalProjectBuilder.FULL_BUILD,null); - XModelObject xmo = EclipseResourceUtil.getObjectByResource(project); - assertNotNull("Can't get XModel Object for test project.", xmo); - projectModel = xmo.getModel(); - Watcher.getInstance(projectModel).forceUpdate(); - projectModel.update(); - assertNotNull("Can't get XModel for test project.", projectModel); - - // Wait all the builders to finish - JobUtils.waitForIdle(2000); - - webPromptingProvider = WebPromptingProvider.getInstance(); - } - - protected void tearDown() throws Exception { - if(provider != null) { - provider.dispose(); - } - } -} \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2010-09-23 12:44:53 UTC (rev 25123) +++ trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/test/JsfAllTests.java 2010-09-23 14:23:22 UTC (rev 25124) @@ -15,8 +15,6 @@ import junit.framework.TestSuite; import org.eclipse.jdt.internal.core.JavaModelManager; -import org.jboss.tools.jsf.ca.test.WebContentAssistProviderTest; -import org.jboss.tools.jsf.kb.test.FaceletsKbModelTest; import org.jboss.tools.jsf.model.pv.test.JSFPromptingProviderTest; import org.jboss.tools.jsf.test.refactoring.ELVariableRefactoringTest; import org.jboss.tools.jsf.test.refactoring.JSF2RefactoringTest; @@ -33,9 +31,6 @@ old.addTestSuite(JSFModelTest.class); old.addTestSuite(ModelFormat_2_0_0_Test.class); old.addTestSuite(JSFBeansTest.class); - old.addTest( - new ProjectImportTestSetup(WebContentAssistProviderTest.suite(), - "org.jboss.tools.jst.web.test", "projects/TestsWebArtefacts","TestsWebArtefacts")); suite.addTest(new ProjectImportTestSetup(old, "org.jboss.tools.jsf.test", "projects/JSFKickStartOldFormat", //$NON-NLS-1$ //$NON-NLS-2$ "JSFKickStartOldFormat")); //$NON-NLS-1$ @@ -81,4 +76,4 @@ JavaModelManager.getIndexManager().disable(); } } -} +} \ No newline at end of file Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2010-09-23 12:44:53 UTC (rev 25123) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/META-INF/MANIFEST.MF 2010-09-23 14:23:22 UTC (rev 25124) @@ -15,15 +15,16 @@ org.eclipse.ui.ide, org.eclipse.ltk.core.refactoring, org.eclipse.jst.j2ee, - org.eclipse.jface.text;bundle-version="3.5.2", + org.eclipse.jface.text, org.jboss.tools.jst.jsp.test, org.jboss.tools.jst.css, org.jboss.tools.jsf.text.ext, org.jboss.tools.jsf.text.ext.facelets, org.jboss.tools.jsf.text.ext.richfaces, - org.eclipse.wst.server.core;bundle-version="1.1.202", - org.eclipse.jst.server.tomcat.core;bundle-version="1.1.200", - org.eclipse.ui;bundle-version="3.6.0", - org.jboss.tools.common.el.core;bundle-version="3.2.0" + org.eclipse.wst.server.core, + org.eclipse.jst.server.tomcat.core, + org.eclipse.ui, + org.jboss.tools.common.el.core, + org.jboss.tools.jst.web Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: J2SE-1.5 Copied: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/WebContentAssistProviderTest.java (from rev 25118, trunk/jsf/tests/org.jboss.tools.jsf.test/src/org/jboss/tools/jsf/ca/test/WebContentAssistProviderTest.java) =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/WebContentAssistProviderTest.java (rev 0) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/WebContentAssistProviderTest.java 2010-09-23 14:23:22 UTC (rev 25124) @@ -0,0 +1,94 @@ +/******************************************************************************* + * Copyright (c) 2007 Exadel, Inc. and 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: + * Exadel, Inc. and Red Hat, Inc. - initial API and implementation + ******************************************************************************/ +package org.jboss.tools.jsf.jsp.ca.test; + +import java.util.List; +import java.util.Properties; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IncrementalProjectBuilder; +import org.eclipse.core.resources.ResourcesPlugin; +import org.jboss.tools.common.model.XModel; +import org.jboss.tools.common.model.XModelObject; +import org.jboss.tools.common.model.project.Watcher; +import org.jboss.tools.common.model.util.EclipseResourceUtil; +import org.jboss.tools.jst.web.project.list.WebPromptingProvider; +import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; + +public class WebContentAssistProviderTest extends TestCase { + + TestProjectProvider provider = null; + IProject project = null; + boolean makeCopy = true; + XModel projectModel; + WebPromptingProvider webPromptingProvider; + + public static Test suite() { + return new TestSuite(WebContentAssistProviderTest.class); + } + + public void testTlds() { + // Wait all the builders to finish + JobUtils.waitForIdle(2000); + + List tldList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_GET_TAGLIBS, "", null); + assertTrue("TLD list does not contain expected TLD in XModel.", tldList.contains("http://jboss.com/products/seam/taglib")); + } + + public void testJsfBeanPropertyList() { + // seam beans list + List beanList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BEAN_PROPERTIES, "facesManagedBean", new Properties()); + assertTrue("Bean property list does not contain Managed bean property in XModel.", beanList.contains("property1")); + } + + public void testBundles() { + // bundle name list + List bundleList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BUNDLES, "", null); + assertTrue("Bundle name list does not contain expected name in XModel.", bundleList.contains("org.jboss.seam.example.numberguess.test")); + // bundle property list + List bundlePropertyList = webPromptingProvider.getList(projectModel, WebPromptingProvider.JSF_BUNDLE_PROPERTIES, "org.jboss.seam.example.numberguess.test", null); + assertTrue("Bundle property list does not contain expected property in XModel.", bundlePropertyList.contains("bundleProperty1")); + } + + public void setUp() throws Exception { + JobUtils.waitForIdle(10000); + project = ResourcesPlugin.getWorkspace().getRoot().getProject("TestsWebArtefacts"); + if(!project.exists()) { + provider = new TestProjectProvider("org.jboss.tools.jst.web.test", null, "TestsWebArtefacts", makeCopy); + project = provider.getProject(); + } + project.refreshLocal(IResource.DEPTH_INFINITE, null); + project.build(IncrementalProjectBuilder.FULL_BUILD,null); + XModelObject xmo = EclipseResourceUtil.getObjectByResource(project); + assertNotNull("Can't get XModel Object for test project.", xmo); + projectModel = xmo.getModel(); + Watcher.getInstance(projectModel).forceUpdate(); + projectModel.update(); + assertNotNull("Can't get XModel for test project.", projectModel); + + // Wait all the builders to finish + JobUtils.waitForIdle(2000); + + webPromptingProvider = WebPromptingProvider.getInstance(); + } + + protected void tearDown() throws Exception { + if(provider != null) { + provider.dispose(); + } + } +} \ No newline at end of file Property changes on: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/jsp/ca/test/WebContentAssistProviderTest.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java =================================================================== --- trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-09-23 12:44:53 UTC (rev 25123) +++ trunk/jsf/tests/org.jboss.tools.jsf.ui.test/src/org/jboss/tools/jsf/ui/test/JsfUiAllTests.java 2010-09-23 14:23:22 UTC (rev 25124) @@ -26,10 +26,8 @@ import org.jboss.tools.jsf.jsp.ca.test.JsfJspJbide1704Test; import org.jboss.tools.jsf.jsp.ca.test.JsfJspJbide1717Test; import org.jboss.tools.jsf.jsp.ca.test.JsfJspJbide6259Test; -import org.jboss.tools.jsf.jsp.ca.test.MissingKBBuilderTest; +import org.jboss.tools.jsf.jsp.ca.test.WebContentAssistProviderTest; import org.jboss.tools.jsf.ui.test.refactoring.ELReferencesRenameTest; -import org.jboss.tools.jsf.ui.test.AddJSFCapabilitiesTest; -import org.jboss.tools.jsf.ui.test.JSPProblemMarkerResolutionTest; import org.jboss.tools.test.util.ProjectImportTestSetup; public class JsfUiAllTests { @@ -56,6 +54,9 @@ suite.addTestSuite(JsfJspJbide1704Test.class); suite.addTestSuite(JsfJspJbide1717Test.class); + suite.addTest( + new ProjectImportTestSetup(WebContentAssistProviderTest.suite(), + "org.jboss.tools.jst.web.test", "projects/TestsWebArtefacts","TestsWebArtefacts")); suite.addTest(new ProjectImportTestSetup(new TestSuite( ELReferencesRenameTest.class), "org.jboss.tools.jsf.ui.test", //$NON-NLS-1$ new String[] { "projects/testJSFProject", }, //$NON-NLS-1$ Modified: trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java =================================================================== --- trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java 2010-09-23 12:44:53 UTC (rev 25123) +++ trunk/jst/plugins/org.jboss.tools.jst.web/src/org/jboss/tools/jst/web/project/list/WebPromptingProvider.java 2010-09-23 14:23:22 UTC (rev 25124) @@ -10,7 +10,9 @@ ******************************************************************************/ package org.jboss.tools.jst.web.project.list; -import java.util.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Properties; import org.eclipse.core.runtime.Platform; import org.jboss.tools.common.model.XModel; @@ -18,9 +20,9 @@ import org.jboss.tools.jst.web.WebModelPlugin; public class WebPromptingProvider implements IWebPromptingProvider { - + static IWebPromptingProvider[] providers; - + static { String[][] pns = new String[][]{ {"org.jboss.tools.jsf.model.pv.JSFPromptingProvider", "org.jboss.tools.jsf"}, //$NON-NLS-1$ //$NON-NLS-2$ @@ -40,11 +42,11 @@ } providers = l.toArray(new IWebPromptingProvider[0]); } - + public static WebPromptingProvider getInstance() { return WebPromptingProviderHolder.provider; } - + public boolean isSupporting(String id) { for (int i = 0; i < providers.length; i++) { if(providers[i].isSupporting(id)) return true; @@ -70,9 +72,8 @@ } return EMPTY_LIST; } - + static class WebPromptingProviderHolder { static WebPromptingProvider provider = new WebPromptingProvider(); } - -} +} \ No newline at end of file