You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by sk...@apache.org on 2013/06/08 23:19:08 UTC

svn commit: r1491062 - /archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java

Author: skygo
Date: Sat Jun  8 21:19:08 2013
New Revision: 1491062

URL: http://svn.apache.org/r1491062
Log:
more work on test // need to feed fake artifact for testing MRM1766 and others

Added:
    archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java
      - copied, changed from r1490987, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java

Copied: archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java (from r1490987, archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java)
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java?p2=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java&p1=archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java&r1=1490987&r2=1491062&rev=1491062&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverTest.java (original)
+++ archiva/trunk/archiva-modules/archiva-web/archiva-webapp-test/src/test/java/org/apache/archiva/web/test/WebDriverBrowseTest.java Sat Jun  8 21:19:08 2013
@@ -23,6 +23,7 @@ import org.apache.commons.lang3.StringUt
 import org.fluentlenium.adapter.FluentTest;
 import org.fluentlenium.core.domain.FluentList;
 import org.fluentlenium.core.domain.FluentWebElement;
+import static org.fest.assertions.Assertions.assertThat;
 import org.junit.Test;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -43,8 +44,8 @@ import org.junit.Before;
 /**
  * @author Olivier Lamy
  */
-public class WebDriverTest
-    extends FluentTest
+public class WebDriverBrowseTest
+        extends FluentTest
 {
 
     @Override
@@ -63,36 +64,66 @@ public class WebDriverTest
         }
         return super.takeScreenShot( fileName );
     }
-    
+
     @Before
     public void init()
     {
         setSnapshotMode( Mode.TAKE_SNAPSHOT_ON_FAIL );
         setSnapshotPath( new File( "target", "errorshtmlsnap" ).getAbsolutePath() );
     }
-    
+
     @Test
     public void simpletest()
-        throws Exception
+            throws Exception
     {
-        
+        Properties p = new Properties();
+        p.load( this.getClass().getClassLoader().getResourceAsStream( "test.properties" ) );
+
         Properties tomcatPortProperties = new Properties();
         tomcatPortProperties.load(
-            new FileInputStream( new File( System.getProperty( "tomcat.propertiesPortFilePath" ) ) ) );
+                new FileInputStream( new File( System.getProperty( "tomcat.propertiesPortFilePath" ) ) ) );
 
         int tomcatPort = Integer.parseInt( tomcatPortProperties.getProperty( "tomcat.maven.http.port" ) );
 
         goTo( "http://localhost:" + tomcatPort + "/archiva/index.html?request_lang=en" );
-        
+
         // wait until topbar-menu-container is feeded
-        await().atMost(5, TimeUnit.SECONDS).until("#topbar-menu").isPresent();
-        
+        await().atMost( 5, TimeUnit.SECONDS ).until( "#topbar-menu" ).isPresent();
+
         FluentList<FluentWebElement> elements = find( "#create-admin-link-a" );
 
         if ( !elements.isEmpty() && elements.get( 0 ).isDisplayed() )
         {
             WebElement webElement = elements.get( 0 ).getElement();
             Assert.assertEquals( "Create Admin User", webElement.getText() );
+
+            webElement.click();
+            await().atMost( 2, TimeUnit.SECONDS ).until( "#user-create" ).isPresent();
+            assertThat( find( "#username" ).getValue().equals( "admin" ) );
+            assertThat( find( "#password" ).getValue().isEmpty() );
+            assertThat( find( "#confirmPassword" ).getValue().isEmpty() );
+            assertThat( find( "#email" ).getValue().isEmpty() );
+
+            fill( "#fullname" ).with( p.getProperty( "ADMIN_FULLNAME" ) );
+            fill( "#email" ).with( p.getProperty( "ADMIN_EMAIL" ) );
+            fill( "#password" ).with( p.getProperty( "ADMIN_PASSWORD" ) );
+            fill( "#confirmPassword" ).with( p.getProperty( "ADMIN_PASSWORD" ) );
+            find( "#user-create-form-register-button" ).click();
+
+            await().atMost( 2, TimeUnit.SECONDS ).until( "#logout-link" ).isPresent();
+
+            FluentList<FluentWebElement> elementss = find( "#menu-find-browse-a" );
+            WebElement webElsement = elementss.get( 0 ).getElement();
+            webElsement.click();
+            await().atMost( 2, TimeUnit.SECONDS ).until( "#main_browse_result" ).isPresent();
+            // give me search page :( not  browse page
+
+            takeScreenShot( "search" );
+
+            goTo( "http://localhost:" + tomcatPort + "/archiva/index.html#browse?request_lang=en" );
+            takeScreenShot( "browse" );
+            // give me a browse page
+            
         }
         else
         {
@@ -122,7 +153,7 @@ public class WebDriverTest
         {
             return new InternetExplorerDriver();
         }
-
+        
         return new FirefoxDriver();
 
     }