Author: dazarov Date: 2011-08-15 20:45:37 -0400 (Mon, 15 Aug 2011) New Revision: 33953 Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELReferencesQueryParticipantTest.java Log: https://issues.jboss.org/browse/JBIDE-9473 Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2011-08-16 00:33:27 UTC (rev 33952) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/SeamUiAllTests.java 2011-08-16 00:45:37 UTC (rev 33953) @@ -56,7 +56,8 @@ TestSuite suite = new TestSuite("Seam UI tests"); suite.addTestSuite(ELExprPartitionerTest.class); - suite.addTestSuite(ELReferencesQueryParticipantTest.class); + //suite.addTestSuite(ELReferencesQueryParticipantTest.class); + suite.addTest(new ProjectImportTestSetup(new TestSuite(ELReferencesQueryParticipantTest.class), "org.jboss.tools.seam.ui.test", new String[]{"projects/numberguess"}, new String[]{"numberguess"})); suite.addTestSuite(OpenSeamComponentDialogTest.class); suite.addTest(SeamComponentsViewAllTests.suite()); suite.addTest(SeamProjectNewWizardTest.suite()); Modified: trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELReferencesQueryParticipantTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELReferencesQueryParticipantTest.java 2011-08-16 00:33:27 UTC (rev 33952) +++ trunk/seam/tests/org.jboss.tools.seam.ui.test/src/org/jboss/tools/seam/ui/test/el/ELReferencesQueryParticipantTest.java 2011-08-16 00:45:37 UTC (rev 33953) @@ -5,8 +5,9 @@ import junit.framework.TestCase; import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.resources.ResourcesPlugin; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.QualifiedName; import org.jboss.tools.jst.web.kb.refactoring.ELReferencesQueryParticipant; import org.jboss.tools.jst.web.kb.test.QueryParticipantTestUtils; import org.jboss.tools.jst.web.kb.test.QueryParticipantTestUtils.MatchStructure; @@ -15,52 +16,12 @@ public class ELReferencesQueryParticipantTest extends TestCase{ TestProjectProvider provider = null; IProject project = null; - boolean makeCopy = false; - private static final String PROJECT_NAME = "numberguess"; - public static final QualifiedName IS_KB_NATURES_CHECK_NEED = new QualifiedName( - "", "Is KB natures check"); //$NON-NLS-1$ - public static final QualifiedName IS_JSF_NATURES_CHECK_NEED = new QualifiedName( - "", "Is JSF natures check"); //$NON-NLS-1$ - public static final QualifiedName IS_JSF_CHECK_NEED = new QualifiedName( - "", "Is JSF check"); //$NON-NLS-1$ - private String isKbNatureCheck = null; - private String isJsfNatureCheck = null; - private String isJsfCheck = null; - public void setUp() throws Exception { - provider = new TestProjectProvider("org.jboss.tools.seam.ui.test", "projects/" + PROJECT_NAME, PROJECT_NAME, makeCopy); - project = provider.getProject(); - Throwable exception = null; - - assertNull("An exception caught: " + (exception != null? exception.getMessage() : ""), exception); - if (project != null) { - isKbNatureCheck = project.getPersistentProperty(IS_KB_NATURES_CHECK_NEED); - project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, //$NON-NLS-1$ - Boolean.toString(false)); - isJsfNatureCheck = project.getPersistentProperty(IS_JSF_NATURES_CHECK_NEED); - project.setPersistentProperty(IS_JSF_NATURES_CHECK_NEED, //$NON-NLS-1$ - Boolean.toString(false)); - isJsfCheck = project.getPersistentProperty(IS_JSF_CHECK_NEED); - project.setPersistentProperty(IS_JSF_CHECK_NEED, //$NON-NLS-1$ - Boolean.toString(false)); - } + IResource project = ResourcesPlugin.getWorkspace().getRoot().findMember("numberguess"); + this.project = project.getProject(); } - protected void tearDown() throws Exception { - if (project != null) { - project.setPersistentProperty(IS_KB_NATURES_CHECK_NEED, //$NON-NLS-1$ - isKbNatureCheck); - project.setPersistentProperty(IS_JSF_NATURES_CHECK_NEED, //$NON-NLS-1$ - isJsfNatureCheck); - project.setPersistentProperty(IS_JSF_CHECK_NEED, //$NON-NLS-1$ - isJsfCheck); - } - if(provider != null) { - provider.dispose(); - } - } - public void testELReferencesQueryParticipantForType() throws CoreException{ ArrayList<MatchStructure> matches = new ArrayList<MatchStructure>();