continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From br...@apache.org
Subject svn commit: r1547307 - in /continuum/branches/CONTINUUM-2713: continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/ continuum-webapp-test/ continuum-webapp-test/src/appserver-base/conf/ continuum-webapp-test/src/test/resources/ cont...
Date Tue, 03 Dec 2013 08:01:15 GMT
Author: brett
Date: Tue Dec  3 08:01:14 2013
New Revision: 1547307

URL: http://svn.apache.org/r1547307
Log:
abstract out some settings so we can point to a development instance

Modified:
    continuum/branches/CONTINUUM-2713/continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/continuum-buildagent.xml
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/Readme.txt
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/pom.xml
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/appserver-base/conf/continuum-buildagent.xml
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/resources/testng.properties
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedReleaseTest.java
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java
    continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java

Modified: continuum/branches/CONTINUUM-2713/continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/continuum-buildagent.xml
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/continuum-buildagent.xml?rev=1547307&r1=1547306&r2=1547307&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/continuum-buildagent.xml
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-buildagent/continuum-buildagent-webapp/src/appserver-base/conf/continuum-buildagent.xml
Tue Dec  3 08:01:14 2013
@@ -22,5 +22,5 @@
   <continuumServerUrl>http://localhost:9090/master-xmlrpc</continuumServerUrl>
   <buildOutputDirectory>target/data/build-agent/build-output-directory</buildOutputDirectory>
   <workingDirectory>target/data/build-agent/working-directory</workingDirectory>
