Author: akazakov Date: 2010-03-26 14:59:55 -0400 (Fri, 26 Mar 2010) New Revision: 21060 Added: branches/modular_build/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescription.java branches/modular_build/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescriptionFactory.java branches/modular_build/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java Removed: branches/modular_build/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/test/util/ branches/modular_build/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/util/WorkbenchUtils.java Modified: branches/modular_build/common/tests/org.jboss.tools.common.test/META-INF/MANIFEST.MF branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForCompositeComponentTest.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForELinStyleTest.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForUnclosedELTest.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide1791Test.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2016Test.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/MissingKBBuilderTest.java branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java branches/modular_build/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF branches/modular_build/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java branches/modular_build/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF branches/modular_build/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebContentAssistProviderTest.java branches/modular_build/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF Log: JBDS-486 Modified: branches/modular_build/common/tests/org.jboss.tools.common.test/META-INF/MANIFEST.MF =================================================================== --- branches/modular_build/common/tests/org.jboss.tools.common.test/META-INF/MANIFEST.MF 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/common/tests/org.jboss.tools.common.test/META-INF/MANIFEST.MF 2010-03-26 18:59:55 UTC (rev 21060) @@ -14,8 +14,6 @@ Bundle-ActivationPolicy: lazy Export-Package: org.jboss.tools.common.reporting.test, org.jboss.tools.common.test, - org.jboss.tools.common.test.util, - org.jboss.tools.common.util, org.jboss.tools.common.util.test, org.jboss.tools.common.xml.test Bundle-ClassPath: . Deleted: branches/modular_build/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/util/WorkbenchUtils.java =================================================================== --- branches/modular_build/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/util/WorkbenchUtils.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/common/tests/org.jboss.tools.common.test/src/org/jboss/tools/common/util/WorkbenchUtils.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -1,53 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2007 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.common.util; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jface.wizard.IWizard; -import org.eclipse.ui.IWorkbench; -import org.eclipse.ui.IWorkbenchPage; -import org.eclipse.ui.IWorkbenchWizard; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.wizards.IWizardDescriptor; -import org.jboss.tools.common.CommonPlugin; - -/** - * @author eskimo - * - */ -public class WorkbenchUtils { - - static public IWizard findWizardByDefId(String definitionId) { - IWizardDescriptor aWizardDescr = - getWorkbench().getNewWizardRegistry() - .findWizard(definitionId); - IWorkbenchWizard aWizard=null; - try { - aWizard = aWizardDescr.createWizard(); - } catch (CoreException e) { - CommonPlugin.getPluginLog().logError("Cannot create IWorkbenchWizard instance",e); - } - return aWizard; - } - - public static IWorkbench getWorkbench() { - return PlatformUI.getWorkbench(); - } - - /** - * @return - */ - public static IWorkbenchPage getWorkbenchActivePage() { - // TODO Auto-generated method stub - return getWorkbench().getActiveWorkbenchWindow().getActivePage(); - } -} Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/META-INF/MANIFEST.MF 2010-03-26 18:59:55 UTC (rev 21060) @@ -4,7 +4,6 @@ Bundle-SymbolicName: org.jboss.tools.jst.jsp.test Bundle-Version: 1.0.0 Require-Bundle: org.junit, - org.jboss.tools.common.test, org.jboss.tools.tests, org.eclipse.core.resources, org.eclipse.core.runtime, Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForCompositeComponentTest.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForCompositeComponentTest.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForCompositeComponentTest.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -1,6 +1,6 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.TestProjectProvider; public class CAForCompositeComponentTest extends ContentAssistantTestCase{ TestProjectProvider provider = null; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForELinStyleTest.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForELinStyleTest.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForELinStyleTest.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -1,6 +1,6 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.TestProjectProvider; public class CAForELinStyleTest extends ContentAssistantTestCase{ TestProjectProvider provider = null; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForIDTest.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -1,6 +1,6 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.TestProjectProvider; public class CAForIDTest extends ContentAssistantTestCase{ TestProjectProvider provider = null; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForUnclosedELTest.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForUnclosedELTest.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CAForUnclosedELTest.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -1,6 +1,6 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.TestProjectProvider; public class CAForUnclosedELTest extends ContentAssistantTestCase{ TestProjectProvider provider = null; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/CommonContentAssistantTestCase.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -13,7 +13,7 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.TestProjectProvider; /** Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide1791Test.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide1791Test.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/Jbide1791Test.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -17,7 +17,7 @@ import org.eclipse.jface.text.FindReplaceDocumentAdapter; import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.contentassist.ICompletionProposal; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.TestProjectProvider; /** * Test cast testing http://jira.jboss.com/jira/browse/JBIDE-1791 issue. Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1704Test.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -8,9 +8,9 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; import org.jboss.tools.jst.jsp.test.TestUtil; +import org.jboss.tools.test.util.TestProjectProvider; public class JsfJspJbide1704Test extends ContentAssistantTestCase { TestProjectProvider provider = null; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1717Test.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -8,9 +8,9 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; -import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; public class JsfJspJbide1717Test extends ContentAssistantTestCase { Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1807Test.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -1,6 +1,6 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.TestProjectProvider; public class JsfJspJbide1807Test extends ContentAssistantTestCase{ TestProjectProvider provider = null; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide1813Test.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -1,6 +1,6 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.TestProjectProvider; public class JsfJspJbide1813Test extends ContentAssistantTestCase{ TestProjectProvider provider = null; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2016Test.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2016Test.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2016Test.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -1,6 +1,6 @@ package org.jboss.tools.jst.jsp.test.ca; -import org.jboss.tools.common.test.util.TestProjectProvider; +import org.jboss.tools.test.util.TestProjectProvider; public class JsfJspJbide2016Test extends ContentAssistantTestCase{ TestProjectProvider provider = null; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JsfJspJbide2437Test.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -8,10 +8,10 @@ import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; public class JsfJspJbide2437Test extends ContentAssistantTestCase { TestProjectProvider provider = null; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1585Test.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -5,9 +5,9 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; import org.jboss.tools.jst.jsp.test.TestUtil; +import org.jboss.tools.test.util.TestProjectProvider; public class JstJspJbide1585Test extends ContentAssistantTestCase { TestProjectProvider provider = null; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1641Test.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -5,10 +5,10 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.contentassist.AutoContentAssistantProposal; import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; public class JstJspJbide1641Test extends ContentAssistantTestCase { TestProjectProvider provider = null; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/JstJspJbide1759Test.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -9,9 +9,9 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; import org.eclipse.wst.sse.ui.internal.contentassist.CustomCompletionProposal; -import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; /** * JBIDE-4341 JstJspAllTests/testJsfJspJbide1813Test failing with missing applicationScope in completions * Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/MissingKBBuilderTest.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/MissingKBBuilderTest.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/MissingKBBuilderTest.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -2,9 +2,9 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; public class MissingKBBuilderTest extends ContentAssistantTestCase{ TestProjectProvider provider = null; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.jsp.test/src/org/jboss/tools/jst/jsp/test/ca/StrutsJspJbide1648Test.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -5,9 +5,9 @@ import org.eclipse.jface.text.contentassist.ICompletionProposal; import org.eclipse.jface.text.contentassist.IContentAssistProcessor; -import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.jsp.test.TestUtil; import org.jboss.tools.test.util.JobUtils; +import org.jboss.tools.test.util.TestProjectProvider; public class StrutsJspJbide1648Test extends ContentAssistantTestCase { TestProjectProvider provider = null; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.web.kb.test/META-INF/MANIFEST.MF 2010-03-26 18:59:55 UTC (rev 21060) @@ -8,8 +8,7 @@ org.eclipse.core.resources, org.jboss.tools.jst.web.kb, org.junit, - org.jboss.tools.common.test, - org.jboss.tools.tests;bundle-version="2.0.0" + org.jboss.tools.tests Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 Bundle-Vendor: %Bundle-Vendor.0 Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.web.kb.test/src/org/jboss/tools/jst/web/kb/test/KbModelTest.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -17,13 +17,13 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.IncrementalProjectBuilder; import org.eclipse.core.runtime.NullProgressMonitor; -import org.jboss.tools.common.test.util.TestProjectProvider; import org.jboss.tools.jst.web.kb.IKbProject; import org.jboss.tools.jst.web.kb.internal.scanner.LoadedDeclarations; import org.jboss.tools.jst.web.kb.internal.scanner.ScannerException; import org.jboss.tools.jst.web.kb.internal.scanner.XMLScanner; import org.jboss.tools.jst.web.kb.taglib.ITagLibrary; import org.jboss.tools.test.util.JUnitUtils; +import org.jboss.tools.test.util.TestProjectProvider; import junit.framework.TestCase; Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.web.test/META-INF/MANIFEST.MF 2010-03-26 18:59:55 UTC (rev 21060) @@ -3,15 +3,9 @@ Bundle-Name: %Bundle-Name.0 Bundle-SymbolicName: org.jboss.tools.jst.web.test Bundle-Version: 2.0.0 -Require-Bundle: org.eclipse.ui, - org.eclipse.core.runtime, - org.jboss.tools.jst.web, - org.jboss.tools.jst.web.kb, +Require-Bundle: org.jboss.tools.jst.web, org.junit, - org.jboss.tools.common.test, - org.eclipse.core.resources, - org.jboss.tools.common.model, - org.jboss.tools.tests;bundle-version="2.0.0" + org.jboss.tools.tests Bundle-ActivationPolicy: lazy Bundle-Vendor: %Bundle-Vendor.0 Export-Package: org.jboss.tools.jst.web.test Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebContentAssistProviderTest.java =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebContentAssistProviderTest.java 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.web.test/src/org/jboss/tools/jst/web/test/WebContentAssistProviderTest.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -24,9 +24,9 @@ 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.common.test.util.TestProjectProvider; 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 { Modified: branches/modular_build/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF =================================================================== --- branches/modular_build/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2010-03-26 17:57:13 UTC (rev 21059) +++ branches/modular_build/jst/tests/org.jboss.tools.jst.web.ui.test/META-INF/MANIFEST.MF 2010-03-26 18:59:55 UTC (rev 21060) @@ -5,15 +5,12 @@ Bundle-Version: 1.0.0 Bundle-Vendor: %Bundle-Vendor.0 Require-Bundle: org.jboss.tools.jst.web.ui, - org.junit, org.eclipse.ui, - org.eclipse.core.runtime, org.eclipse.gef, org.jboss.tools.common.model.ui, org.jboss.tools.common.model.ui.test, - org.jboss.tools.common.model.test, - org.jboss.tools.tests;bundle-version="2.0.0", - org.eclipse.ui.ide;bundle-version="3.5.0" + org.jboss.tools.tests, + org.eclipse.ui.ide Export-Package: org.jboss.tools.jst.web.ui.test Bundle-ClassPath: jst-web-ui.jar Bundle-Localization: plugin Added: branches/modular_build/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescription.java =================================================================== --- branches/modular_build/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescription.java (rev 0) +++ branches/modular_build/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescription.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -0,0 +1,58 @@ +/******************************************************************************* + * Copyright (c) 2007 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.test.util; + +import java.util.Properties; + +import org.jboss.tools.common.xml.XMLUtilities; +import org.w3c.dom.Element; + +/** + * Test descriptions are contained in xml like this + * + * <tests> + * <test name="testName"> + * <property name="property1" value="value1"/> + * <property name="property2" value="value2"/> + * ... + * </test> + * ... + * </tests> + * + * Several tests can have the same name. A unit-test method + * can request for the list of them by the name from + * TestDescriptionFactory and process the list. + * + * @author V.Kabanovich + * + */ +public class TestDescription extends Properties { + private static final long serialVersionUID = 1L; + + String name; + + public TestDescription() {} + + public TestDescription(Element t) { + name = t.getAttribute("name"); + Element[] ps = XMLUtilities.getChildren(t, "property"); + for (int i = 0; i < ps.length; i++) { + String n = ps[i].getAttribute("name"); + String v = ps[i].getAttribute("value"); + if(n != null && v != null) setProperty(n, v); + } + } + + public String getName() { + return name; + } + +} Added: branches/modular_build/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescriptionFactory.java =================================================================== --- branches/modular_build/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescriptionFactory.java (rev 0) +++ branches/modular_build/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestDescriptionFactory.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -0,0 +1,94 @@ +/******************************************************************************* + * Copyright (c) 2007 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.test.util; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.Map; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.jboss.tools.common.xml.XMLEntityResolver; +import org.jboss.tools.common.xml.XMLUtilities; +import org.w3c.dom.Element; + +/** + * Utility class that helps to do parametrization of + * unit tests by data stored in xml. + * The xml location can be any place known to a specific unit-test, + * i.e. inside test project, or inside test plugin. + * + * Each named <test> element can declare any set of name-value pairs + * in <property> elements, and it is up to the implementation of + * a unit test method to request the list of test descriptions + * by the name and process them interpreting the properties. + * + * <!ELEMENT tests (test)*> + * <!ELEMENT test (property)*> + * <!ATTLIST test name CDATA #REQUIRED> + * <!ELEMENT property EMPTY> + * <!ATTLIST property name CDATA #REQUIRED> + * <!ATTLIST property value CDATA #IMPLIED> + * + * @author V.Kabanovich + * + */ +public class TestDescriptionFactory { + IFile file = null; + Set<TestDescription> testDescriptions = null; + Map<String, ArrayList<TestDescription>> testDescriptionsMap = new HashMap<String, ArrayList<TestDescription>>(); + + public TestDescriptionFactory(IFile file) { + this.file = file; + } + + /** + * Returns all test descriptions declared in file. + * @return + */ + public Set<TestDescription> getTestDescriptions() { + if(testDescriptions != null) return testDescriptions; + testDescriptions = new HashSet<TestDescription>(); + if(file == null || !file.exists()) return null; + Element tests = XMLUtilities.getElement(file.getLocation().toFile(), XMLEntityResolver.getInstance()); + if(tests == null) return null; + Element[] ts = XMLUtilities.getChildren(tests, "test"); + for (int i = 0; i < ts.length; i++) { + TestDescription t = new TestDescription(ts[i]); + testDescriptions.add(t); + } + return testDescriptions; + } + + /** + * Return list of test descriptions with the given name. + * @param name + * @return + */ + public ArrayList<TestDescription> getTestDescriptions(String name) { + getTestDescriptions(); + if(testDescriptions == null) return null; + ArrayList<TestDescription> set = testDescriptionsMap.get(name); + if(set == null) { + set = new ArrayList<TestDescription>(); + testDescriptionsMap.put(name, set); + Iterator<TestDescription> it = testDescriptions.iterator(); + while(it.hasNext()) { + TestDescription t = it.next(); + if(name.equals(t.getName())) set.add(t); + } + } + return set; + } + +} Added: branches/modular_build/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java =================================================================== --- branches/modular_build/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java (rev 0) +++ branches/modular_build/tests/tests/org.jboss.tools.tests/src/org/jboss/tools/test/util/TestProjectProvider.java 2010-03-26 18:59:55 UTC (rev 21060) @@ -0,0 +1,118 @@ +/******************************************************************************* + * Copyright (c) 2007 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.test.util; + +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.IWorkspaceRunnable; +import org.eclipse.core.resources.ResourcesPlugin; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.ILog; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.core.runtime.Platform; +import org.eclipse.core.runtime.Status; +import org.jboss.tools.common.util.FileUtil; + +/** + * Test plugins may define test projects to be added + * to the test workspace to run tests on them. + * This utility class manages adding/removing test projects. + * + * @author V.Kabanovich + */ + +public class TestProjectProvider { + IProject project; + boolean makeCopy = false; + + /** + * + * @param bundleName - name of plugin that contains code of test project. + * @param projectPath - path of test project relative to the plugin that + * contains it. If null, then by default is computed as '/projects/%name%' + * @param name - name of test project. If null, then by default is computed + * as last part of projectPath. + * @param makeCopy - boolean flag, if true, then test project will be copied + * to the test workspace; on test completing, the copy is destroyed. + * @throws Exception + */ + public TestProjectProvider(String bundleName, String projectPath, String name, boolean makeCopy) throws CoreException { + try { + if( null == projectPath ) { + project = ResourcesUtils.importProject(bundleName, "projects" + Path.SEPARATOR + name, null); + } else { + project = ResourcesUtils.importProject(bundleName, projectPath, null); + } + } catch (IOException e) { + throw new CoreException(new Status(Status.ERROR,bundleName,e.getMessage(),e)); + } catch (InvocationTargetException e) { + throw new CoreException(new Status(Status.ERROR,bundleName,e.getMessage(),e)); + } catch (InterruptedException e) { + throw new CoreException(new Status(Status.ERROR,bundleName,e.getMessage(),e)); + } + } + + public IProject getProject() { + return project; + } + + public void dispose() { + if (project == null || !project.exists()) { + return; + } + try { + boolean oldAutoBuilding = true; + try { + oldAutoBuilding = ResourcesUtils.setBuildAutomatically(false); + JobUtils.waitForIdle(10); + project.close(null); + JobUtils.waitForIdle(10); + project.delete(true, null); + JobUtils.waitForIdle(10); + } finally { + ResourcesUtils.setBuildAutomatically(oldAutoBuilding); + } + } catch (CoreException ex) { + ILog log = Platform.getLog(Platform.getBundle("org.jboss.tools.common.test")); + IStatus error = new Status( + IStatus.ERROR, + "org.jboss.tools.common.test", + "Exception occurs during project deletion",ex); + log.log(error); + } + } + + TestDescriptionFactory tests = null; + + public Set<TestDescription> getTestDescriptions() { + if(tests == null && project != null && project.isOpen()) { + IFile f = project.getFile(new Path("/testCases.xml")); + tests = new TestDescriptionFactory(f); + } + return (tests != null) ? tests.getTestDescriptions() : null; + } + + public ArrayList<TestDescription> getTestDescriptions(String name) { + getTestDescriptions(); + return (tests != null) ? tests.getTestDescriptions(name) : null; + } + +}