[jbosstools-commits] JBoss Tools SVN: r39158 - in trunk/as: tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test and 1 other directories.

Author: rob.stryker(a)jboss.com Date: 2012-02-27 23:06:02 -0500 (Mon, 27 Feb 2012) New Revision: 39158 Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/XPathModelTest.java Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java Log: Stupid stupid regression due to fixing error logging. Added a test case to prevent this in the future Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-02-28 02:33:01 UTC (rev 39157) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.core/jbosscore/org/jboss/ide/eclipse/as/core/extensions/descriptors/XPathModel.java 2012-02-28 04:06:02 UTC (rev 39158) @@ -177,12 +177,10 @@ saveCategory(categories[i], server, child); } File f = getFile(server); - if( f != null && f.exists()) { - try { - memento.save(new FileOutputStream(f)); - } catch( IOException ioe) { - JBossServerCorePlugin.log(ioe); - } + try { + memento.save(new FileOutputStream(f)); + } catch( IOException ioe) { + JBossServerCorePlugin.log("The XPath Model could not be saved", ioe); //$NON-NLS-1$ } } Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2012-02-28 02:33:01 UTC (rev 39157) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/ASTestSuite.java 2012-02-28 04:06:02 UTC (rev 39158) @@ -47,6 +47,7 @@ import org.jboss.ide.eclipse.as.test.server.JBossServerAPITest; import org.jboss.ide.eclipse.as.test.server.ServerBeanLoaderTest; import org.jboss.ide.eclipse.as.test.server.ServerSecureStorageTest; +import org.jboss.ide.eclipse.as.test.server.XPathModelTest; import org.jboss.ide.eclipse.as.test.util.ArgsUtilTest; import org.jboss.ide.eclipse.as.test.util.ExpressionResolverUtilTest; @@ -58,6 +59,7 @@ suite.addTestSuite(ExpressionResolverUtilTest.class); suite.addTestSuite(PreReqTest.class); suite.addTestSuite(ServerBeanLoaderTest.class); + // Cannot find a way to run this test and pre-load the credentials for the keystore //suite.addTestSuite(ServerSecureStorageTest.class); suite.addTestSuite(RuntimeServerModelTest.class); @@ -65,6 +67,7 @@ suite.addTestSuite(ProjectRuntimeTest.class); suite.addTestSuite(JSTDeploymentWarUpdateXML.class); suite.addTestSuite(SingleFileDeployableMockDeploymentTester.class); + suite.addTestSuite(XPathModelTest.class); // Publishing tests suite.addTestSuite(BehaviourModelDefectTest.class); Added: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/XPathModelTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/XPathModelTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/server/XPathModelTest.java 2012-02-28 04:06:02 UTC (rev 39158) @@ -0,0 +1,78 @@ +package org.jboss.ide.eclipse.as.test.server; + +import java.io.File; + +import junit.framework.TestCase; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.wst.server.core.IServer; +import org.jboss.ide.eclipse.as.core.JBossServerCorePlugin; +import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; +import org.jboss.ide.eclipse.as.test.ASTest; +import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils; +import org.jboss.ide.eclipse.as.test.util.wtp.ProjectUtility; +import org.jboss.tools.test.util.JobUtils; + +public class XPathModelTest extends TestCase { + + static { + JobUtils.waitForIdle(5000); + } + + public void setUp() { + JobUtils.waitForIdle(); + } + + public void tearDown() { + try { + ServerRuntimeUtils.deleteAllServers(); + ServerRuntimeUtils.deleteAllRuntimes(); + ProjectUtility.deleteAllProjects(); + ASTest.clearStateLocation(); + } catch(Exception ce ) { + // ignore + } + } + + protected void serverTestImpl(String type) { + IServer server = ServerRuntimeUtils.createMockServerWithRuntime(type, "server1", "default"); + File xpathFile = JBossServerCorePlugin.getServerStateLocation(server).append(IJBossToolingConstants.XPATH_FILE_NAME).toFile(); + JobUtils.waitForIdle(500); + System.out.println(xpathFile.exists()); + + System.out.println(xpathFile.exists()); + if( !xpathFile.exists()) + fail("The XPath File has not been created. Xpaths will be lost on workspace restart"); + } + public void test32Mock() { + serverTestImpl(IJBossToolingConstants.SERVER_AS_32); + } + + public void test40Mock() { + serverTestImpl(IJBossToolingConstants.SERVER_AS_40); + } + + public void test42Mock() { + serverTestImpl(IJBossToolingConstants.SERVER_AS_42); + } + + public void test50Mock() { + serverTestImpl(IJBossToolingConstants.SERVER_AS_50); + } + public void test51Mock() { + serverTestImpl(IJBossToolingConstants.SERVER_AS_51); + } + public void test60Mock() { + serverTestImpl(IJBossToolingConstants.SERVER_AS_60); + } + public void testEap43Mock() { + serverTestImpl(IJBossToolingConstants.SERVER_EAP_43); + } + public void testEap50Mock() { + serverTestImpl(IJBossToolingConstants.SERVER_EAP_50); + } + public void testEap60Mock() { + serverTestImpl(IJBossToolingConstants.SERVER_EAP_60); + } + +}