-  <sharedSecretPassword>abc123</sharedSecretPassword>
+  <sharedSecretPassword>continuum1234</sharedSecretPassword>
 </continuum-buildagent-configuration>

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/Readme.txt
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/Readme.txt?rev=1547307&r1=1547306&r2=1547307&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/Readme.txt (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/Readme.txt Tue Dec  3 08:01:14
2013
@@ -19,9 +19,14 @@ The tests require Ant and Maven to be on
  * mvn clean install -Dplexus.system.path=/path/to/apache-maven-3.0.4/bin:/path/to/apache-ant-1.8.1/bin
 
 Run Selenium tests against an existing Continuum instance
-  * mvn clean install -DbaseUrl=http://localhost:9090/continuum
+  * mvn clean install -DbaseUrl=http://localhost:9090 -DbuildAgentUrl=http://localhost:9191/xmlrpc
\
+        -DappserverBase=$PWD/../continuum-webapp/target/appserver-base
 
-  (This skips the Cargo plugin configuration that starts a container with the Continuum webapp
deployed)
+  This skips the Cargo plugin configuration that starts a container with the
+  Continuum webapp deployed. Note that you will need to have set this on the
+  existing Continuum instance:
+  
+    -Dsvn.base.url=file://localhost${PWD}/../continuum-webapp-test/target/example-svn
 
 Run Selenium tests in an alternate browser
   * mvn clean install -Ptomcat7x -Dbrowser=iexplore  (or -Dbrowser=safari or -Dbrowser=other
-DbrowserPath=/path/to/browser)
@@ -47,6 +52,14 @@ To attach a debugger to the same process
 
     mvn -Ptomcat7x,debug test-compile selenium:start-server cargo:run
 
+You can also run the Selenium server against your development instance, so
+that you can run the tests in your IDE:
+
+    mvn -Ptomcat7x,debug test-compile selenium:start-server cargo:run -DbaseUrl=http://localhost:9090
+
+The remaining properties appserverBase and buildAgentUrl need to be supplied to the running
tests, along with the same
+baseUrl value.
+
 Note, the tests currently fail with "Illegal value" errors under newer
 versions of Selenium and Firefox. The tests run successfully with Selenium
 2.21.0 and Firefox 17.

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/pom.xml
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/pom.xml?rev=1547307&r1=1547306&r2=1547307&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/pom.xml (original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/pom.xml Tue Dec  3 08:01:14 2013
@@ -76,7 +76,10 @@
             </goals>
             <configuration>
               <tasks>
-                <copy todir="${project.build.directory}">
+                <copy todir="${project.build.directory}" overwrite="true">
+                  <filterchain>
+                    <expandproperties />
+                  </filterchain>
                   <fileset dir="src/appserver-base"/>
                 </copy>
                 <delete dir="${project.build.directory}/example-svn"/>
@@ -91,7 +94,9 @@
                 </path>
                 <pathconvert refid="svn.repo.dir" targetos="unix" property="svn.base.url"/>
                 <echo file="${project.build.directory}/filter.properties">
-                  svn.base.url=file://localhost/${svn.base.url}
+                  svn.base.url=file://localhost${svn.base.url}
+                  continuum.port=${continuum.port}
+                  baseUrl=${baseUrl}
                 </echo>
               </tasks>
             </configuration>
@@ -168,6 +173,8 @@
               <appserver.base>${project.build.directory}</appserver.base>
               <derby.system.home>${project.build.directory}</derby.system.home>
               <svn.base.url>${svn.base.url}</svn.base.url>
+              <continuum.port>${contiuum.port}</continuum.port>
+              <baseUrl>${baseUrl}</baseUrl>
               <plexus.system.path>${plexus.system.path}</plexus.system.path>
             </systemProperties>
             <dependencies>
@@ -187,7 +194,7 @@
           </container>
           <configuration>
             <properties>
-              <cargo.servlet.port>9595</cargo.servlet.port>
+              <cargo.servlet.port>${continuum.port}</cargo.servlet.port>
               <cargo.jvmargs>${cargo.jvmargs}</cargo.jvmargs>
               <cargo.datasource.datasource.users>
                 cargo.datasource.driver=org.apache.derby.jdbc.EmbeddedDriver|
@@ -275,6 +282,14 @@
                   <value>${baseUrl}</value>
                 </property>
                 <property>
+                  <name>buildAgentUrl</name>
+                  <value>${buildAgentUrl}</value>
+                </property>
+                <property>
+                  <name>appserverBase</name>
+                  <value>${appserverBase}</value>
+                </property>
+                <property>
                   <name>browser</name>
                   <value>${browser}</value>
                 </property>
@@ -397,7 +412,16 @@
               <groupId>org.codehaus.cargo</groupId>
               <artifactId>cargo-maven2-plugin</artifactId>
               <configuration>
-                <skip>true</skip>
+                <deployables>
+                  <!-- Skip all but test resources -->
+                  <deployable>
+                    <location>${basedir}/src/test/example-projects</location>
+                    <type>war</type>
+                    <properties>
+                      <context>example-projects</context>
+                    </properties>
+                  </deployable>
+                </deployables>
               </configuration>
             </plugin>
           </plugins>
@@ -584,7 +608,10 @@
   <properties>
     <seleniumHost>localhost</seleniumHost>
     <seleniumPort>4444</seleniumPort>
-    <baseUrl>http://localhost:9595/continuum/</baseUrl>
+    <continuum.port>9595</continuum.port>
+    <baseUrl>http://localhost:${continuum.port}/continuum</baseUrl>
+    <buildAgentUrl>http://localhost:${continuum.port}/continuum-buildagent/xmlrpc</buildAgentUrl>
+    <appserverBase>${project.build.directory}</appserverBase>
     <browser>*firefox</browser>
     <browserPath/>
     <cargo.jvmargs>-Xmx512m -XX:MaxPermSize=128m</cargo.jvmargs>

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/appserver-base/conf/continuum-buildagent.xml
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/appserver-base/conf/continuum-buildagent.xml?rev=1547307&r1=1547306&r2=1547307&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/appserver-base/conf/continuum-buildagent.xml
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/appserver-base/conf/continuum-buildagent.xml
Tue Dec  3 08:01:14 2013
@@ -19,7 +19,7 @@
   -->
 
 <continuum-buildagent-configuration>
-  <continuumServerUrl>http://localhost:9595/continuum/master-xmlrpc</continuumServerUrl>
+  <continuumServerUrl>${baseUrl}/master-xmlrpc</continuumServerUrl>
   <buildOutputDirectory>target/data/build-agent/build-output-directory</buildOutputDirectory>
   <workingDirectory>target/data/build-agent/working-directory</workingDirectory>
   <sharedSecretPassword>continuum1234</sharedSecretPassword>

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/resources/testng.properties
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/resources/testng.properties?rev=1547307&r1=1547306&r2=1547307&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/resources/testng.properties
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/resources/testng.properties
Tue Dec  3 08:01:14 2013
@@ -33,7 +33,7 @@ ADMIN_MAIL=admin@mail.com
 
 # Maven 2 projects to load
 
-MAVEN2_POM_URL=http://localhost:9595/example-projects/simple-example/pom.xml
+MAVEN2_POM_URL=http://localhost:${continuum.port}/example-projects/simple-example/pom.xml
 MAVEN2_POM_USERNAME=
 MAVEN2_POM_PASSWORD=
 MAVEN2_POM_PROJECT_NAME=Continuum Simple Example Project
@@ -43,20 +43,20 @@ MAVEN2_POM_PROJECT_GROUP_ID=org.apache.c
 MAVEN2_POM_PROJECT_GROUP_DESCRIPTION=
 MAVEN2_POM_PROJECT_GROUP_SCM_ROOT_URL=scm:svn:${svn.base.url}/trunk/simple-example
 
-MAVEN2_PROJECT_WITH_TAG_POM_URL=http://localhost:9595/example-projects/continuum-2437-example/pom.xml
+MAVEN2_PROJECT_WITH_TAG_POM_URL=http://localhost:${continuum.port}/example-projects/continuum-2437-example/pom.xml
 MAVEN2_PROJECT_WITH_TAG_POM_PROJECT_NAME=Continuum 2437 Example Project
 # values used for "Defined by POM" - tests should clean up this group afterwards if added
 MAVEN2_PROJECT_WITH_TAG_POM_PROJECT_GROUP_NAME=Continuum 2437 Example Project
 MAVEN2_PROJECT_WITH_TAG_POM_PROJECT_GROUP_ID=org.apache.continuum.examples
 MAVEN2_PROJECT_WITH_TAG_POM_PROJECT_GROUP_DESCRIPTION=
 
-MAVEN2_FAILING_PROJECT_POM_URL=http://localhost:9595/example-projects/continuum-failing-project/pom.xml
+MAVEN2_FAILING_PROJECT_POM_URL=http://localhost:${continuum.port}/example-projects/continuum-failing-project/pom.xml
 # values used for "Defined by POM" - tests should clean up this group afterwards if added
 MAVEN2_FAILING_PROJECT_POM_PROJECT_GROUP_NAME=Continuum Sample Failing Project
 MAVEN2_FAILING_PROJECT_POM_PROJECT_GROUP_ID=org.apache.continuum.failing.project
 MAVEN2_FAILING_PROJECT_POM_PROJECT_GROUP_DESCRIPTION=Sample project that has a build failure
 
-MAVEN2_QUEUE_TEST_POM_URL=http://localhost:9595/example-projects/continuum-build-queue-test-data/pom.xml
+MAVEN2_QUEUE_TEST_POM_URL=http://localhost:${continuum.port}/example-projects/continuum-build-queue-test-data/pom.xml
 MAVEN2_QUEUE_TEST_POM_USERNAME=
 MAVEN2_QUEUE_TEST_POM_PASSWORD=
 # values used for "Defined by POM" - tests should clean up this group afterwards if added
@@ -70,13 +70,13 @@ ANT_NAME=Sample Ant Project
 ANT_DESCRIPTION=This is a sample Ant Project used for testing
 ANT_VERSION=1.0.0-SNAPSHOT
 ANT_TAG=
-ANT_SCM_URL=http://localhost:9595/example-projects/ant/
+ANT_SCM_URL=http://localhost:${continuum.port}/example-projects/ant/
 ANT_SCM_USERNAME=
 ANT_SCM_PASSWORD=
 
 # Maven 1 projects to load
 
-MAVEN1_POM_URL=http://localhost:9595/example-projects/maven-one-projects/valid-project.xml
+MAVEN1_POM_URL=http://localhost:${continuum.port}/example-projects/maven-one-projects/valid-project.xml
 MAVEN1_POM_USERNAME=
 MAVEN1_POM_PASSWORD=
 
@@ -134,13 +134,13 @@ MAVEN1_PROJECT_GROUP_NAME=Maven One Proj
 MAVEN1_PROJECT_GROUP_ID=maven-one-project
 MAVEN1_PROJECT_GROUP_DESCRIPTION=This is a sample Maven One Project
 
-MAVEN1_MISSING_REPO_POM_URL=http://localhost:9595/example-projects/maven-one-projects/missing-repository-element-project.xml
-MAVEN1_EXTENDED_POM_URL=http://localhost:9595/example-projects/maven-one-projects/extend-element-project.xml
-MAVEN1_UNPARSEABLE_POM_URL=http://localhost:9595/example-projects/maven-one-projects/unparseable-content-project.xml
+MAVEN1_MISSING_REPO_POM_URL=http://localhost:${continuum.port}/example-projects/maven-one-projects/missing-repository-element-project.xml
+MAVEN1_EXTENDED_POM_URL=http://localhost:${continuum.port}/example-projects/maven-one-projects/extend-element-project.xml
+MAVEN1_UNPARSEABLE_POM_URL=http://localhost:${continuum.port}/example-projects/maven-one-projects/unparseable-content-project.xml
 
 # Maven 2 test properties
 
-MAVEN2_SAME_LETTER_FLAT_POM_URL=http://localhost:9595/example-projects/flat-example/flat-parent/pom.xml
+MAVEN2_SAME_LETTER_FLAT_POM_URL=http://localhost:${continuum.port}/example-projects/flat-example/flat-parent/pom.xml
 MAVEN2_SAME_LETTER_FLAT_PROJECT_GROUP_NAME=Flat Example
 MAVEN2_SAME_LETTER_FLAT_PROJECT_GROUP_ID=com.example.flat
 MAVEN2_SAME_LETTER_FLAT_PROJECT_GROUP_DESCRIPTION=
@@ -155,10 +155,10 @@ MAVEN2_MOVE_PROJECT_TARGET_PROJECT_GROUP
 MAVEN2_MOVE_PROJECT_TARGET_PROJECT_GROUP_DESCRIPTION=
 
 # SCM element is missing from pom
-MAVEN2_NO_SCM_POM_URL=http://localhost:9595/example-projects/maven-two-projects/missing-scm-element-pom.xml
-MAVEN2_MISS_CONNECTION_POM_URL=http://localhost:9595/example-projects/maven-two-projects/missing-connection-element-pom.xml
-MAVEN2_MISS_PARENT_POM_URL=http://localhost:9595/example-projects/maven-two-projects/missing-parent-pom.xml
-MAVEN2_MISS_SUBPRO_POM_URL=http://localhost:9595/example-projects/maven-two-projects/missing-modules-pom.xml
+MAVEN2_NO_SCM_POM_URL=http://localhost:${continuum.port}/example-projects/maven-two-projects/missing-scm-element-pom.xml
+MAVEN2_MISS_CONNECTION_POM_URL=http://localhost:${continuum.port}/example-projects/maven-two-projects/missing-connection-element-pom.xml
+MAVEN2_MISS_PARENT_POM_URL=http://localhost:${continuum.port}/example-projects/maven-two-projects/missing-parent-pom.xml
+MAVEN2_MISS_SUBPRO_POM_URL=http://localhost:${continuum.port}/example-projects/maven-two-projects/missing-modules-pom.xml
 
 # Ant test properties
 
@@ -241,12 +241,12 @@ DEFAULT_PROJ_GRP_DESCRIPTION=Contains al
 ########################
 
 # Properties for testAddMavenTwoProject
-M2_POM_URL=http://localhost:9595/example-projects/continuum-build-queue-test-data/pom.xml
+M2_POM_URL=http://localhost:${continuum.port}/example-projects/continuum-build-queue-test-data/pom.xml
 M2_POM_USERNAME=
 M2_POM_PASSWORD=
 
 # Properties for testDeleteMavenTwoProject
-M2_DELETE_POM_URL=http://localhost:9595/example-projects/simple-example/pom.xml
+M2_DELETE_POM_URL=http://localhost:${continuum.port}/example-projects/simple-example/pom.xml
 M2_DELETE_PROJ_GRP_NAME=Continuum Simple Example Project
 M2_DELETE_PROJ_GRP_ID=org.apache.continuum.examples.simple
 
@@ -258,7 +258,7 @@ SHELL_NAME=Shell Project
 SHELL_DESCRIPTION=This is a sample Shell Project used for testing
 SHELL_VERSION=1.0.0-SNAPSHOT
 SHELL_TAG=
-SHELL_SCM_URL=http://localhost:9595/example-projects/shell/
+SHELL_SCM_URL=http://localhost:${continuum.port}/example-projects/shell/
 SHELL_SCM_USERNAME=
 SHELL_SCM_PASSWORD=
 
@@ -406,4 +406,4 @@ BUILD_AGENT_GROUPNAME=agent_groupname
 ########################
 # appearance
 ########################
-APPEARANCE_SAVE_FOOTER_URL=http://localhost:9595/continuum/admin/saveFooter.action
+APPEARANCE_SAVE_FOOTER_URL=${baseUrl}/admin/saveFooter.action

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedReleaseTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedReleaseTest.java?rev=1547307&r1=1547306&r2=1547307&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedReleaseTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/DistributedReleaseTest.java
Tue Dec  3 08:01:14 2013
@@ -24,6 +24,8 @@ import org.testng.Assert;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
 
 import java.io.BufferedReader;
@@ -37,11 +39,12 @@ import java.util.Arrays;
 public class DistributedReleaseTest
     extends AbstractReleaseTest
 {
-
     private static final String RELEASE_BUTTON_TEXT = "Release";
 
     private static final String PROVIDE_RELEASE_PARAMETERS_TEXT = "Provide Release Parameters";
 
+    private String appserverBase;
+
     private String projectGroupName;
 
     private String projectGroupId;
@@ -63,8 +66,11 @@ public class DistributedReleaseTest
     private String releaseProjectScmUrl;
 
     @BeforeClass
-    public void createAndBuildProject()
+    @Parameters( { "appserverBase" } )
+    public void createAndBuildProject( @Optional( "target" ) String appserverBase )
     {
+        this.appserverBase = appserverBase;
+
         projectGroupName = getProperty( "DIST_RELEASE_PROJECT_GROUP_NAME" );
         projectGroupId = getProperty( "DIST_RELEASE_PROJECT_GROUP_ID" );
         String description = "Distributed Release test projects";
@@ -107,7 +113,7 @@ public class DistributedReleaseTest
         developmentVersion = getProperty( "DIST_RELEASE_PROJECT_DEVELOPMENT_VERSION" );
         releaseProjectScmUrl = getProperty( "DIST_RELEASE_PROJECT_SCM_URL" );
 
-        File file = new File( "target/conf/prepared-releases.xml" );
+        File file = getPreparedReleasesFile();
 
         if ( file.exists() && !file.delete() )
         {
@@ -422,7 +428,7 @@ public class DistributedReleaseTest
     private String getPreparedReleasesContent()
         throws IOException
     {
-        File file = new File( "target/conf/prepared-releases.xml" );
+        File file = getPreparedReleasesFile();
         Assert.assertTrue( file.exists(), "prepared-releases.xml was not created" );
 
         FileInputStream fis = null;
@@ -447,4 +453,9 @@ public class DistributedReleaseTest
             IOUtils.closeQuietly( fis );
         }
     }
+
+    private File getPreparedReleasesFile()
+    {
+        return new File( appserverBase, "conf/prepared-releases.xml" );
+    }
 }

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java?rev=1547307&r1=1547306&r2=1547307&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenOneProjectTest.java
Tue Dec  3 08:01:14 2013
@@ -72,7 +72,7 @@ public class MavenOneProjectTest
         pomUrlUnparseableContent = getProperty( "MAVEN1_UNPARSEABLE_POM_URL" );
 
         malformedPomUrl = "aaa";
-        inaccessiblePomUrl = "http://localhost:9595/";
+        inaccessiblePomUrl = baseUrl + "/inaccessible-pom/";
     }
 
     @AfterMethod

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java?rev=1547307&r1=1547306&r2=1547307&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/MavenTwoProjectTest.java
Tue Dec  3 08:01:14 2013
@@ -234,7 +234,7 @@ public class MavenTwoProjectTest
     public void testInaccessiblePomUrl()
         throws Exception
     {
-        String pomUrl = "http://localhost:9595/";
+        String pomUrl = baseUrl + "/inaccessible-pom/";
         submitAddMavenTwoProjectPage( pomUrl );
         assertTextPresent(
             "POM file does not exist. Either the POM you specified or one of its modules
does not exist." );

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java?rev=1547307&r1=1547306&r2=1547307&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractAdminTest.java
Tue Dec  3 08:01:14 2013
@@ -21,6 +21,8 @@ package org.apache.continuum.web.test.pa
 
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
+import org.testng.annotations.Optional;
+import org.testng.annotations.Parameters;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
@@ -219,9 +221,11 @@ public abstract class AbstractAdminTest
     }
 
     @BeforeClass( alwaysRun = true )
-    public void initializeBuildAgent()
+    @Parameters( { "buildAgentUrl" } )
+    public void initializeBuildAgent(
+        @Optional( "http://localhost:9595/continuum-buildagent/xmlrpc" ) String buildAgentUrl
)
     {
-        buildAgentUrl = baseUrl.substring( 0, baseUrl.indexOf( "/continuum" ) ) + "/continuum-buildagent/xmlrpc";
+        this.buildAgentUrl = buildAgentUrl;
     }
 
     protected void enableDistributedBuilds()

Modified: continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
URL: http://svn.apache.org/viewvc/continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java?rev=1547307&r1=1547306&r2=1547307&view=diff
==============================================================================
--- continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
(original)
+++ continuum/branches/CONTINUUM-2713/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/parent/AbstractContinuumTest.java
Tue Dec  3 08:01:14 2013
@@ -35,7 +35,6 @@ import static org.testng.Assert.assertEq
 public abstract class AbstractContinuumTest
     extends AbstractSeleniumTest
 {
-
     protected static final String SHARED_SECRET = "continuum1234";
 
     protected static final String ANT_PROJECT_TYPE = "ant";



Mime
View raw message