[jbosstools-commits] JBoss Tools SVN: r25023 - trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test.

Author: akazakov Date: 2010-09-20 09:26:43 -0400 (Mon, 20 Sep 2010) New Revision: 25023 Removed: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java 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: JBIDE-6536 https://jira.jboss.org/browse/JBIDE-6536 seam.xml test failures - fixed Modified: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java 2010-09-20 12:42:28 UTC (rev 25022) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLAllTests.java 2010-09-20 13:26:43 UTC (rev 25023) @@ -24,8 +24,12 @@ public static Test suite() { TestSuite suite = new TestSuite(); suite.setName("All tests for " + PLUGIN_ID); - suite.addTest(new SeamXMLTestSetup(SeamXMLTestSuite.suite())); + TestSuite xmlSuite = new TestSuite("Seam XML Tests"); + xmlSuite.addTestSuite(SeamXMLModelTest.class); + + suite.addTest(new SeamXMLTestSetup(xmlSuite)); + return suite; } } \ No newline at end of file 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 2010-09-20 12:42:28 UTC (rev 25022) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLModelTest.java 2010-09-20 13:26:43 UTC (rev 25023) @@ -23,18 +23,12 @@ public class SeamXMLModelTest extends TestCase { IProject project = null; - public SeamXMLModelTest() { - super("Seam Scanner test"); - project = getTestProject(); - } - public IProject getTestProject() { if(project==null) { try { project = findTestProject(); - if(project==null || !project.exists()) { -// project = importPreparedProject("/"); - } + 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()); @@ -47,14 +41,14 @@ 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 = project.getFile(new Path("components22.xml")); + IFile f = getTestProject().getFile(new Path("components22.xml")); assertNotNull("File components22.xml is not found in Test project.", f); + assertTrue("File components22.xml is not accessible in Test project.", f.isAccessible()); XModelObject fileObject = EclipseResourceUtil.createObjectForResource(f); assertNotNull("Cannot create XModel object for file components22.xml.", fileObject); @@ -64,7 +58,7 @@ //TODO continue test } - + public void testComponentFile() { XModelObject fileObject = getComponent22Object(); String entity = fileObject.getModelEntity().getName(); @@ -73,45 +67,41 @@ protected XModelObject getComponents22Object() { assertNotNull(getTestProject()); - IFile f = project.getFile(new Path("components22.xml")); + IFile f = getTestProject().getFile(new Path("components22.xml")); assertNotNull(f); assertTrue(f.exists()); return EclipseResourceUtil.createObjectForResource(f); - } protected XModelObject getComponent22Object() { assertNotNull(getTestProject()); - IFile f = project.getFile(new Path("XYZ.component.xml")); + IFile f = getTestProject().getFile(new Path("XYZ.component.xml")); assertNotNull(f); assertTrue(f.exists()); return EclipseResourceUtil.createObjectForResource(f); - } public void testNavigationPagesComponent() { XModelObject fileObject = getComponents22Object(); assertNotNull("Cannot create XModel object for file components22.xml.", fileObject); - + XModelObject navigationPages = fileObject.getChildByPath("org.jboss.seam.navigation.pages"); assertNotNull("Cannot find org.jboss.seam.navigation.pages", navigationPages); - + XModelObject resources = navigationPages.getChildByPath("resources"); assertNotNull("Cannot find resources in org.jboss.seam.navigation.pages", resources); - + XModelObject[] resourcesList = resources.getChildren(); assertEquals(1, resourcesList.length); - + assertAttribute(navigationPages, "no-conversation-view-id", "a.xhtml"); assertAttribute(navigationPages, "login-view-id", "b.xhtml"); assertAttribute(navigationPages, "http-port", "1111"); assertAttribute(navigationPages, "https-port", "1112"); - } protected void assertAttribute(XModelObject object, String name, String value) { String actual = object.getAttributeValue(name); assertEquals("Attribute " + name + " in " + object.getPresentationString() + " is incorrect.", value, actual); } - -} +} \ No newline at end of file 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 2010-09-20 12:42:28 UTC (rev 25022) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSetup.java 2010-09-20 13:26:43 UTC (rev 25023) @@ -14,11 +14,9 @@ import junit.framework.Test; import org.eclipse.core.resources.IProject; -import org.eclipse.core.resources.IResource; import org.eclipse.core.runtime.NullProgressMonitor; import org.jboss.tools.test.util.JobUtils; import org.jboss.tools.test.util.ResourcesUtils; -import org.jboss.tools.test.util.xpl.EditorTestHelper; /** * @author Viacheslav Kabanovich @@ -35,8 +33,9 @@ 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(); +// project.refreshLocal(IResource.DEPTH_INFINITE, new NullProgressMonitor()); +// EditorTestHelper.joinBackgroundActivities(); + JobUtils.waitForIdle(); } @Override Deleted: trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java =================================================================== --- trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java 2010-09-20 12:42:28 UTC (rev 25022) +++ trunk/seam/tests/org.jboss.tools.seam.xml.test/src/org/jboss/tools/seam/xml/test/SeamXMLTestSuite.java 2010-09-20 13:26:43 UTC (rev 25023) @@ -1,26 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2010 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.seam.xml.test; - -import junit.framework.Test; -import junit.framework.TestSuite; - -/** - * @author V. Kabanovich - */ -public class SeamXMLTestSuite extends TestSuite { - - public static Test suite() { - TestSuite suite = new TestSuite("Seam XML Tests"); - suite.addTestSuite(SeamXMLModelTest.class); - return suite; - } -} \ No newline at end of file