Author: dgolovin Date: 2011-08-18 14:07:19 -0400 (Thu, 18 Aug 2011) New Revision: 34068 Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java Log: test code cleanup Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java 2011-08-18 17:37:47 UTC (rev 34067) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java 2011-08-18 18:07:19 UTC (rev 34068) @@ -25,31 +25,17 @@ public class SeamXMLModelTest extends TestCase { IProject project = null; - public IProject getTestProject() { - if(project==null) { - try { - project = findTestProject(); - assertNotNull("Project Test is not found.", project); - assertTrue("Project Test is not accessible.", project.isAccessible()); - } catch (Exception e) { - e.printStackTrace(); - fail("Can't import Seam XML test project: " + e.getMessage()); - } - } - return project; + @Override + protected void setUp() throws Exception { + project = ResourcesPlugin.getWorkspace().getRoot().getProject("Test"); } - public static IProject findTestProject() { - return ResourcesPlugin.getWorkspace().getRoot().getProject("Test"); - } - /** * This test is to check different cases of declaring components in xml. * It does not check interaction of xml declaration with other declarations. */ public void testXMLModel() { - IFile f = getTestProject().getFile(new Path("components22.xml")); - assertNotNull("File components22.xml is not found in Test project.", f); + IFile f = project.getFile(new Path("components22.xml")); assertTrue("File components22.xml is not accessible in Test project.", f.isAccessible()); XModelObject fileObject = EclipseResourceUtil.createObjectForResource(f); @@ -68,16 +54,13 @@ } protected XModelObject getComponents22Object() { - assertNotNull(getTestProject()); - IFile f = getTestProject().getFile(new Path("components22.xml")); - assertNotNull(f); + IFile f = project.getFile(new Path("components22.xml")); assertTrue(f.exists()); return EclipseResourceUtil.createObjectForResource(f); } protected XModelObject getComponent22Object() { - assertNotNull(getTestProject()); - IFile f = getTestProject().getFile(new Path("XYZ.component.xml")); + IFile f = project.getFile(new Path("XYZ.component.xml")); assertNotNull(f); assertTrue(f.exists()); return EclipseResourceUtil.createObjectForResource(f); Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java 2011-08-18 17:37:47 UTC (rev 34067) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java 2011-08-18 18:07:19 UTC (rev 34068) @@ -33,8 +33,6 @@ protected void setUp() throws Exception { project = ResourcesUtils.importProject( "org.jboss.tools.seam.xml.test","/projects/Test" , new NullProgressMonitor()); -// project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); -// EditorTestHelper.joinBackgroundActivities(); JobUtils.waitForIdle(); }