Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
finally get cargo to work
Browse files Browse the repository at this point in the history
  • Loading branch information
Patrick Huang committed Apr 24, 2012
1 parent 431c7e1 commit 16b8fd6
Show file tree
Hide file tree
Showing 11 changed files with 520 additions and 11 deletions.
214 changes: 213 additions & 1 deletion server/functional-test/pom.xml
View file
Expand Up @@ -19,6 +19,33 @@
<webdriver.version>0.9.7376</webdriver.version>
<selenium.version>2.20.0</selenium.version>
<hamcrest.version>1.2.1</hamcrest.version>

<!--Cargo Settings -->
<cargo.wait>false</cargo.wait>
<cargo.host>localhost</cargo.host>
<cargo.container>jboss5x</cargo.container>
<!--<cargo.servlet.port>9898</cargo.servlet.port>-->
<!--<cargo.home>${project.build.directory}/${cargo.container}</cargo.home>-->
<cargo.home>${java.io.tmpdir}/cargo/installs/jboss-ewp-5.1.2/jboss-ewp-5.1/jboss-as-web</cargo.home>
<cargo.installation>file:///NotBackedUp/downloads/jboss-ewp-5.1.2.zip</cargo.installation>
<context.path>zanata</context.path>

<!--data source-->
<jdbc.groupId>com.h2database</jdbc.groupId>
<jdbc.artifactId>h2</jdbc.artifactId>
<jdbc.version>1.2.144</jdbc.version>
<ds.jndi.name>zanataTestDatasource</ds.jndi.name>
<!--<ds.hibernate.dialect>org.hibernate.dialect.H2Dialect</ds.hibernate.dialect>-->
<ds.driver.class>org.h2.Driver</ds.driver.class>
<ds.connection.url>jdbc:h2:mem:zanata;DB_CLOSE_DELAY=-1</ds.connection.url>
<ds.user.name>sa</ds.user.name>
<ds.password/>

<!--target zanata instance-->
<zanata.target.version>${project.version}</zanata.target.version>
<zanata.instance.url>http://${cargo.host}:8080/${context.path}</zanata.instance.url>
<zanata.client.version>${project.version}</zanata.client.version>
<functional-tests.skip>false</functional-tests.skip>
</properties>

<dependencies>
Expand Down Expand Up @@ -56,6 +83,18 @@
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
</dependency>
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>

<dependency>
<groupId>org.testng</groupId>
Expand All @@ -72,17 +111,190 @@
<artifactId>hamcrest-library</artifactId>
<version>${hamcrest.version}</version>
</dependency>

<!--cargo needs these-->
<!--<dependency>-->
<!--<groupId>${project.groupId}</groupId>-->
<!--<artifactId>zanata-war</artifactId>-->
<!--<version>${zanata.target.version}</version>-->
<!--<type>war</type>-->
<!--</dependency>-->
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
</dependency>
<dependency>
<groupId>${jdbc.groupId}</groupId>
<artifactId>${jdbc.artifactId}</artifactId>
<version>1.2.144</version>
</dependency>

</dependencies>

<build>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/zanata.xml</include>
<include>**/pom.xml</include>
<include>**/*.properties</include>
<include>**/log4j.xml</include>
<include>**/zanata-ds.xml</include>
</includes>
</testResource>
</testResources>
<plugins>
<!--at the moment we can't run test without manually boot up a local server-->
<!--we want to run tests in integration phase-->
<plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<skip>true</skip>
<failIfNoTests>false</failIfNoTests>
</configuration>
</plugin>
<!--<plugin>-->
<!--<groupId>org.apache.maven.plugins</groupId>-->
<!--<artifactId>maven-resources-plugin</artifactId>-->
<!--<executions>-->
<!--<execution>-->
<!--<id>copy-ds-context</id>-->
<!--<goals>-->
<!--<goal>copy-resources</goal>-->
<!--</goals>-->
<!--<phase>package</phase>-->
<!--<configuration>-->
<!--<outputDirectory>${as.deploy}</outputDirectory>-->
<!--<resources>-->
<!--<resource>-->
<!--<directory>${basedir}/src/test/resources</directory>-->
<!--<filtering>true</filtering>-->
<!--<includes>-->
<!--<include>zanata-ds.xml</include>-->
<!--</includes>-->
<!--</resource>-->
<!--</resources>-->
<!--</configuration>-->
<!--</execution>-->
<!--</executions>-->
<!--</plugin>-->
<plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>1.1.0</version>
<configuration>
<wait>${cargo.wait}</wait>
<container>
<timeout>180000</timeout>
<containerId>${cargo.container}</containerId>

