continuum-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eveni...@apache.org
Subject svn commit: r489878 - in /maven/continuum/trunk: continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractContinuumTestCase.java continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp
Date Sat, 23 Dec 2006 10:37:07 GMT
Author: evenisse
Date: Sat Dec 23 02:37:06 2006
New Revision: 489878

URL: http://svn.apache.org/viewvc?view=rev&rev=489878
Log:
security methods are moved to maven-web-ui-tests

Modified:
    maven/continuum/trunk/continuum-webapp-test/src/test/it/org/apache/continuum/web/test/AbstractContinuumTestCase.java
    maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp

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=489878&r1=489877&r2=489878
==============================================================================
--- 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
Sat Dec 23 02:37:06 2006
@@ -25,14 +25,6 @@
 public abstract class AbstractContinuumTestCase
     extends AbstractSeleniumTestCase
 {
-    protected String adminUsername = "admin";
-
-    protected String adminPassword = "admin1";
-
-    protected String adminFullName = "Continuum Admin";
-
-    protected String adminEmail = "admin@localhost.localdomain.com";
-
     private String baseUrl = "http://localhost:9595";
 
     public final static String DEFAULT_PROJ_GRP_NAME = "Default Project Group";
@@ -54,30 +46,10 @@
 
     public final static String TEST_POM_PASSWORD = "dummy";
 
-    private final static int ONE_SECOND = 1000;
-
-    private final static int ONE_MINUTE = 60 * ONE_SECOND;
-
-    private final static int LONG_WAIT = 5 * ONE_MINUTE;
-
-    /**
-     * We create an admin user if it doesn't exist
-     */
-    protected void initialize()
+    protected void postAdminUserCreation()
     {
-        getSelenium().setTimeout( String.valueOf( 5 * ONE_MINUTE ) );
-        open( "/continuum" );
-
-        if ( "Create Admin User".equals( getTitle() ) )
-        {
-            assertCreateAdminUserPage();
-            submitCreateAdminUserPage( adminFullName, adminEmail, adminPassword, adminPassword
);
-            assertLoginPage();
-            submitLoginPage( adminUsername, adminPassword );
-            assertEditConfigurationPage();
-            submitConfigurationPage( baseUrl, null, null, null );
-            logout();
-        }
+        assertEditConfigurationPage();
+        submitConfigurationPage( baseUrl, null, null, null );
     }
 
     //////////////////////////////////////
@@ -101,35 +73,6 @@
     public String getBaseUrl()
     {
         return "http://localhost:9595/continuum";
-    }
-
-    //////////////////////////////////////
-    // Create Admin User
-    //////////////////////////////////////
-    public void assertCreateAdminUserPage()
-    {
-        assertPage( "Create Admin User" );
-        assertTextPresent( "Create Admin User" );
-        assertTextPresent( "Username" );
-        assertElementPresent( "user.username" );
-        assertTextPresent( "Full Name" );
-        assertElementPresent( "user.fullName" );
-        assertTextPresent( "Email Address" );
-        assertElementPresent( "user.email" );
-        assertTextPresent( "Password" );
-        assertElementPresent( "user.password" );
-        assertTextPresent( "Confirm Password" );
-        assertElementPresent( "user.confirmPassword" );
-    }
-
-    public void submitCreateAdminUserPage( String fullName, String email, String password,
String confirmPassword )
-    {
-        setFieldValue( "user.fullName", fullName );
-        setFieldValue( "user.email", email );
-        setFieldValue( "user.password", password );
-        setFieldValue( "user.confirmPassword", confirmPassword );
-        submit();
-        waitPage();
     }
 
     //////////////////////////////////////

Modified: maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp
URL: http://svn.apache.org/viewvc/maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp?view=diff&rev=489878&r1=489877&r2=489878
==============================================================================
--- maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp
(original)
+++ maven/continuum/trunk/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/DefaultBottom.jsp
Sat Dec 23 02:37:06 2006
@@ -1,24 +1,23 @@
 <%@ taglib uri="/webwork" prefix="ww" %>
 <%@ page import="java.util.Calendar" %>
+<ww:i18n name="localization.Continuum">
 <%
-    int inceptionYear = 2005;
-    int currentYear = Calendar.getInstance().get( Calendar.YEAR );
-    String copyrightRange = String.valueOf( inceptionYear );
-    if ( inceptionYear != currentYear )
-    {
-        copyrightRange = copyrightRange + "-" + String.valueOf( currentYear );
-    }
+  int inceptionYear = 2005;
+  int currentYear = Calendar.getInstance().get( Calendar.YEAR );
+  String copyrightRange = String.valueOf( inceptionYear );
+  if ( inceptionYear != currentYear )
+  {
+    copyrightRange = copyrightRange + "-" + String.valueOf( currentYear );
+  }
 %>
-<ww:i18n name="localization.Continuum">
 <div id="footer">
-  <table with="100%" border="0" cellpadding="4" cellspacing="0">
-    <tbody>
-      <tr>
-        <td>
-          Continuum &#169; <%= copyrightRange %> Apache Software Foundation
-        </td>
-      </tr>
-    </tbody>
-  </table>
+  <div class="xright">
+    Copyright &copy; <%= copyrightRange %> Apache Software Foundation
+  </div>
+
+  <div class="clear">
+    <hr/>
+
+  </div>
 </div>
 </ww:i18n>



Mime
View raw message