continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r499351 - in /maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test: AbstractContinuumTestCase.java AddMavenOneProjectTestCase.java AddMavenTwoProjectTest.java
Date Wed, 24 Jan 2007 10:49:40 GMT
Author: evenisse
Date: Wed Jan 24 02:49:40 2007
New Revision: 499351

URL: http://svn.apache.org/viewvc?view=rev&rev=499351
Log:
More fixes

Modified:
    maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractContinuumTestCase.java
    maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AddMavenOneProjectTestCase.java
    maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AddMavenTwoProjectTest.java

Modified: maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractContinuumTestCase.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractContinuumTestCase.java?view=diff&rev=499351&r1=499350&r2=499351
==============================================================================
--- maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractContinuumTestCase.java
(original)
+++ maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractContinuumTestCase.java
Wed Jan 24 02:49:40 2007
@@ -297,8 +297,8 @@
 
         // Enter values into Add Maven Two Project fields, and submit  
         setFieldValue( "m2PomUrl", pomUrl );
-        setFieldValue( "username", username );
-        setFieldValue( "password", password );
+        setFieldValue( "scmUsername", username );
+        setFieldValue( "scmPassword", password );
 
         if ( projectGroup != null )
         {
@@ -376,8 +376,8 @@
 
         // Enter values into Add Maven One Project fields, and submit  
         setFieldValue( "m1PomUrl", pomUrl );
-        setFieldValue( "username", username );
-        setFieldValue( "password", password );
+        setFieldValue( "scmUsername", username );
+        setFieldValue( "scmPassword", password );
 
         if ( projectGroup != null )
         {

Modified: maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AddMavenOneProjectTestCase.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AddMavenOneProjectTestCase.java?view=diff&rev=499351&r1=499350&r2=499351
==============================================================================
--- maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AddMavenOneProjectTestCase.java
(original)
+++ maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AddMavenOneProjectTestCase.java
Wed Jan 24 02:49:40 2007
@@ -121,11 +121,21 @@
     }
 
     /**
-     * test wiht an inaccessible pom url
+     * test with an inaccessible pom url
      */
     public void testInaccessiblePomUrl()
     {
         String pomUrl = "http://www.google.com";
+        submitAddMavenOneProjectPage( pomUrl, false );
+        assertTextPresent( "POM file does not exist. Either the POM you specified or one
of its modules does not exist." );
+    }
+
+    /**
+     * test unallowed file protocol
+     */
+    public void testNotAllowedProtocol()
+    {
+        String pomUrl = "file:///project.xml";
         submitAddMavenOneProjectPage( pomUrl, false );
         assertTextPresent( "The specified resource isn't a file or the protocol used isn't
allowed." );
     }

Modified: maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AddMavenTwoProjectTest.java
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AddMavenTwoProjectTest.java?view=diff&rev=499351&r1=499350&r2=499351
==============================================================================
--- maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AddMavenTwoProjectTest.java
(original)
+++ maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AddMavenTwoProjectTest.java
Wed Jan 24 02:49:40 2007
@@ -34,7 +34,7 @@
         addProjectGroup( TEST_PROJ_GRP_NAME, TEST_PROJ_GRP_ID, TEST_PROJ_GRP_DESCRIPTION
);
 
         addMavenTwoProject( TEST_POM_URL, TEST_POM_USERNAME, TEST_POM_PASSWORD, TEST_PROJ_GRP_NAME,
true );
-
+Thread.sleep( 30000 );
         assertCellValueFromTable( TEST_PROJ_GRP_NAME, "ec_table", 2, 0 );
         assertCellValueFromTable( TEST_PROJ_GRP_ID, "ec_table", 2, 1 );
         assertCellValueFromTable( "1", "ec_table", 2, 2 );
@@ -130,11 +130,21 @@
     }
 
     /**
-     * test wiht an inaccessible pom url
+     * test with an inaccessible pom url
      */
     public void testInaccessiblePomUrl()
     {
         String pomUrl = "http://www.google.com";
+        submitAddMavenTwoProjectPage( pomUrl, false );
+        assertTextPresent( "POM file does not exist. Either the POM you specified or one
of its modules does not exist." );
+    }
+
+    /**
+     * test unallowed file protocol
+     */
+    public void testNotAllowedProtocol()
+    {
+        String pomUrl = "file:///pom.xml";
         submitAddMavenTwoProjectPage( pomUrl, false );
         assertTextPresent( "The specified resource isn't a file or the protocol used isn't
allowed." );
     }



Mime
View raw message