From: <jbo...@li...> - 2006-02-26 19:24:54
|
Author: aron.gombas Date: 2006-02-26 14:24:42 -0500 (Sun, 26 Feb 2006) New Revision: 2655 Added: trunk/labs/kosmos/src/test/hu/midori/kosmos/server/MockContentStore.java Modified: trunk/labs/kosmos/src/test/hu/midori/kosmos/server/cc/CcServiceTest.java trunk/labs/kosmos/src/test/hu/midori/kosmos/server/jira/JiraServiceTest.java trunk/labs/kosmos/src/test/hu/midori/kosmos/server/svn/SvnServiceTest.java Log: Mock content store for testing Added: trunk/labs/kosmos/src/test/hu/midori/kosmos/server/MockContentStore.java =================================================================== --- trunk/labs/kosmos/src/test/hu/midori/kosmos/server/MockContentStore.java 2006-02-26 18:54:38 UTC (rev 2654) +++ trunk/labs/kosmos/src/test/hu/midori/kosmos/server/MockContentStore.java 2006-02-26 19:24:42 UTC (rev 2655) @@ -0,0 +1,35 @@ +/* + * Kosmos. + * + * Distributable under LGPL license. + * See terms of license at gnu.org. + */ +package hu.midori.kosmos.server; + +import java.io.InputStream; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + * Mock store implementation used during unit testing. + * + * @author <a href="mailto:aro...@mi...">Aron Gombas</a> + * @version $Id$ + */ +public class MockContentStore implements StaticContentStore { + private final static Log log = LogFactory.getLog(MockContentStore.class); + + public void begin() { + log.debug("Beginning mock store session..."); + } + + public void end() { + log.debug("Ending mock store session..."); + } + + public String storeFile(String fileName, InputStream in) throws Exception { + log.debug(String.format("Storing \"%s\" (%d bytes available)...", fileName, in.available())); + return null;// TODO + } +} Modified: trunk/labs/kosmos/src/test/hu/midori/kosmos/server/cc/CcServiceTest.java =================================================================== --- trunk/labs/kosmos/src/test/hu/midori/kosmos/server/cc/CcServiceTest.java 2006-02-26 18:54:38 UTC (rev 2654) +++ trunk/labs/kosmos/src/test/hu/midori/kosmos/server/cc/CcServiceTest.java 2006-02-26 19:24:42 UTC (rev 2655) @@ -10,11 +10,14 @@ import hu.midori.kosmos.model.CcProject; import hu.midori.kosmos.model.CcTest; import hu.midori.kosmos.protocol.CcService; +import hu.midori.kosmos.server.AbstractKosmosService; import hu.midori.kosmos.server.AbstractKosmosServiceTest; +import hu.midori.kosmos.server.MockContentStore; import java.util.List; import org.apache.commons.lang.StringUtils; +import org.testng.annotations.Configuration; import org.testng.annotations.Test; /** @@ -26,54 +29,36 @@ public class CcServiceTest extends AbstractKosmosServiceTest { private CcService service = new CcServiceImpl(); - /** Tests finding the most recent logfile. */ - @Test() - public void testMostRecentFinder() { - // TODO + @Configuration(beforeTestMethod=true) + public void setup() { + ((AbstractKosmosService)service).setStore(new MockContentStore()); } /** Tests with an invalid path. */ @Test() public void testInvalidPath() { - assert service.getProjects("nosuchpath").isEmpty(); + assert service.getProjects("http://cruisecontrol.nosuchdomain.com/cc/buildresults/nosuchproduct-testsuite").isEmpty(); } @Test() - public void testStandardLogs() {// TODO add these files to the repo and the src distro - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/ais"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/cargo-m2-trunk"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/commons-math"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/frifinans"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/gridportlets"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/gridsphere"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/gvlam"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/jboss-3.2"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/jboss-remoting"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/log4rss"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/mobicents-dailytckrun"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/mock-apis-trunk"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/openpacs"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/scarab-mysql"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/scarab-pgsql"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/src-repo/testdata/cc-log/weta-dfs"); + public void testStandardLogs() {// TODO add more logfiles + testLog("http://cruisecontrol.jboss.com/cc/buildresults/jboss-portal-2.2-testsuite"); } - // TODO add more logfiles - - /** Tests a dir. */ + /** Tests a log. */ @Test() - protected void testLog(String dir) { - List<CcProject> projects = service.getProjects(dir); + protected void testLog(String url) { + List<CcProject> projects = service.getProjects(url); assert projects.size() == 1; // one CC log contains exactly one project // test project CcProject project = projects.get(0); - assert project.getName().length() > 0; - assert project.getBuildLabel().length() > 0; + assert !StringUtils.isBlank(project.getName()); + assert !StringUtils.isBlank(project.getBuildLabel()); assert (project.getStatus() == CcBuildStatus.SUCCEEDED) || (project.getStatus() == CcBuildStatus.FAILED); assert project.getTimestamp().getTime() > 0; assert project.getModifications() >= 0; - assert project.getBuildTime().length() > 0; + assert !StringUtils.isBlank(project.getBuildTime()); assert project.getTests() >= 0; assert project.getTestsSucceded() >= 0; assert project.getFailures() >= 0; Modified: trunk/labs/kosmos/src/test/hu/midori/kosmos/server/jira/JiraServiceTest.java =================================================================== --- trunk/labs/kosmos/src/test/hu/midori/kosmos/server/jira/JiraServiceTest.java 2006-02-26 18:54:38 UTC (rev 2654) +++ trunk/labs/kosmos/src/test/hu/midori/kosmos/server/jira/JiraServiceTest.java 2006-02-26 19:24:42 UTC (rev 2655) @@ -8,12 +8,15 @@ import hu.midori.kosmos.model.JiraProject; import hu.midori.kosmos.protocol.JiraService; +import hu.midori.kosmos.server.AbstractKosmosService; import hu.midori.kosmos.server.AbstractKosmosServiceTest; +import hu.midori.kosmos.server.MockContentStore; import java.util.List; import java.util.Map; import org.apache.commons.lang.StringUtils; +import org.testng.annotations.Configuration; import org.testng.annotations.Test; /** @@ -25,6 +28,11 @@ public class JiraServiceTest extends AbstractKosmosServiceTest { private JiraService service = new JiraWebCrawlingServiceImpl(); + @Configuration(beforeTestMethod=true) + public void setup() { + ((AbstractKosmosService)service).setStore(new MockContentStore()); + } + /** Tests with invalid URL. */ @Test() public void testInvalidUrl() { Modified: trunk/labs/kosmos/src/test/hu/midori/kosmos/server/svn/SvnServiceTest.java =================================================================== --- trunk/labs/kosmos/src/test/hu/midori/kosmos/server/svn/SvnServiceTest.java 2006-02-26 18:54:38 UTC (rev 2654) +++ trunk/labs/kosmos/src/test/hu/midori/kosmos/server/svn/SvnServiceTest.java 2006-02-26 19:24:42 UTC (rev 2655) @@ -8,11 +8,14 @@ import hu.midori.kosmos.model.SvnRepository; import hu.midori.kosmos.protocol.SvnService; +import hu.midori.kosmos.server.AbstractKosmosService; import hu.midori.kosmos.server.AbstractKosmosServiceTest; +import hu.midori.kosmos.server.MockContentStore; import java.util.List; import org.apache.commons.lang.StringUtils; +import org.testng.annotations.Configuration; import org.testng.annotations.Test; /** @@ -24,6 +27,11 @@ public class SvnServiceTest extends AbstractKosmosServiceTest { private SvnService service = new SvnServiceImpl(); + @Configuration(beforeTestMethod=true) + public void setup() { + ((AbstractKosmosService)service).setStore(new MockContentStore()); + } + /** Tests with invalid URL. */ @Test() public void testInvalidUrl() { |