You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by br...@apache.org on 2012/08/13 06:29:28 UTC
svn commit: r1372260 [27/30] - in /continuum/trunk: ./ continuum-api/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/
continuum-api/src/main/java/org/apache/continuum/builder/distributed/executor/
continuum-api/src/main/java/org/a...
Modified: continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml (original)
+++ continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/web.xml Mon Aug 13 04:29:09 2012
@@ -53,7 +53,7 @@
<filter>
<filter-name>encodingFilter</filter-name>
- <filter-class> org.springframework.web.filter.CharacterEncodingFilter</filter-class>
+ <filter-class>org.springframework.web.filter.CharacterEncodingFilter</filter-class>
<init-param>
<param-name>encoding</param-name>
<param-value>UTF-8</param-value>
@@ -62,13 +62,13 @@
<param-name>forceEncoding</param-name>
<param-value>true</param-value>
</init-param>
- </filter>
+ </filter>
+
-
<filter-mapping>
<filter-name>encodingFilter</filter-name>
<url-pattern>/*</url-pattern>
- </filter-mapping>
+ </filter-mapping>
<filter-mapping>
<filter-name>struts-prepare</filter-name>
<url-pattern>/*</url-pattern>
@@ -81,14 +81,14 @@
<filter-name>struts-execute</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
+
<listener>
<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
</listener>
<listener>
<!-- TODO: some Spring technique for this? -->
- <listener-class>org.apache.continuum.web.startup.ContinuumStartup</listener-class>
+ <listener-class>org.apache.continuum.web.startup.ContinuumStartup</listener-class>
</listener>
<context-param>
@@ -99,11 +99,11 @@
<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>
- classpath*:/META-INF/plexus/components.xml
- classpath*:/META-INF/spring-context.xml
- /WEB-INF/classes/META-INF/plexus/application.xml
- /WEB-INF/classes/META-INF/plexus/components.xml
- /WEB-INF/applicationContext.xml
+ classpath*:/META-INF/plexus/components.xml
+ classpath*:/META-INF/spring-context.xml
+ /WEB-INF/classes/META-INF/plexus/application.xml
+ /WEB-INF/classes/META-INF/plexus/components.xml
+ /WEB-INF/applicationContext.xml
</param-value>
</context-param>
@@ -147,7 +147,7 @@
</init-param>
<load-on-startup>1</load-on-startup>
</servlet>
-
+
<servlet-mapping>
<servlet-name>XmlRpcServlet</servlet-name>
<url-pattern>/xmlrpc</url-pattern>
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractActionTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractActionTest.java Mon Aug 13 04:29:09 2012
@@ -19,14 +19,13 @@ package org.apache.continuum.web.action;
* under the License.
*/
-import org.jmock.MockObjectTestCase;
-
import com.opensymphony.xwork2.ActionContext;
import com.opensymphony.xwork2.config.ConfigurationManager;
import com.opensymphony.xwork2.config.providers.XWorkConfigurationProvider;
import com.opensymphony.xwork2.inject.Container;
import com.opensymphony.xwork2.util.ValueStack;
import com.opensymphony.xwork2.util.ValueStackFactory;
+import org.jmock.MockObjectTestCase;
public abstract class AbstractActionTest
extends MockObjectTestCase
@@ -42,12 +41,12 @@ public abstract class AbstractActionTest
configurationManager.addContainerProvider( new XWorkConfigurationProvider() );
com.opensymphony.xwork2.config.Configuration config = configurationManager.getConfiguration();
Container container = config.getContainer();
-
+
ValueStack stack = container.getInstance( ValueStackFactory.class ).createValueStack();
stack.getContext().put( ActionContext.CONTAINER, container );
ActionContext.setContext( new ActionContext( stack.getContext() ) );
-
- assertNotNull(ActionContext.getContext());
+
+ assertNotNull( ActionContext.getContext() );
}
}
}
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractReleaseActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractReleaseActionTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractReleaseActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/AbstractReleaseActionTest.java Mon Aug 13 04:29:09 2012
@@ -19,10 +19,6 @@ package org.apache.continuum.web.action;
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.configuration.BuildAgentConfiguration;
import org.apache.continuum.configuration.BuildAgentGroupConfiguration;
import org.apache.continuum.release.distributed.DistributedReleaseUtil;
@@ -32,6 +28,10 @@ import org.apache.maven.continuum.config
import org.apache.maven.continuum.model.system.Profile;
import org.jmock.Mock;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
public class AbstractReleaseActionTest
extends AbstractActionTest
{
@@ -40,7 +40,7 @@ public class AbstractReleaseActionTest
private Mock continuumMock;
private Mock configurationServiceMock;
-
+
private String defaultBuildagentUrl = "http://localhost:8181/continuum-buildagent/xmlrpc";
protected void setUp()
@@ -53,94 +53,105 @@ public class AbstractReleaseActionTest
Profile profile = new Profile();
profile.setBuildAgentGroup( "BUILDAGENT_GROUP" );
-
+
action = new ReleaseActionStub();
action.setProfile( profile );
action.setDefaultBuildagent( defaultBuildagentUrl );
action.setContinuum( (Continuum) continuumMock.proxy() );
}
-
+
public void testGetEnvironmentsDefaultAgentInGroup()
throws Exception
{
BuildAgentGroupConfiguration buildAgentGroup = createBuildAgentGroupConfiguration( true );
- buildAgentGroup.addBuildAgent( new BuildAgentConfiguration( defaultBuildagentUrl, "Default Build Agent", true ) );
-
- continuumMock.expects( atLeastOnce() ).method( "getConfiguration" ).will( returnValue( configurationServiceMock.proxy() ) );
- configurationServiceMock.expects( atLeastOnce() ).method( "getBuildAgentGroup" ).will( returnValue( buildAgentGroup ) );
-
+ buildAgentGroup.addBuildAgent( new BuildAgentConfiguration( defaultBuildagentUrl, "Default Build Agent",
+ true ) );
+
+ continuumMock.expects( atLeastOnce() ).method( "getConfiguration" ).will( returnValue(
+ configurationServiceMock.proxy() ) );
+ configurationServiceMock.expects( atLeastOnce() ).method( "getBuildAgentGroup" ).will( returnValue(
+ buildAgentGroup ) );
+
action.getEnvironments();
Map<String, String> envVars = action.getEnvironmentVariables();
String buildagent = envVars.get( DistributedReleaseUtil.KEY_BUILD_AGENT_URL );
-
+
assertNotNull( envVars );
assertTrue( "Default build agent is expected to be used.", defaultBuildagentUrl.equals( buildagent ) );
}
-
+
public void testGetEnvironmentsDefaultAgentNotInGroup()
throws Exception
{
BuildAgentGroupConfiguration buildAgentGroup = createBuildAgentGroupConfiguration( true );
-
- continuumMock.expects( atLeastOnce() ).method( "getConfiguration" ).will( returnValue( configurationServiceMock.proxy() ) );
- configurationServiceMock.expects( atLeastOnce() ).method( "getBuildAgentGroup" ).will( returnValue( buildAgentGroup ) );
-
+
+ continuumMock.expects( atLeastOnce() ).method( "getConfiguration" ).will( returnValue(
+ configurationServiceMock.proxy() ) );
+ configurationServiceMock.expects( atLeastOnce() ).method( "getBuildAgentGroup" ).will( returnValue(
+ buildAgentGroup ) );
+
action.getEnvironments();
Map<String, String> envVars = action.getEnvironmentVariables();
String buildagent = envVars.get( DistributedReleaseUtil.KEY_BUILD_AGENT_URL );
-
+
assertNotNull( envVars );
assertFalse( "Default build agent is not expected to be used.", defaultBuildagentUrl.equals( buildagent ) );
}
-
+
public void testGetEnvironmentsNoEnabledAgentInGroup()
throws Exception
{
BuildAgentGroupConfiguration buildAgentGroup = createBuildAgentGroupConfiguration( false );
- buildAgentGroup.addBuildAgent( new BuildAgentConfiguration( defaultBuildagentUrl, "Default Build Agent", false ) );
-
- continuumMock.expects( atLeastOnce() ).method( "getConfiguration" ).will( returnValue( configurationServiceMock.proxy() ) );
- configurationServiceMock.expects( atLeastOnce() ).method( "getBuildAgentGroup" ).will( returnValue( buildAgentGroup ) );
-
+ buildAgentGroup.addBuildAgent( new BuildAgentConfiguration( defaultBuildagentUrl, "Default Build Agent",
+ false ) );
+
+ continuumMock.expects( atLeastOnce() ).method( "getConfiguration" ).will( returnValue(
+ configurationServiceMock.proxy() ) );
+ configurationServiceMock.expects( atLeastOnce() ).method( "getBuildAgentGroup" ).will( returnValue(
+ buildAgentGroup ) );
+
action.getEnvironments();
Map<String, String> envVars = action.getEnvironmentVariables();
String buildagent = envVars.get( DistributedReleaseUtil.KEY_BUILD_AGENT_URL );
-
+
assertNotNull( envVars );
assertFalse( "Default build agent is not expected to be used.", defaultBuildagentUrl.equals( buildagent ) );
assertNull( "Build agent should be empty.", buildagent );
}
-
+
public void testGetEnvironmentsNoAgentInGroup()
throws Exception
{
BuildAgentGroupConfiguration buildAgentGroup = new BuildAgentGroupConfiguration();
-
- continuumMock.expects( atLeastOnce() ).method( "getConfiguration" ).will( returnValue( configurationServiceMock.proxy() ) );
- configurationServiceMock.expects( atLeastOnce() ).method( "getBuildAgentGroup" ).will( returnValue( buildAgentGroup ) );
-
+
+ continuumMock.expects( atLeastOnce() ).method( "getConfiguration" ).will( returnValue(
+ configurationServiceMock.proxy() ) );
+ configurationServiceMock.expects( atLeastOnce() ).method( "getBuildAgentGroup" ).will( returnValue(
+ buildAgentGroup ) );
+
action.getEnvironments();
Map<String, String> envVars = action.getEnvironmentVariables();
String buildagent = envVars.get( DistributedReleaseUtil.KEY_BUILD_AGENT_URL );
-
+
assertNotNull( envVars );
assertFalse( "Default build agent is not expected to be used.", defaultBuildagentUrl.equals( buildagent ) );
assertNull( "Build agent should be empty.", buildagent );
}
-
+
private BuildAgentGroupConfiguration createBuildAgentGroupConfiguration( boolean isAgentEnabled )
{
- BuildAgentConfiguration buildagent1 = new BuildAgentConfiguration( "http://localhost:9191/continuum-buildagent/xmlrpc",
- "Other Build Agent", isAgentEnabled );
- BuildAgentConfiguration buildagent2 = new BuildAgentConfiguration( "http://localhost:9292/continuum-buildagent/xmlrpc",
- "Other Build Agent", isAgentEnabled );
-
+ BuildAgentConfiguration buildagent1 = new BuildAgentConfiguration(
+ "http://localhost:9191/continuum-buildagent/xmlrpc", "Other Build Agent", isAgentEnabled );
+ BuildAgentConfiguration buildagent2 = new BuildAgentConfiguration(
+ "http://localhost:9292/continuum-buildagent/xmlrpc", "Other Build Agent", isAgentEnabled );
+
List<BuildAgentConfiguration> buildAgents = new ArrayList<BuildAgentConfiguration>();
buildAgents.add( buildagent1 );
buildAgents.add( buildagent2 );
-
- BuildAgentGroupConfiguration buildAgentGroup = new BuildAgentGroupConfiguration( "BUILDAGENT_GROUP", buildAgents );
-
+
+ BuildAgentGroupConfiguration buildAgentGroup = new BuildAgentGroupConfiguration( "BUILDAGENT_GROUP",
+ buildAgents );
+
return buildAgentGroup;
}
}
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/ViewBuildsReportActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/ViewBuildsReportActionTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/ViewBuildsReportActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/ViewBuildsReportActionTest.java Mon Aug 13 04:29:09 2012
@@ -19,19 +19,18 @@ package org.apache.continuum.web.action;
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-
+import com.opensymphony.xwork2.Action;
import org.apache.commons.io.IOUtils;
import org.apache.continuum.web.action.stub.ViewBuildsReportActionStub;
+import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.model.project.BuildResult;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectGroup;
-import org.apache.maven.continuum.Continuum;
import org.jmock.Mock;
-import com.opensymphony.xwork2.Action;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
public class ViewBuildsReportActionTest
extends AbstractActionTest
@@ -101,7 +100,7 @@ public class ViewBuildsReportActionTest
public void testStartDateSameWithEndDate()
{
continuum.expects( once() ).method( "getBuildResultsInRange" ).will( returnValue( buildResults ) );
-
+
action.setStartDate( "04/25/2010" );
action.setEndDate( "04/25/2010" );
String result = action.execute();
@@ -125,18 +124,18 @@ public class ViewBuildsReportActionTest
{
Calendar cal = Calendar.getInstance();
cal.set( 2010, 1, 1, 1, 1, 1 );
-
+
List<BuildResult> results = createBuildResult( cal.getTimeInMillis() );
-
+
continuum.expects( once() ).method( "getBuildResultsInRange" ).will( returnValue( results ) );
action.setProjectGroupId( 0 );
action.setBuildStatus( 0 );
action.setStartDate( "" );
action.setEndDate( "" );
action.setTriggeredBy( "" );
-
+
String result = action.downloadBuildsReport();
-
+
assertEquals( "send-file", result );
assertFileContentsEqual( IOUtils.toString( action.getInputStream() ), cal.getTime().toString() );
continuum.verify();
@@ -148,16 +147,16 @@ public class ViewBuildsReportActionTest
assertFalse( action.hasFieldErrors() );
assertFalse( action.hasActionErrors() );
}
-
+
private List<BuildResult> createBuildResult( long timeInMillis )
{
List<BuildResult> results = new ArrayList<BuildResult>();
-
+
BuildResult result = new BuildResult();
-
+
ProjectGroup group = new ProjectGroup();
group.setName( "Test Group" );
-
+
Project project = new Project();
project.setName( "Test Project" );
project.setProjectGroup( group );
@@ -166,17 +165,17 @@ public class ViewBuildsReportActionTest
result.setState( 2 );
result.setStartTime( timeInMillis );
result.setUsername( "test-admin" );
-
+
results.add( result );
-
+
return results;
}
-
+
private void assertFileContentsEqual( String report, String buildDate )
{
String result = "Project Group,Project Name,Build Date,Triggered By,Build Status\n" +
- "Test Group,Test Project," + buildDate + ",test-admin,Ok\n";
-
+ "Test Group,Test Project," + buildDate + ",test-admin,Ok\n";
+
assertEquals( report, result );
}
}
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/stub/ReleaseActionStub.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/stub/ReleaseActionStub.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/stub/ReleaseActionStub.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/continuum/web/action/stub/ReleaseActionStub.java Mon Aug 13 04:29:09 2012
@@ -19,41 +19,41 @@ package org.apache.continuum.web.action.
* under the License.
*/
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.continuum.web.action.AbstractReleaseAction;
import org.apache.maven.continuum.model.system.Profile;
+import java.util.HashMap;
+import java.util.Map;
+
public class ReleaseActionStub
extends AbstractReleaseAction
{
private Map<String, String> environmentVariables;
-
+
private Profile profile;
-
+
private String defaultBuildagent;
-
+
public ReleaseActionStub()
{
this.environmentVariables = new HashMap<String, String>();
}
-
+
public void getEnvironments()
{
this.environmentVariables = getEnvironments( profile, defaultBuildagent );
}
-
+
public Map<String, String> getEnvironmentVariables()
{
return this.environmentVariables;
}
-
+
public void setProfile( Profile profile )
{
this.profile = profile;
}
-
+
public void setDefaultBuildagent( String defaultBuildagent )
{
this.defaultBuildagent = defaultBuildagent;
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/AddProjectActionTest.java Mon Aug 13 04:29:09 2012
@@ -19,17 +19,17 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
import org.apache.continuum.web.action.AbstractActionTest;
-import org.apache.maven.continuum.web.action.stub.AddProjectActionStub;
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.model.project.Project;
import org.apache.maven.continuum.model.project.ProjectGroup;
+import org.apache.maven.continuum.web.action.stub.AddProjectActionStub;
import org.jmock.Mock;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
/**
* Test for {@link AddProjectAction}
*
@@ -43,11 +43,11 @@ public class AddProjectActionTest
private Mock continuumMock;
private static final String VALID_NAME_CHARACTER = "abcABC123whitespaces_.:-";
-
+
private static final String VALID_VERSION_CHARACTER = "abcABC123.-";
private static final String VALID_SCM_URL_CHARACTER = "abcABC123_.:-#~=@\\/|[]";
-
+
private static final String VALID_SCM_TAG_CHARACTER = "abcABC123_.:-#~=@\\/|[]";
private static final String VALID_DESCRIPTION_CHARACTER = "abcABC123whitespaces_.-";
@@ -60,11 +60,11 @@ public class AddProjectActionTest
action = new AddProjectActionStub();
continuumMock = new Mock( Continuum.class );
action.setContinuum( (Continuum) continuumMock.proxy() );
-
+
Collection<ProjectGroup> projectGroups = new ArrayList<ProjectGroup>();
ProjectGroup projectGroup = new ProjectGroup();
projectGroups.add( projectGroup );
-
+
action.setProjectGroups( projectGroups );
}
@@ -74,10 +74,10 @@ public class AddProjectActionTest
action.setProjectName( null );
action.setProjectVersion( null );
action.setProjectScmUrl( null );
-
+
action.validate();
}
-
+
/**
* Test add of Ant project
*
@@ -87,31 +87,31 @@ public class AddProjectActionTest
throws Exception
{
String scmUrl = "scm:svn:http://project/scm/url/test/build.xml";
-
+
List<Project> projects = createProjectList();
continuumMock.expects( once() ).method( "getProjects" ).will( returnValue( projects ) );
continuumMock.expects( once() ).method( "addProject" ).will( returnValue( 3 ) );
-
+
action.setProjectName( "Ant Test Project" );
action.setProjectVersion( "1.0-SNAPSHOT" );
action.setProjectScmUrl( scmUrl );
action.setProjectType( "ant" );
action.setSelectedProjectGroup( 1 );
action.setBuildDefintionTemplateId( 1 );
-
+
action.validate();
action.add();
continuumMock.verify();
-
+
}
-
+
public void testAddAntProjectWithValidValues()
throws Exception
{
List<Project> projects = createProjectList();
continuumMock.expects( once() ).method( "getProjects" ).will( returnValue( projects ) );
continuumMock.expects( once() ).method( "addProject" ).will( returnValue( 3 ) );
-
+
action.setProjectName( VALID_NAME_CHARACTER );
action.setProjectDescription( VALID_DESCRIPTION_CHARACTER );
action.setProjectVersion( VALID_VERSION_CHARACTER );
@@ -120,7 +120,7 @@ public class AddProjectActionTest
action.setProjectType( "ant" );
action.setSelectedProjectGroup( 1 );
action.setBuildDefintionTemplateId( 1 );
-
+
// validate
action.validate();
@@ -130,7 +130,7 @@ public class AddProjectActionTest
// add
action.add();
-
+
continuumMock.verify();
}
@@ -143,18 +143,18 @@ public class AddProjectActionTest
throws Exception
{
String scmUrl = "scm:svn:http://project/scm/url/test/run.sh";
-
+
List<Project> projects = createProjectList();
continuumMock.expects( once() ).method( "getProjects" ).will( returnValue( projects ) );
continuumMock.expects( once() ).method( "addProject" ).will( returnValue( 3 ) );
-
+
action.setProjectName( "Shell Test Project" );
action.setProjectVersion( "1.0-SNAPSHOT" );
action.setProjectScmUrl( scmUrl );
action.setProjectType( "shell" );
action.setSelectedProjectGroup( 1 );
action.setBuildDefintionTemplateId( 1 );
-
+
action.validate();
action.add();
continuumMock.verify();
@@ -192,16 +192,18 @@ public class AddProjectActionTest
private List<Project> createProjectList()
{
List<Project> projects = new ArrayList<Project>();
-
- Project project1 = createProject( "scm:svn:http://project/scm/url/test-1/run.sh", "Shell Test Project 1", "1.0-SNAPSHOT", 1 );
- Project project2 = createProject( "scm:svn:http://project/scm/url/test-2/build.xml", "Ant Test Project 1", "1.0-SNAPSHOT", 2 );
-
+
+ Project project1 = createProject( "scm:svn:http://project/scm/url/test-1/run.sh", "Shell Test Project 1",
+ "1.0-SNAPSHOT", 1 );
+ Project project2 = createProject( "scm:svn:http://project/scm/url/test-2/build.xml", "Ant Test Project 1",
+ "1.0-SNAPSHOT", 2 );
+
projects.add( project1 );
projects.add( project2 );
-
+
return projects;
}
-
+
private Project createProject( String scmUrl, String name, String version, int id )
{
Project project = new Project();
@@ -209,7 +211,7 @@ public class AddProjectActionTest
project.setName( name );
project.setVersion( version );
project.setScmUrl( scmUrl );
-
+
return project;
}
}
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildAgentActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildAgentActionTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildAgentActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildAgentActionTest.java Mon Aug 13 04:29:09 2012
@@ -19,9 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
import org.apache.continuum.configuration.BuildAgentConfiguration;
import org.apache.continuum.configuration.BuildAgentGroupConfiguration;
@@ -31,6 +28,9 @@ import org.apache.maven.continuum.Contin
import org.apache.maven.continuum.configuration.ConfigurationService;
import org.jmock.Mock;
+import java.util.ArrayList;
+import java.util.List;
+
public class BuildAgentActionTest
extends AbstractActionTest
{
@@ -62,13 +62,15 @@ public class BuildAgentActionTest
public void testAddBuildAgent()
throws Exception
{
- continuumMock.expects( once() ).method( "getConfiguration" ).will( returnValue( configurationServiceMock.proxy() ) );
+ continuumMock.expects( once() ).method( "getConfiguration" ).will( returnValue(
+ configurationServiceMock.proxy() ) );
configurationServiceMock.expects( atLeastOnce() ).method( "getBuildAgents" ).will( returnValue( buildAgents ) );
configurationServiceMock.expects( once() ).method( "addBuildAgent" ).isVoid();
configurationServiceMock.expects( once() ).method( "store" ).isVoid();
- continuumMock.expects( once() ).method( "getDistributedBuildManager" ).will( returnValue( distributedBuildManagerMock.proxy() ) );
+ continuumMock.expects( once() ).method( "getDistributedBuildManager" ).will( returnValue(
+ distributedBuildManagerMock.proxy() ) );
distributedBuildManagerMock.expects( once() ).method( "update" ).isVoid();
-
+
BuildAgentConfiguration buildAgent = new BuildAgentConfiguration();
buildAgent.setUrl( "http://sample/agent" );
@@ -81,10 +83,13 @@ public class BuildAgentActionTest
{
List<BuildAgentGroupConfiguration> buildAgentGroups = new ArrayList<BuildAgentGroupConfiguration>();
- continuumMock.expects( atLeastOnce() ).method( "getDistributedBuildManager" ).will( returnValue( distributedBuildManagerMock.proxy() ) );
+ continuumMock.expects( atLeastOnce() ).method( "getDistributedBuildManager" ).will( returnValue(
+ distributedBuildManagerMock.proxy() ) );
distributedBuildManagerMock.expects( once() ).method( "isBuildAgentBusy" ).will( returnValue( false ) );
- continuumMock.expects( once() ).method( "getConfiguration" ).will( returnValue( configurationServiceMock.proxy() ) );
- configurationServiceMock.expects( atLeastOnce() ).method( "getBuildAgentGroups" ).will( returnValue( buildAgentGroups ) );
+ continuumMock.expects( once() ).method( "getConfiguration" ).will( returnValue(
+ configurationServiceMock.proxy() ) );
+ configurationServiceMock.expects( atLeastOnce() ).method( "getBuildAgentGroups" ).will( returnValue(
+ buildAgentGroups ) );
configurationServiceMock.expects( atLeastOnce() ).method( "getBuildAgents" ).will( returnValue( buildAgents ) );
distributedBuildManagerMock.expects( never() ).method( "removeDistributedBuildQueueOfAgent" ).isVoid();
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildResultActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildResultActionTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildResultActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/BuildResultActionTest.java Mon Aug 13 04:29:09 2012
@@ -19,9 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.io.File;
-import java.util.HashMap;
-
import org.apache.continuum.builder.distributed.manager.DistributedBuildManager;
import org.apache.continuum.buildmanager.BuildsManager;
import org.apache.continuum.taskqueue.BuildProjectTask;
@@ -34,6 +31,9 @@ import org.apache.maven.continuum.web.ac
import org.apache.maven.continuum.xmlrpc.project.ContinuumProjectState;
import org.jmock.Mock;
+import java.io.File;
+import java.util.HashMap;
+
public class BuildResultActionTest
extends AbstractActionTest
{
@@ -70,13 +70,17 @@ public class BuildResultActionTest
continuum.expects( once() ).method( "getProject" ).will( returnValue( project ) );
continuum.expects( once() ).method( "getBuildResult" ).will( returnValue( buildResult ) );
- continuum.expects( atLeastOnce() ).method( "getConfiguration" ).will( returnValue( (ConfigurationService) configurationService.proxy() ) );
+ continuum.expects( atLeastOnce() ).method( "getConfiguration" ).will( returnValue(
+ (ConfigurationService) configurationService.proxy() ) );
configurationService.expects( once() ).method( "isDistributedBuildEnabled" ).will( returnValue( false ) );
- configurationService.expects( once() ).method( "getTestReportsDirectory" ).will( returnValue( new File( "testReportsDir" ) ) );
+ configurationService.expects( once() ).method( "getTestReportsDirectory" ).will( returnValue( new File(
+ "testReportsDir" ) ) );
continuum.expects( once() ).method( "getChangesSinceLastSuccess" ).will( returnValue( null ) );
- configurationService.expects( once() ).method( "getBuildOutputFile" ).will( returnValue( new File( "buildOutputFile" ) ) );
+ configurationService.expects( once() ).method( "getBuildOutputFile" ).will( returnValue( new File(
+ "buildOutputFile" ) ) );
continuum.expects( once() ).method( "getBuildsManager" ).will( returnValue( buildsManager.proxy() ) );
- buildsManager.expects( once() ).method( "getCurrentBuilds" ).will( returnValue( new HashMap<String, BuildProjectTask>() ) );
+ buildsManager.expects( once() ).method( "getCurrentBuilds" ).will( returnValue(
+ new HashMap<String, BuildProjectTask>() ) );
action.execute();
continuum.verify();
@@ -88,9 +92,11 @@ public class BuildResultActionTest
Project project = createProject( "stub-project" );
continuum.expects( once() ).method( "getProject" ).will( returnValue( project ) );
- continuum.expects( once() ).method( "getConfiguration" ).will( returnValue( (ConfigurationService) configurationService.proxy() ) );
+ continuum.expects( once() ).method( "getConfiguration" ).will( returnValue(
+ (ConfigurationService) configurationService.proxy() ) );
configurationService.expects( once() ).method( "isDistributedBuildEnabled" ).will( returnValue( true ) );
- distributedBuildManager.expects( once() ).method( "getBuildResult" ).will( returnValue( new HashMap<String, Object>() ) );
+ distributedBuildManager.expects( once() ).method( "getBuildResult" ).will( returnValue(
+ new HashMap<String, Object>() ) );
action.execute();
continuum.verify();
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ContinuumActionLoggingTest.java Mon Aug 13 04:29:09 2012
@@ -19,6 +19,8 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
+import org.codehaus.plexus.spring.PlexusInSpringTestCase;
+
import java.io.BufferedOutputStream;
import java.io.FileOutputStream;
import java.io.FilterOutputStream;
@@ -26,8 +28,6 @@ import java.io.IOException;
import java.io.OutputStream;
import java.io.PrintStream;
-import org.codehaus.plexus.spring.PlexusInSpringTestCase;
-
/**
* TestContinuumActionLogging:
*
@@ -53,8 +53,8 @@ public class ContinuumActionLoggingTest
public void tearDown()
{
- System.setOut( new PrintStream(
- new BufferedOutputStream( new FileOutputStream( java.io.FileDescriptor.out ), 128 ), true ) );
+ System.setOut( new PrintStream( new BufferedOutputStream( new FileOutputStream( java.io.FileDescriptor.out ),
+ 128 ), true ) );
}
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ProjectGroupActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ProjectGroupActionTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ProjectGroupActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/ProjectGroupActionTest.java Mon Aug 13 04:29:09 2012
@@ -1,8 +1,5 @@
package org.apache.maven.continuum.web.action;
-import java.util.ArrayList;
-import java.util.List;
-
import org.apache.continuum.web.action.AbstractActionTest;
import org.apache.maven.continuum.Continuum;
import org.apache.maven.continuum.model.project.ProjectGroup;
@@ -15,6 +12,9 @@ import org.codehaus.plexus.redback.rbac.
import org.codehaus.plexus.redback.rbac.jdo.JdoUserAssignment;
import org.jmock.Mock;
+import java.util.ArrayList;
+import java.util.List;
+
public class ProjectGroupActionTest
extends AbstractActionTest
{
@@ -51,7 +51,7 @@ public class ProjectGroupActionTest
Role role2 = new JdoRole();
role2.setName( "Continuum Manage Scheduling" );
roles.add( role2 );
-
+
Role role3 = new JdoRole();
role3.setName( "Project Developer - Project A" );
roles.add( role3 );
@@ -98,7 +98,7 @@ public class ProjectGroupActionTest
Role role2 = new JdoRole();
role2.setName( "Continuum Manage Scheduling" );
roles.add( role2 );
-
+
Role role3 = new JdoRole();
role3.setName( "Project Developer - test-group" );
roles.add( role3 );
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/SummaryActionTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/SummaryActionTest.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/SummaryActionTest.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/SummaryActionTest.java Mon Aug 13 04:29:09 2012
@@ -19,12 +19,6 @@ package org.apache.maven.continuum.web.a
* under the License.
*/
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
import org.apache.continuum.buildmanager.BuildsManager;
import org.apache.continuum.web.action.AbstractActionTest;
import org.apache.maven.continuum.Continuum;
@@ -37,6 +31,12 @@ import org.apache.maven.continuum.web.mo
import org.apache.maven.continuum.xmlrpc.project.ContinuumProjectState;
import org.jmock.Mock;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
public class SummaryActionTest
extends AbstractActionTest
{
@@ -62,7 +62,7 @@ public class SummaryActionTest
buildsManager = mock( BuildsManager.class );
action.setContinuum( (Continuum) continuum.proxy() );
- action.setParallelBuildsManager( (BuildsManager ) buildsManager.proxy() );
+ action.setParallelBuildsManager( (BuildsManager) buildsManager.proxy() );
}
public void testLatestBuildIdWhenCurrentlyBuildingInDistributedBuild()
@@ -77,10 +77,11 @@ public class SummaryActionTest
continuum.expects( once() ).method( "getBuildResultsInSuccess" ).will( returnValue( buildResultsInSuccess ) );
buildsManager.expects( once() ).method( "isInAnyBuildQueue" ).will( returnValue( false ) );
- buildsManager.expects( once() ).method( "isInPrepareBuildQueue").will( returnValue( false ) );
+ buildsManager.expects( once() ).method( "isInPrepareBuildQueue" ).will( returnValue( false ) );
buildsManager.expects( once() ).method( "isInAnyCheckoutQueue" ).will( returnValue( false ) );
- continuum.expects( once() ).method( "getConfiguration" ).will( returnValue( (ConfigurationService) configurationService.proxy() ) );
+ continuum.expects( once() ).method( "getConfiguration" ).will( returnValue(
+ (ConfigurationService) configurationService.proxy() ) );
configurationService.expects( once() ).method( "isDistributedBuildEnabled" ).will( returnValue( true ) );
action.execute();
@@ -107,10 +108,11 @@ public class SummaryActionTest
continuum.expects( once() ).method( "getBuildResultsInSuccess" ).will( returnValue( buildResultsInSuccess ) );
buildsManager.expects( once() ).method( "isInAnyBuildQueue" ).will( returnValue( false ) );
- buildsManager.expects( once() ).method( "isInPrepareBuildQueue").will( returnValue( false ) );
+ buildsManager.expects( once() ).method( "isInPrepareBuildQueue" ).will( returnValue( false ) );
buildsManager.expects( once() ).method( "isInAnyCheckoutQueue" ).will( returnValue( false ) );
- continuum.expects( once() ).method( "getConfiguration" ).will( returnValue( (ConfigurationService) configurationService.proxy() ) );
+ continuum.expects( once() ).method( "getConfiguration" ).will( returnValue(
+ (ConfigurationService) configurationService.proxy() ) );
configurationService.expects( once() ).method( "isDistributedBuildEnabled" ).will( returnValue( true ) );
action.execute();
@@ -137,10 +139,11 @@ public class SummaryActionTest
continuum.expects( once() ).method( "getBuildResultsInSuccess" ).will( returnValue( buildResultsInSuccess ) );
buildsManager.expects( once() ).method( "isInAnyBuildQueue" ).will( returnValue( false ) );
- buildsManager.expects( once() ).method( "isInPrepareBuildQueue").will( returnValue( false ) );
+ buildsManager.expects( once() ).method( "isInPrepareBuildQueue" ).will( returnValue( false ) );
buildsManager.expects( once() ).method( "isInAnyCheckoutQueue" ).will( returnValue( false ) );
- continuum.expects( once() ).method( "getConfiguration" ).will( returnValue( (ConfigurationService) configurationService.proxy() ) );
+ continuum.expects( once() ).method( "getConfiguration" ).will( returnValue(
+ (ConfigurationService) configurationService.proxy() ) );
configurationService.expects( once() ).method( "isDistributedBuildEnabled" ).will( returnValue( false ) );
action.execute();
@@ -157,8 +160,8 @@ public class SummaryActionTest
private Collection<Project> createProjectsInGroup( int projectId, int state )
{
- Collection<Project> projectsInGroup = new ArrayList<Project>();
-
+ Collection<Project> projectsInGroup = new ArrayList<Project>();
+
ProjectGroup group = new ProjectGroup();
group.setId( 1 );
group.setName( "test-group" );
@@ -186,7 +189,7 @@ public class SummaryActionTest
br.setStartTime( System.currentTimeMillis() );
br.setEndTime( System.currentTimeMillis() );
br.setState( state );
-
+
buildResults.put( projectId, br );
return buildResults;
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/AddProjectActionStub.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/AddProjectActionStub.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/AddProjectActionStub.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/AddProjectActionStub.java Mon Aug 13 04:29:09 2012
@@ -43,12 +43,12 @@ public class AddProjectActionStub
{
return true;
}
-
+
protected void checkAddProjectGroupAuthorization()
{
// skip authorization check
}
-
+
protected void checkAddProjectToGroupAuthorization( String projectGroupName )
{
// skip authorization check
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/BuildResultActionStub.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/BuildResultActionStub.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/BuildResultActionStub.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/BuildResultActionStub.java Mon Aug 13 04:29:09 2012
@@ -28,7 +28,7 @@ public class BuildResultActionStub
{
return "test-group";
}
-
+
protected void checkViewProjectGroupAuthorization( String resource )
{
// skip authorization check
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/ProjectGroupActionStub.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/ProjectGroupActionStub.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/ProjectGroupActionStub.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/ProjectGroupActionStub.java Mon Aug 13 04:29:09 2012
@@ -12,7 +12,7 @@ public class ProjectGroupActionStub
{
return "test-group";
}
-
+
protected void checkViewProjectGroupAuthorization( String resource )
{
// skip authorization check
Modified: continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/SummaryActionStub.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/SummaryActionStub.java?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/SummaryActionStub.java (original)
+++ continuum/trunk/continuum-webapp/src/test/java/org/apache/maven/continuum/web/action/stub/SummaryActionStub.java Mon Aug 13 04:29:09 2012
@@ -28,7 +28,7 @@ public class SummaryActionStub
{
return "test-group";
}
-
+
protected void checkViewProjectGroupAuthorization( String resource )
{
// skip authorization check
Modified: continuum/trunk/continuum-webapp/src/test/tomcat/tomcat-context-continuum.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp/src/test/tomcat/tomcat-context-continuum.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp/src/test/tomcat/tomcat-context-continuum.xml (original)
+++ continuum/trunk/continuum-webapp/src/test/tomcat/tomcat-context-continuum.xml Mon Aug 13 04:29:09 2012
@@ -17,21 +17,21 @@
~ specific language governing permissions and limitations
~ under the License.
-->
- <Context path="/continuum">
- <Resource name="jdbc/users" auth="Container" type="javax.sql.DataSource"
- username="sa"
- password=""
- driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
- url="jdbc:derby:${catalina.base}/target/database/users;create=true"
- />
- <Resource name="jdbc/continuum" auth="Container" type="javax.sql.DataSource"
- username="sa"
- password=""
- driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
- url="jdbc:derby:${catalina.base}/target/database/continuum;create=true"
- />
- <Resource name="mail/Session" auth="Container"
+<Context path="/continuum">
+ <Resource name="jdbc/users" auth="Container" type="javax.sql.DataSource"
+ username="sa"
+ password=""
+ driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+ url="jdbc:derby:${catalina.base}/target/database/users;create=true"
+ />
+ <Resource name="jdbc/continuum" auth="Container" type="javax.sql.DataSource"
+ username="sa"
+ password=""
+ driverClassName="org.apache.derby.jdbc.EmbeddedDriver"
+ url="jdbc:derby:${catalina.base}/target/database/continuum;create=true"
+ />
+ <Resource name="mail/Session" auth="Container"
type="javax.mail.Session"
mail.smtp.host="localhost"/>
-
+
</Context>
Modified: continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml?rev=1372260&r1=1372259&r2=1372260&view=diff
==============================================================================
--- continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml (original)
+++ continuum/trunk/continuum-xmlrpc/continuum-xmlrpc-api/pom.xml Mon Aug 13 04:29:09 2012
@@ -17,7 +17,8 @@ KIND, either express or implied. See th
specific language governing permissions and limitations
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
<groupId>org.apache.continuum</groupId>
<artifactId>continuum-xmlrpc</artifactId>