From: <jbo...@li...> - 2005-11-01 10:24:20
|
Author: aron.gombas Date: 2005-11-01 05:24:03 -0500 (Tue, 01 Nov 2005) New Revision: 1478 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/sf/SfServiceTest.java trunk/labs/kosmos/src/test/hu/midori/kosmos/server/svn/SvnServiceTest.java Log: New tests (still not running because of a JTidy problem?!) 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 2005-10-31 16:21:45 UTC (rev 1477) +++ trunk/labs/kosmos/src/test/hu/midori/kosmos/server/cc/CcServiceTest.java 2005-11-01 10:24:03 UTC (rev 1478) @@ -6,6 +6,7 @@ */ package hu.midori.kosmos.server.cc; +import hu.midori.kosmos.model.CcBuildStatus; import hu.midori.kosmos.model.CcProject; import hu.midori.kosmos.model.CcTest; import hu.midori.kosmos.protocol.CcService; @@ -35,22 +36,22 @@ } public void testStandardLogs() {// TODO add these files to the repo and the src distro - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/ais"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/cargo-m2-trunk"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/commons-math"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/frifinans"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/gridportlets"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/gridsphere"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/gvlam"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/jboss-3.2"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/jboss-remoting"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/log4rss"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/mobicents-dailytckrun"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/mock-apis-trunk"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/openpacs"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/scarab-mysql"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/scarab-pgsql"); - testLog("/!Usr/Aron/Own/midori/projects/kosmos/testdata/cc-log/weta-dfs"); + 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"); } // TODO add more logfiles @@ -64,7 +65,7 @@ CcProject project = projects.get(0); assertTrue(project.getName().length() > 0); assertTrue(project.getBuildLabel().length() > 0); - // TODO assert getStatus() { + assertTrue((project.getStatus() == CcBuildStatus.SUCCEEDED) || (project.getStatus() == CcBuildStatus.FAILED)); assertTrue(project.getTimestamp().getTime() > 0); assertTrue(project.getModifications() >= 0); assertTrue(project.getBuildTime().length() > 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 2005-10-31 16:21:45 UTC (rev 1477) +++ trunk/labs/kosmos/src/test/hu/midori/kosmos/server/jira/JiraServiceTest.java 2005-11-01 10:24:03 UTC (rev 1478) @@ -11,6 +11,7 @@ import hu.midori.kosmos.server.AbstractKosmosServiceTest; import java.util.List; +import java.util.Map; import org.apache.commons.lang.StringUtils; @@ -28,13 +29,13 @@ assertEquals(0, service.getProjects("http://www.nosuchdomain.com/jira").size()); } - /** Tests authentication. */ + /** Tests accessing secured databases. */ public void testAuthentication() { - // login with invalid account - // TODO implement after the authentication is implemented - - // login with valid account - // TODO implement after the authentication is implemented + // test secured without signing in + assertEquals(0, service.getProjects("http://svn.jboss.com/jbossas").size());// TODO specify secured here + + // test secured with signing in + testDatabase("http://myusername@mypassword:xxx.yyy.zzz/myproject");// TODO } public void testApacheInstance() { @@ -42,71 +43,71 @@ } public void testAtlassianInstance() { - testPublicInstance("http://jira.atlassian.com/browse/COBJ"); - testPublicInstance("http://jira.atlassian.com/browse/CORE"); - testPublicInstance("http://jira.atlassian.com/browse/MAIL"); - testPublicInstance("http://jira.atlassian.com/browse/PLUG"); - testPublicInstance("http://jira.atlassian.com/browse/CONF"); - testPublicInstance("http://jira.atlassian.com/browse/JRA"); - testPublicInstance("http://jira.atlassian.com/browse/PERF"); - testPublicInstance("http://jira.atlassian.com/browse/SVN"); - testPublicInstance("http://jira.atlassian.com/browse/TST"); + testDatabase("http://jira.atlassian.com/browse/COBJ"); + testDatabase("http://jira.atlassian.com/browse/CORE"); + testDatabase("http://jira.atlassian.com/browse/MAIL"); + testDatabase("http://jira.atlassian.com/browse/PLUG"); + testDatabase("http://jira.atlassian.com/browse/CONF"); + testDatabase("http://jira.atlassian.com/browse/JRA"); + testDatabase("http://jira.atlassian.com/browse/PERF"); + testDatabase("http://jira.atlassian.com/browse/SVN"); + testDatabase("http://jira.atlassian.com/browse/TST"); } public void testCodeHausInstance() { - testPublicInstance("http://jira.codehaus.org/browse/ACL"); - testPublicInstance("http://jira.codehaus.org/browse/ACTIVEIO"); - testPublicInstance("http://jira.codehaus.org/browse/AWS"); - testPublicInstance("http://jira.codehaus.org/browse/ASP"); - testPublicInstance("http://jira.codehaus.org/browse/AJLIB"); - testPublicInstance("http://jira.codehaus.org/browse/ANNOGEN"); - testPublicInstance("http://jira.codehaus.org/browse/ASH"); - testPublicInstance("http://jira.codehaus.org/browse/AWARE"); - testPublicInstance("http://jira.codehaus.org/browse/BERKANO"); - testPublicInstance("http://jira.codehaus.org/browse/BLISSED"); - testPublicInstance("http://jira.codehaus.org/browse/BOO"); - testPublicInstance("http://jira.codehaus.org/browse/CARGO"); + testDatabase("http://jira.codehaus.org/browse/ACL"); + testDatabase("http://jira.codehaus.org/browse/ACTIVEIO"); + testDatabase("http://jira.codehaus.org/browse/AWS"); + testDatabase("http://jira.codehaus.org/browse/ASP"); + testDatabase("http://jira.codehaus.org/browse/AJLIB"); + testDatabase("http://jira.codehaus.org/browse/ANNOGEN"); + testDatabase("http://jira.codehaus.org/browse/ASH"); + testDatabase("http://jira.codehaus.org/browse/AWARE"); + testDatabase("http://jira.codehaus.org/browse/BERKANO"); + testDatabase("http://jira.codehaus.org/browse/BLISSED"); + testDatabase("http://jira.codehaus.org/browse/BOO"); + testDatabase("http://jira.codehaus.org/browse/CARGO"); } public void testJBossInstance() { - testPublicInstance("http://jira.jboss.com/jira/browse/JBQA"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBWIKI"); - testPublicInstance("http://jira.jboss.com/jira/browse/EJBTHREE"); - testPublicInstance("http://jira.jboss.com/jira/browse/HIBERNATE"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBAOP"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBAS"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBIDE"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBMESSAGING"); - testPublicInstance("http://jira.jboss.com/jira/browse/JGRP"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBTPL"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBDOCS"); - testPublicInstance("http://jira.jboss.com/jira/browse/JASSIST"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBADMCON"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBBENCH"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBBUILD"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBCACHE"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBCLUSTER"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBINSTALL"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBPM"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBLAB"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBMAIL"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBMICROCONT"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBPORTAL"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBPROFILER"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBREM"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBSEAM"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBSER"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBSHARP"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBWEB"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBXB"); - testPublicInstance("http://jira.jboss.com/jira/browse/JBWS"); - testPublicInstance("http://jira.jboss.com/jira/browse/KOSMOS"); + testDatabase("http://jira.jboss.com/jira/browse/JBQA"); + testDatabase("http://jira.jboss.com/jira/browse/JBWIKI"); + testDatabase("http://jira.jboss.com/jira/browse/EJBTHREE"); + testDatabase("http://jira.jboss.com/jira/browse/HIBERNATE"); + testDatabase("http://jira.jboss.com/jira/browse/JBAOP"); + testDatabase("http://jira.jboss.com/jira/browse/JBAS"); + testDatabase("http://jira.jboss.com/jira/browse/JBIDE"); + testDatabase("http://jira.jboss.com/jira/browse/JBMESSAGING"); + testDatabase("http://jira.jboss.com/jira/browse/JGRP"); + testDatabase("http://jira.jboss.com/jira/browse/JBTPL"); + testDatabase("http://jira.jboss.com/jira/browse/JBDOCS"); + testDatabase("http://jira.jboss.com/jira/browse/JASSIST"); + testDatabase("http://jira.jboss.com/jira/browse/JBADMCON"); + testDatabase("http://jira.jboss.com/jira/browse/JBBENCH"); + testDatabase("http://jira.jboss.com/jira/browse/JBBUILD"); + testDatabase("http://jira.jboss.com/jira/browse/JBCACHE"); + testDatabase("http://jira.jboss.com/jira/browse/JBCLUSTER"); + testDatabase("http://jira.jboss.com/jira/browse/JBINSTALL"); + testDatabase("http://jira.jboss.com/jira/browse/JBPM"); + testDatabase("http://jira.jboss.com/jira/browse/JBLAB"); + testDatabase("http://jira.jboss.com/jira/browse/JBMAIL"); + testDatabase("http://jira.jboss.com/jira/browse/JBMICROCONT"); + testDatabase("http://jira.jboss.com/jira/browse/JBPORTAL"); + testDatabase("http://jira.jboss.com/jira/browse/JBPROFILER"); + testDatabase("http://jira.jboss.com/jira/browse/JBREM"); + testDatabase("http://jira.jboss.com/jira/browse/JBSEAM"); + testDatabase("http://jira.jboss.com/jira/browse/JBSER"); + testDatabase("http://jira.jboss.com/jira/browse/JBSHARP"); + testDatabase("http://jira.jboss.com/jira/browse/JBWEB"); + testDatabase("http://jira.jboss.com/jira/browse/JBXB"); + testDatabase("http://jira.jboss.com/jira/browse/JBWS"); + testDatabase("http://jira.jboss.com/jira/browse/KOSMOS"); } // TODO add further instances seen in the Atlassian pages - /** Tests a public instance. */ - protected void testPublicInstance(String url) { + /** Tests a database. */ + protected void testDatabase(String url) { List<JiraProject> projects = service.getProjects(url); assertTrue(projects.size() > 0); @@ -132,7 +133,7 @@ assertTrue(project.getTrivialOpenIssues() >= 0); assertTrue(project.getOptionalOpenIssues() >= 0); - // TODO assert getOpenIssuesPerAssignee() + testOpenIssuesPerAssignee(project); assertFalse(StringUtils.isBlank(project.getIssuesPerStatusChartUrl())); assertFalse(StringUtils.isBlank(project.getOpenIssuesPerPriorityChartUrl())); @@ -141,4 +142,15 @@ assertEquals(project.getTotalIssues(), project.getOpenIssues() + project.getCodingInProgressIssues() + project.getReopenedIssues() + project.getResolvedIssues() + project.getClosedIssues()); } } + + /** Tests the open issues per assignee in a project. */ + protected static void testOpenIssuesPerAssignee(JiraProject project) { + int openIssuesCalculated = 0; + for(Map.Entry<String, Integer> openIssuePerAssignee : project.getOpenIssuesPerAssignee()) { + assertFalse(StringUtils.isBlank(openIssuePerAssignee.getKey())); + assertTrue(openIssuePerAssignee.getValue() > 0); + openIssuesCalculated += openIssuePerAssignee.getValue(); + } + assertEquals(project.getOpenIssues(), openIssuesCalculated); + } } Modified: trunk/labs/kosmos/src/test/hu/midori/kosmos/server/sf/SfServiceTest.java =================================================================== --- trunk/labs/kosmos/src/test/hu/midori/kosmos/server/sf/SfServiceTest.java 2005-10-31 16:21:45 UTC (rev 1477) +++ trunk/labs/kosmos/src/test/hu/midori/kosmos/server/sf/SfServiceTest.java 2005-11-01 10:24:03 UTC (rev 1478) @@ -51,7 +51,9 @@ testProjectWithRelease("http://sourceforge.net/projects/junit"); } - // TODO test various projects here with long release list + public void testXxx() { + // TODO test various projects here with long or complicated release list + } /** Tests a release. */ protected void testProjectWithRelease(String url) { 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 2005-10-31 16:21:45 UTC (rev 1477) +++ trunk/labs/kosmos/src/test/hu/midori/kosmos/server/svn/SvnServiceTest.java 2005-11-01 10:24:03 UTC (rev 1478) @@ -28,31 +28,35 @@ assertEquals(0, service.getRepositories("http://www.nosuchdomain.com/svn").size()); } - /** TODO */ + /** Tests accessing secured repositories. */ public void testAuthentication() { - // TODO implement after the authentication is implemented + // test secured without signing in + assertEquals(0, service.getRepositories("http://svn.jboss.com/jbossas").size());// TODO specify secured here + + // test secured with signing in + testRepository("http://myusername@mypassword:xxx.yyy.zzz/myproject");// TODO } - public void testApacheInstance() { - testPublicInstance("http://svn.apache.org/repos/asf/commons"); - testPublicInstance("http://svn.apache.org/repos/asf/db"); - testPublicInstance("http://svn.apache.org/repos/asf/incubator/agila"); + public void testApacheRepositories() { + testRepository("http://svn.apache.org/repos/asf/commons"); + testRepository("http://svn.apache.org/repos/asf/db"); + testRepository("http://svn.apache.org/repos/asf/incubator/agila"); } - public void testJBossInstance() { - testPublicInstance("http://anonsvn.labs.jboss.com/trunk/labs/demo"); - testPublicInstance("http://anonsvn.labs.jboss.com/trunk/labs/jbossprofiler"); - testPublicInstance("http://anonsvn.labs.jboss.com/trunk/labs/jbossweb"); - testPublicInstance("http://anonsvn.labs.jboss.com/trunk/labs/jrunit"); - testPublicInstance("http://anonsvn.labs.jboss.com/trunk/labs/kosmos"); - testPublicInstance("http://anonsvn.labs.jboss.com/trunk/labs/portletswap"); - testPublicInstance("http://anonsvn.labs.jboss.com/trunk/labs/reportingservices"); + public void testJBossRepositories() { + testRepository("http://anonsvn.labs.jboss.com/trunk/labs/demo"); + testRepository("http://anonsvn.labs.jboss.com/trunk/labs/jbossprofiler"); + testRepository("http://anonsvn.labs.jboss.com/trunk/labs/jbossweb"); + testRepository("http://anonsvn.labs.jboss.com/trunk/labs/jrunit"); + testRepository("http://anonsvn.labs.jboss.com/trunk/labs/kosmos"); + testRepository("http://anonsvn.labs.jboss.com/trunk/labs/portletswap"); + testRepository("http://anonsvn.labs.jboss.com/trunk/labs/reportingservices"); } - // TODO add more instances here + // TODO add more repositories here /** Tests a public instance. */ - protected void testPublicInstance(String url) { + protected void testRepository(String url) { List<SvnRepository> repositories = service.getRepositories(url); assertTrue(repositories.size() > 0); |