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

Author: rob.stryker(a)jboss.com Date: 2011-01-04 13:35:43 -0500 (Tue, 04 Jan 2011) New Revision: 27884 Added: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-INF/MANIFEST.MF trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ASArchivesIntegrationTestSuite.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java Log: JBIDE-7936 - commit to fix test cases based on plugin dependency order etc Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-INF/MANIFEST.MF =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-INF/MANIFEST.MF 2011-01-04 18:13:38 UTC (rev 27883) +++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/META-INF/MANIFEST.MF 2011-01-04 18:35:43 UTC (rev 27884) @@ -20,6 +20,7 @@ org.jboss.ide.eclipse.archives.ui;bundle-version="1.0.0", org.eclipse.jface;bundle-version="3.4.2", org.jboss.tools.tests;bundle-version="2.0.0", - org.junit;bundle-version="3.8.2" + org.junit;bundle-version="3.8.2", + org.jboss.ide.eclipse.as.test;bundle-version="2.2.0" Bundle-RequiredExecutionEnvironment: J2SE-1.5 Export-Package: org.jboss.ide.eclipse.as.archives.integration.test Modified: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ASArchivesIntegrationTestSuite.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ASArchivesIntegrationTestSuite.java 2011-01-04 18:13:38 UTC (rev 27883) +++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/ASArchivesIntegrationTestSuite.java 2011-01-04 18:35:43 UTC (rev 27884) @@ -29,6 +29,7 @@ public static Test suite() { TestSuite suite = new TestSuite("AS Archives Integration Test Suite"); suite.addTestSuite(BuildDeployTest.class); + suite.addTestSuite(SingleFileZippedDeploymentIntegrationTest.class); return suite; } Added: trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java (rev 0) +++ trunk/as/tests/org.jboss.ide.eclipse.as.archives.integration.test/src/org/jboss/ide/eclipse/as/archives/integration/test/SingleFileZippedDeploymentIntegrationTest.java 2011-01-04 18:35:43 UTC (rev 27884) @@ -0,0 +1,89 @@ +package org.jboss.ide.eclipse.as.archives.integration.test; + +import java.io.File; +import java.io.IOException; + +import org.eclipse.core.resources.IFolder; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IPath; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.Path; +import org.eclipse.wst.server.core.IModule; +import org.jboss.ide.eclipse.archives.webtools.modules.WTPZippedPublisher; +import org.jboss.ide.eclipse.as.core.ExtensionManager; +import org.jboss.ide.eclipse.as.core.extensions.events.ServerLogger; +import org.jboss.ide.eclipse.as.core.modules.SingleDeployableFactory; +import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; +import org.jboss.ide.eclipse.as.test.ASTest; +import org.jboss.ide.eclipse.as.test.publishing.v2.SingleFileDeploymentTester; +import org.jboss.ide.eclipse.as.test.util.IOUtil; +import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils; + +public class SingleFileZippedDeploymentIntegrationTest extends SingleFileDeploymentTester { + public void testSingleFolderZipped() throws CoreException, IOException { + server = ServerRuntimeUtils.setZipped(server, true); + try { + singleFolderZippedInternal2(); + } finally { + server = ServerRuntimeUtils.setZipped(server, false); + } + } + public void singleFolderZippedInternal2() throws CoreException, IOException { + // create proj and files + final String folderName = "test"; + IFolder folder = project.getFolder(folderName); + folder.create(true, true, new NullProgressMonitor()); + IOUtil.setContents(folder.getFile("1.txt"), "1"); + IOUtil.setContents(folder.getFile("2.txt"), "2"); + IOUtil.setContents(folder.getFile("3.txt"), "3"); + IModule[] mods = SingleDeployableFactory.getFactory().getModules(); + assertEquals(mods.length, 0); + + // make deployable, do checks + SingleDeployableFactory.makeDeployable(folder); + mods = SingleDeployableFactory.getFactory().getModules(); + assertEquals(mods.length, 1); + server = ServerRuntimeUtils.addModule(server, mods[0]); + IPath deployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server)); + File f0 = deployRoot.toFile(); + assertFalse(f0.exists()); + assertTrue(deployRoot.toFile().mkdirs()); + assertEquals(IOUtil.countFiles(deployRoot.toFile()), 0); + assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 1); + + // publish and verify deployment + File publishLog = ServerLogger.getDefault().getServerLogFile(server); + publishLog.delete(); + assertTrue(!publishLog.exists()); + IJBossServerPublisher publisher = ExtensionManager.getDefault().getPublisher(server, mods, "local"); + assertNotNull(publisher); + assertTrue(publisher.getClass().getName() + " not equal to WTPZippedPublisher", + publisher.getClass().equals(WTPZippedPublisher.class)); + ServerRuntimeUtils.publish(server); + assertTrue(publishLog.exists()); + System.out.println(IOUtil.getContents(publishLog)); + assertEquals(IOUtil.countFiles(deployRoot.toFile()), 1); + assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 2); + + // unzip, verify 3.txt + IPath unzip1 = ASTest.getDefault().getStateLocation().append("unzip1"); + IOUtil.unzipFile(deployRoot.append(folderName),unzip1); + assertEquals(IOUtil.countFiles(unzip1.toFile()), 3); + String deploy3txt1 = IOUtil.getContents(unzip1.append("3.txt").toFile()); + assertEquals("3", deploy3txt1); + + // make workspace change, repeat + IOUtil.setContents(folder.getFile("3.txt"), "3a"); + ServerRuntimeUtils.publish(server); + assertEquals(IOUtil.countFiles(deployRoot.toFile()), 1); + assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 2); + + // verify new changes + IPath unzip2 = ASTest.getDefault().getStateLocation().append("unzip2"); + IOUtil.unzipFile(deployRoot.append(folderName),unzip2); + assertEquals(IOUtil.countFiles(unzip2.toFile()), 3); + String deploy3txt2 = IOUtil.getContents(unzip2.append("3.txt").toFile()); + assertEquals("3a", deploy3txt2); + + } +} Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java 2011-01-04 18:13:38 UTC (rev 27883) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/JSTDeploymentTester.java 2011-01-04 18:35:43 UTC (rev 27884) @@ -28,8 +28,8 @@ public class JSTDeploymentTester extends TestCase { - IProject project; - IServer server; + protected IProject project; + protected IServer server; final String MODULE_NAME = "newModule"; final String CONTENT_DIR = "contentDirS"; final String TEXT_FILE = "test.txt"; Modified: trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java =================================================================== --- trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-01-04 18:13:38 UTC (rev 27883) +++ trunk/as/tests/org.jboss.ide.eclipse.as.test/src/org/jboss/ide/eclipse/as/test/publishing/v2/SingleFileDeploymentTester.java 2011-01-04 18:35:43 UTC (rev 27884) @@ -18,10 +18,9 @@ import org.jboss.ide.eclipse.as.core.server.IJBossServerPublisher; import org.jboss.ide.eclipse.as.core.server.internal.ServerAttributeHelper; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader; -import org.jboss.ide.eclipse.as.core.util.IJBossToolingConstants; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentModulePrefs; import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentPreferences; -import org.jboss.ide.eclipse.as.core.util.DeploymentPreferenceLoader.DeploymentTypePrefs; +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.IOUtil; import org.jboss.ide.eclipse.as.test.util.ServerRuntimeUtils; @@ -164,73 +163,4 @@ server = ServerRuntimeUtils.setZipped(server, false); } } - - public void testSingleFolderZipped() throws CoreException, IOException { - server = ServerRuntimeUtils.setZipped(server, true); - try { - singleFolderZippedInternal2(); - } finally { - server = ServerRuntimeUtils.setZipped(server, false); - } - } - - public void singleFolderZippedInternal2() throws CoreException, IOException { - // create proj and files - final String folderName = "test"; - IFolder folder = project.getFolder(folderName); - folder.create(true, true, new NullProgressMonitor()); - IOUtil.setContents(folder.getFile("1.txt"), "1"); - IOUtil.setContents(folder.getFile("2.txt"), "2"); - IOUtil.setContents(folder.getFile("3.txt"), "3"); - IModule[] mods = SingleDeployableFactory.getFactory().getModules(); - assertEquals(mods.length, 0); - - // make deployable, do checks - SingleDeployableFactory.makeDeployable(folder); - mods = SingleDeployableFactory.getFactory().getModules(); - assertEquals(mods.length, 1); - server = ServerRuntimeUtils.addModule(server, mods[0]); - IPath deployRoot = new Path(ServerRuntimeUtils.getDeployRoot(server)); - File f0 = deployRoot.toFile(); - assertFalse(f0.exists()); - assertTrue(deployRoot.toFile().mkdirs()); - assertEquals(IOUtil.countFiles(deployRoot.toFile()), 0); - assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 1); - - // publish and verify deployment - File publishLog = ServerLogger.getDefault().getServerLogFile(server); - publishLog.delete(); - assertTrue(!publishLog.exists()); - IJBossServerPublisher publisher = ExtensionManager.getDefault().getPublisher(server, mods, "local"); - assertNotNull(publisher); - assertTrue(publisher.getClass().getName() + " not equal to WTPZippedPublisher", - publisher.getClass().getName().contains("WTPZippedPublisher")); - ServerRuntimeUtils.publish(server); - assertTrue(publishLog.exists()); - System.out.println(IOUtil.getContents(publishLog)); - assertEquals(IOUtil.countFiles(deployRoot.toFile()), 1); - assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 2); - - // unzip, verify 3.txt - IPath unzip1 = ASTest.getDefault().getStateLocation().append("unzip1"); - IOUtil.unzipFile(deployRoot.append(folderName),unzip1); - assertEquals(IOUtil.countFiles(unzip1.toFile()), 3); - String deploy3txt1 = IOUtil.getContents(unzip1.append("3.txt").toFile()); - assertEquals("3", deploy3txt1); - - // make workspace change, repeat - IOUtil.setContents(folder.getFile("3.txt"), "3a"); - ServerRuntimeUtils.publish(server); - assertEquals(IOUtil.countFiles(deployRoot.toFile()), 1); - assertEquals(IOUtil.countAllResources(deployRoot.toFile()), 2); - - // verify new changes - IPath unzip2 = ASTest.getDefault().getStateLocation().append("unzip2"); - IOUtil.unzipFile(deployRoot.append(folderName),unzip2); - assertEquals(IOUtil.countFiles(unzip2.toFile()), 3); - String deploy3txt2 = IOUtil.getContents(unzip2.append("3.txt").toFile()); - assertEquals("3a", deploy3txt2); - - } - }