You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by jm...@apache.org on 2009/05/13 00:54:50 UTC

svn commit: r774122 - in /continuum/trunk/continuum-webapp-test: pom.xml src/test/testng/org/apache/continuum/web/test/AboutTest.java

Author: jmorales
Date: Tue May 12 22:54:50 2009
New Revision: 774122

URL: http://svn.apache.org/viewvc?rev=774122&view=rev
Log:
[CONTINUUM-2073] Create data and cargo intall folders into target for delete with clean goal. Thanks Marecor Baclay.

Modified:
    continuum/trunk/continuum-webapp-test/pom.xml
    continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java

Modified: continuum/trunk/continuum-webapp-test/pom.xml
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/pom.xml?rev=774122&r1=774121&r2=774122&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/pom.xml (original)
+++ continuum/trunk/continuum-webapp-test/pom.xml Tue May 12 22:54:50 2009
@@ -368,6 +368,6 @@
     </profile>
   </profiles>
   <properties>
-    <cargo.installs.directory>${basedir}/installs</cargo.installs.directory>
+    <cargo.installs.directory>${basedir}/target/installs</cargo.installs.directory>
   </properties>
 </project>

Modified: continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java
URL: http://svn.apache.org/viewvc/continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java?rev=774122&r1=774121&r2=774122&view=diff
==============================================================================
--- continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java (original)
+++ continuum/trunk/continuum-webapp-test/src/test/testng/org/apache/continuum/web/test/AboutTest.java Tue May 12 22:54:50 2009
@@ -53,11 +53,28 @@
             submitAdminData( fullname, mail, password );
             assertAutenticatedPage( username );
             assertEditConfigurationPage();
-            submit();
+            postAdminUserCreation();
             clickLinkWithText( "Logout" );
         }
         super.close();
     }
+    
+    private void postAdminUserCreation()
+    {
+        if ( getTitle().endsWith( "Continuum - Configuration" ) )
+        {
+            String workingDir = getFieldValue( "configuration_workingDirectory" );
+            String buildOutputDir = getFieldValue( "configuration_buildOutputDirectory" );
+            String releaseOutputDir = getFieldValue( "configuration_releaseOutputDirectory" );
+            String locationDir = "target/data";
+            String data = "data";
+            setFieldValue( "workingDirectory", workingDir.replaceFirst( data, locationDir ) );
+            setFieldValue( "buildOutputDirectory", buildOutputDir.replaceFirst( data, locationDir ) );
+            setFieldValue( "releaseOutputDirectory", releaseOutputDir.replaceFirst( data, locationDir ) );
+            setFieldValue( "baseUrl", baseUrl );
+            submit();
+        }
+    }
 
     @BeforeTest( groups = { "about" } )
     public void open()