<zipUrlInstaller>
<url>${cargo.installation}</url>
</zipUrlInstaller>

<home>${cargo.home}</home>
<dependencies>
<dependency>
<groupId>${jdbc.groupId}</groupId>
<artifactId>${jdbc.artifactId}</artifactId>
</dependency>
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
</dependency>
<dependency>
<location>src/test/resources/zanata-ds.xml</location>
</dependency>

</dependencies>
<output>${project.build.directory}/container.log</output>
<append>false</append>
<log>${project.build.directory}/cargo.log</log>
<systemProperties>
<ehcache.disk.store.dir>${project.build.directory}/ehcache</ehcache.disk.store.dir>
</systemProperties>
</container>
<configuration>
<type>existing</type>
<home>${cargo.home}/server/default</home>
<deployables>
<deployable>
<type>file</type>
<location>${project.build.directory}/test-classes/datasource</location>
</deployable>
<deployable>
<!--<groupId>${project.groupId}</groupId>-->
<!--<artifactId>zanata-war</artifactId>-->
<type>war</type>
<location>../zanata-war/target/zanata-${zanata.target.version}-autotest.war</location>
<pingURL>http://${cargo.host}:8080/${context.path}/</pingURL>
<properties>
<context>${context.path}</context>
</properties>
</deployable>

</deployables>
<properties>
<cargo.jboss.configuration>default</cargo.jboss.configuration>
<cargo.hostname>${cargo.host}</cargo.hostname>
<!--<cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>-->
<!--<cargo.rmi.port>${cargo.rmi.port}</cargo.rmi.port>-->

<!--<cargo.datasource.datasource>-->
<!--cargo.datasource.url=${ds.connection.url}|-->
<!--cargo.datasource.driver=${ds.driver.class}|-->
<!--cargo.datasource.username=${ds.user.name}|-->
<!--cargo.datasource.password=${ds.password}|-->
<!--cargo.datasource.type=javax.sql.DataSource|-->
<!--cargo.datasource.jndi=${ds.jndi.name}-->
<!--</cargo.datasource.datasource>-->

<!--<cargo.jvmargs>${cargo.debug.args}</cargo.jvmargs> -->
<!--<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005</cargo.jvmargs> -->
</properties>
</configuration>
</configuration>
<executions>
<execution>
<id>cargo-start</id>
<phase>pre-integration-test</phase>
<goals>
<goal>start</goal>
</goals>
</execution>
<execution>
<id>cargo-stop</id>
<phase>post-integration-test</phase>
<goals>
<goal>stop</goal>
</goals>
</execution>
</executions>
</plugin>

<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<includes>
<include>**/*Test*.java</include>
</includes>
</configuration>
<executions>
<execution>
<id>Web Driver Tests</id>
<goals>
<goal>test</goal>
</goals>
<phase>integration-test</phase>
<configuration>
<skip>${functional-tests.skip}</skip>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</project>
15 changes: 9 additions & 6 deletions server/functional-test/src/main/java/org/zanata/action/LoginAction.java
View file
Expand Up @@ -16,6 +16,8 @@
package org.zanata.action;

import org.openqa.selenium.WebDriver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.zanata.page.HomePage;
import org.zanata.page.SignInPage;
import org.zanata.page.WebDriverFactory;
Expand All @@ -25,24 +27,25 @@

public class LoginAction
{
private static final Logger LOGGER = LoggerFactory.getLogger(LoginAction.class);
private final WebDriver driver;
private final String hostUrl;

public LoginAction()
{
driver = WebDriverFactory.INSTANCE.getDriver();
hostUrl = WebDriverFactory.INSTANCE.getHostUrl();
}

public HomePage signIn(String homeUrl, String username, String password)
public HomePage signIn(String username, String password)
{
// System.getProperties().put("webdriver.firefox.useExisting", "true");
driver.get(homeUrl);
LOGGER.info("accessing zanata at: {}", hostUrl);
driver.get(hostUrl);

SignInPage signInPage = new HomePage(driver).clickSignInLink();
assertThat(signInPage.getTitle(), equalTo("Zanata:Log in"));

HomePage homePage = signInPage.signInAndGoToPage(username, password, HomePage.class);
assertThat(homePage.getTitle(), equalTo("Zanata:Home"));
return homePage;
return signInPage.signInAndGoToPage(username, password, HomePage.class);
}

}
51 changes: 49 additions & 2 deletions server/functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
View file
Expand Up @@ -16,20 +16,28 @@
package org.zanata.page;

import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.util.Properties;

import org.openqa.selenium.WebDriver;
import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.firefox.FirefoxBinary;
import org.openqa.selenium.firefox.FirefoxDriver;
import org.openqa.selenium.firefox.FirefoxProfile;
import org.openqa.selenium.htmlunit.HtmlUnitDriver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.google.common.base.Strings;

public enum WebDriverFactory
{
INSTANCE;

private static final Logger LOGGER = LoggerFactory.getLogger(WebDriverFactory.class);

private WebDriver driver;
private Properties properties;

public WebDriver getDriver()
{
Expand All @@ -39,13 +47,52 @@ public WebDriver getDriver()
{
if (driver == null)
{
driver = configureHtmlDriver();
loadProperties();
driver = createDriver();
}
}
}
return driver;
}

private void loadProperties()
{
InputStream inputStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("setup.properties");
properties = new Properties();
try
{
properties.load(inputStream);
} catch (IOException e)
{
LOGGER.error("can't load setup.properties");
throw new IllegalStateException("can't load setup.properties");
}
}

public String getHostUrl()
{
if (properties == null || driver == null)
{
getDriver();
}
return properties.getProperty("zanata.instance.url");
}

private WebDriver createDriver()
{
String driverType = properties.getProperty("webdriver.type", "htmlUnit");
if (driverType.equalsIgnoreCase("chrome"))
{
return configureChromeDriver();
} else if (driverType.equalsIgnoreCase("fireFox"))
{
return configureFirefoxDriver();
} else
{
return configureHtmlDriver();
}
}

private WebDriver configureHtmlDriver()
{
return new HtmlUnitDriver(true);
Expand All @@ -67,7 +114,7 @@ private WebDriver configureFirefoxDriver()
// firefoxBinary = new FirefoxBinary(new File(pathToFirefox));
// } else
// {
firefoxBinary = new FirefoxBinary();
firefoxBinary = new FirefoxBinary();
// }

// return new FirefoxDriver(firefoxBinary, makeFirefoxProfile());
Expand Down
5 changes: 3 additions & 2 deletions server/functional-test/src/test/java/org/zanata/feature/LoginTest.java
View file
Expand Up @@ -22,12 +22,13 @@

import static org.hamcrest.MatcherAssert.assertThat;

@Test(enabled = false)
//@Test(enabled = false)
public class LoginTest
{
@Test
public void canLogIn() {
LoginAction loginAction = new LoginAction();
HomePage homePage = loginAction.signIn("http://localhost:8080/zanata", "admin", "admin");
HomePage homePage = loginAction.signIn("admin", "admin");

assertThat(homePage, Matchers.notNullValue());
}
Expand Down

0 comments on commit 16b8fd6

Please sign in to comment.