- Pollen-commits - mailman.cloud.codelutin.com

r3456 - in trunk: . pollen-ui-struts2 pollen-ui-struts2/src/main/java/org/chorem/pollen/ui pollen-ui-struts2/src/test/java/org/chorem/pollen/ui pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security pollen-ui-struts2/src/test/resources pollen-ui-struts2-test pollen-ui-struts2-test/src/main/resources pollen-ui-struts2-test/src/main/webapp/WEB-INF pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security pollen-ui-strut
by tchemit＠users.chorem.org 12 Jun '12

12 Jun '12

Author: tchemit Date: 2012-06-12 18:45:52 +0200 (Tue, 12 Jun 2012) New Revision: 3456 Url: http://chorem.org/repositories/revision/pollen/3456 Log: refs #606: Add some ITs to prevent regression (finally use same module with jetty (tomcat plugin must be improved :()) Added: trunk/pollen-ui-struts2-test/src/test/resources/web-test.xml trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenTestApplicationListener.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java trunk/pollen-ui-struts2/src/test/resources/log4j.properties trunk/pollen-ui-struts2/src/test/resources/pollen-test.properties trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db trunk/pollen-ui-struts2/src/test/resources/web-test.xml Removed: trunk/pollen-ui-struts2-test/src/main/resources/log4j.properties trunk/pollen-ui-struts2-test/src/main/resources/pollen-test.properties trunk/pollen-ui-struts2-test/src/main/webapp/WEB-INF/web.xml trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/WebDriverResource.java trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java trunk/pollen-ui-struts2-test/src/test/resources/pollendb.h2.db trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTestApplicationListener.java Modified: trunk/pollen-ui-struts2-test/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-12 16:23:53 UTC (rev 3455) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-12 16:45:52 UTC (rev 3456) @@ -186,6 +186,39 @@ <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-java</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-api</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-support</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-chrome-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-firefox-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-htmlunit-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-ie-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-safari-driver</artifactId> + </dependency> + </dependencies>  @@ -398,7 +431,7 @@ <goal>war</goal> </goals> <configuration> - <primaryArtifact>true</primaryArtifact> + <primaryArtifact>false</primaryArtifact> <webappDirectory> target/pollen-embedded-${project.version} </webappDirectory> @@ -441,6 +474,29 @@ </executions> </plugin> + <plugin> + + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>1.7</version> + <executions> + <execution> + <goals> + <goal>attach-artifact</goal> + </goals> + <configuration> + <artifacts> + <artifact> + <file>target/pollen-${project.version}-embedded.war</file> + <type>war</type> + <classifier>embedded</classifier> + </artifact> + </artifacts> + </configuration> + </execution> + </executions> + </plugin> +  <plugin> @@ -502,6 +558,92 @@ </profile> + <profile> + <id>selenium</id> + <activation> + <property> + <name>maven.test.skip</name> + <value>!false</value> + </property> + + </activation> + <build> + <defaultGoal>post-integration-test</defaultGoal> + <plugins> + <plugin> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <configuration> + <stopKey>A</stopKey> + <stopPort>1269</stopPort> + </configuration> + <executions> + + <execution> + <id>start-pollen</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <daemon>true</daemon> + <stopKey>A</stopKey> + <stopPort>1269</stopPort> + <webAppConfig> + <descriptor>src/test/resources/web-test.xml</descriptor> + <contextPath>/pollen</contextPath> + </webAppConfig> + <useTestClasspath>true</useTestClasspath> + <systemProperties> + <systemProperty> + <name>siteUrl</name> + <value>http://localhost:8080/pollen</value> + </systemProperty> + <systemProperty> + <name>pollen.log.dir</name> + <value>target</value> + </systemProperty> + </systemProperties> + </configuration> + </execution> + + <execution> + <id>stop-pollen</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> +  + <skip>true</skip> + </configuration> + <executions> + + <execution> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <includes> + <include>**/*SIT.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + </profiles> </project> Deleted: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTestApplicationListener.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTestApplicationListener.java 2012-06-12 16:23:53 UTC (rev 3455) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTestApplicationListener.java 2012-06-12 16:45:52 UTC (rev 3456) @@ -1,94 +0,0 @@ -/* - * #%L - * Pollen :: UI (struts2) - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui; - -import org.apache.commons.io.FileUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.PollenConfiguration; -import org.chorem.pollen.PollenConfigurationOption; - -import java.io.File; -import java.io.IOException; -import java.util.Properties; - -/** - * Pollen application listener used for test purposes. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.4 - */ -public class PollenTestApplicationListener extends PollenApplicationListener { - - /** Logger. */ - private static final Log log = - LogFactory.getLog(PollenTestApplicationListener.class); - - @Override - protected PollenConfiguration prepareConfiguration() { - PollenConfiguration configuration; - - configuration = new PollenConfiguration("pollen-test.properties", - null) { - - @Override - protected void loadApplicationConfig(String file, - Properties defaultOptions) { - super.loadApplicationConfig(file, defaultOptions); - - // let's add a suffix (to isolate this data dir) - File dataDirectory = new File(getDataDirectory(), - String.valueOf(System.nanoTime())); - if (log.isInfoEnabled()) { - log.info("Data directory = " + dataDirectory); - } - setOption(PollenConfigurationOption.DATA_DIR.getKey(), - dataDirectory.getAbsolutePath()); - - - File incomingDatabase = getOptionAsFile("incomingDatabase"); - - if (log.isInfoEnabled()) { - log.info("Incoming db = " + incomingDatabase); - } - // copy db to correct path - File dbDirectory = new File(dataDirectory, "db"); - - try { - if (log.isInfoEnabled()) { - log.info("Copy incoming db [" + incomingDatabase + - "] to [" + dbDirectory + "]"); - } - FileUtils.copyFileToDirectory( - incomingDatabase, dbDirectory); - } catch (IOException e) { - throw new IllegalStateException( - "Could not copy db to " + dbDirectory); - } - - } - }; - - return configuration; - } -} Copied: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java (from rev 3452, trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java) =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java (rev 0) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java 2012-06-12 16:45:52 UTC (rev 3456) @@ -0,0 +1,63 @@ +/* + * #%L + * T3 :: Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Rule; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.openqa.selenium.WebDriver; + +import java.util.Collection; + +/** + * Test base class for ui tests. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +@RunWith(value = Parameterized.class) +public abstract class PollenBaseWebDriverIT { + + /** Logger. */ + protected final Log log = LogFactory.getLog(getClass()); + + @Parameterized.Parameters + public static Collection<Object[]> driverTypes() { + return WebDriverResource.driverTypes(); + } + + @Rule + public WebDriverResource seleniumServer; + + protected PollenBaseWebDriverIT(Class<? extends WebDriver> driverType) { + seleniumServer = new WebDriverResource(getClass(), driverType); + } + + public WebDriver getDriver() { + return seleniumServer.getDriver(); + } + +} Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenTestApplicationListener.java (from rev 3454, trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTestApplicationListener.java) =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenTestApplicationListener.java (rev 0) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenTestApplicationListener.java 2012-06-12 16:45:52 UTC (rev 3456) @@ -0,0 +1,94 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenConfiguration; +import org.chorem.pollen.PollenConfigurationOption; + +import java.io.File; +import java.io.IOException; +import java.util.Properties; + +/** + * Pollen application listener used for test purposes. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class PollenTestApplicationListener extends PollenApplicationListener { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(PollenTestApplicationListener.class); + + @Override + protected PollenConfiguration prepareConfiguration() { + PollenConfiguration configuration; + + configuration = new PollenConfiguration("pollen-test.properties", + null) { + + @Override + protected void loadApplicationConfig(String file, + Properties defaultOptions) { + super.loadApplicationConfig(file, defaultOptions); + + // let's add a suffix (to isolate this data dir) + File dataDirectory = new File(getDataDirectory(), + String.valueOf(System.nanoTime())); + if (log.isInfoEnabled()) { + log.info("Data directory = " + dataDirectory); + } + setOption(PollenConfigurationOption.DATA_DIR.getKey(), + dataDirectory.getAbsolutePath()); + + + File incomingDatabase = getOptionAsFile("incomingDatabase"); + + if (log.isInfoEnabled()) { + log.info("Incoming db = " + incomingDatabase); + } + // copy db to correct path + File dbDirectory = new File(dataDirectory, "db"); + + try { + if (log.isInfoEnabled()) { + log.info("Copy incoming db [" + incomingDatabase + + "] to [" + dbDirectory + "]"); + } + FileUtils.copyFileToDirectory( + incomingDatabase, dbDirectory); + } catch (IOException e) { + throw new IllegalStateException( + "Could not copy db to " + dbDirectory); + } + + } + }; + + return configuration; + } +} Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenTestApplicationListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java (from rev 3452, trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/WebDriverResource.java) =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java (rev 0) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java 2012-06-12 16:45:52 UTC (rev 3456) @@ -0,0 +1,154 @@ +/* + * #%L + * T3 :: Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.rules.ExternalResource; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.openqa.selenium.chrome.ChromeDriverService; +import org.openqa.selenium.firefox.FirefoxDriver; +import org.openqa.selenium.htmlunit.HtmlUnitDriver; +import org.openqa.selenium.remote.DesiredCapabilities; +import org.openqa.selenium.remote.RemoteWebDriver; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +/** + * Web driver resource. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class WebDriverResource extends ExternalResource { + + /** Logger. */ + private static final Log log = LogFactory.getLog(WebDriverResource.class); + + private static ChromeDriverService service; + + protected static final Class<? extends WebDriver>[] allDrivers = new Class[]{ +// ChromeDriver.class, +// InternetExplorerDriver.class, +// SafariDriver.class, + FirefoxDriver.class, + HtmlUnitDriver.class + }; + + protected static Collection<Object[]> safeDrivers; + + public static Collection<Object[]> driverTypes() { + if (safeDrivers == null) { + + //System.setProperty("webdriver.chrome.driver", "/usr/bin/google-chrome"); + List<Class<?>> checkedDrivers = new ArrayList<Class<?>>(); + for (Class<? extends WebDriver> driver : allDrivers) { + boolean ok = checkDriver(driver); + if (ok) { + checkedDrivers.add(driver); + } + } + //{{ChromeDriver.class}, {FirefoxDriver.class}, {HtmlUnitDriver.class}} + Object[][] data = new Object[checkedDrivers.size()][1]; + int i = 0; + for (Class<?> checkedDriver : checkedDrivers) { + data[i++][0] = checkedDriver; + } + safeDrivers = Arrays.asList(data); + } + + return safeDrivers; + } + + private static boolean checkDriver(Class<? extends WebDriver> driverType) { + + WebDriver driver = null; + boolean result = false; + try { + driver = driverType.getConstructor().newInstance(); + result = true; + } catch (Exception e) { + + // can not use this driver + if (log.isInfoEnabled()) { + log.info("Can not use driver " + driverType.getName(), e); + } + } finally { + if (driver != null) { + driver.quit(); + } + } + + return result; + } + + private final Class<?> testClass; + + private final Class<? extends WebDriver> driverType; + + protected WebDriver driver; + + public WebDriverResource(Class<?> testClass, + Class<? extends WebDriver> driverType) { + this.testClass = testClass; + this.driverType = driverType; + } + + public WebDriver getDriver() { + return driver; + } + + @Override + protected void before() throws Throwable { + if (log.isInfoEnabled()) { + log.info("Start test [" + testClass.getName() + "] with driver of type " + driverType.getName()); + } + if (ChromeDriver.class == driverType) { + + service = new ChromeDriverService.Builder() + .usingChromeDriverExecutable(new File("/usr/bin/chromium-browser")) + .usingAnyFreePort() + .build(); + service.start(); + + driver = new RemoteWebDriver(service.getUrl(), DesiredCapabilities.chrome()); + + } else { + driver = driverType.getConstructor().newInstance(); + } + } + + @Override + protected void after() { + if (ChromeDriver.class == driverType) { + service.stop(); + } + driver.quit(); + } +} Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java (from rev 3452, trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java) =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java (rev 0) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java 2012-06-12 16:45:52 UTC (rev 3456) @@ -0,0 +1,153 @@ +/* + * #%L + * T3 :: Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.security; + +import junit.framework.Assert; +import org.chorem.pollen.ui.PollenBaseWebDriverIT; +import org.junit.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; + +import java.util.List; + +/** + * Test the login action. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class LoginSIT extends PollenBaseWebDriverIT { + + public LoginSIT(Class<? extends WebDriver> driverType) { + super(driverType); + } + + @Test + public void loginAdmin() throws Exception { + + WebDriver driver = getDriver(); + + driver.get("http://localhost:8080/pollen/home"); + + if (log.isInfoEnabled()) { + log.info("Login url : " + driver.getCurrentUrl()); + } + + // click on tologin element (display the login form) + WebElement loginClick = driver.findElement(By.id("tologin")); + loginClick.click(); + + // Find the text input element by its name + WebElement login = driver.findElement(By.name("login")); + Assert.assertEquals("input", login.getTagName()); + Assert.assertTrue(login.isDisplayed()); + login.sendKeys("admin"); + + WebElement password = driver.findElement(By.name("password")); + Assert.assertTrue(password.isDisplayed()); + Assert.assertEquals("input", password.getTagName()); + password.sendKeys("admin"); + + WebElement submit = driver.findElement(By.name("action:login")); + Assert.assertNotNull(submit); + submit.click(); + + // check info_success is on + driver.findElement(By.className("info_success")); + + // check there is a admin menu (so 4 menus) + List<WebElement> menus = driver.findElements(By.className("menu_elt")); + Assert.assertEquals(4, menus.size()); + } + + @Test + public void loginUser() throws Exception { + + WebDriver driver = getDriver(); + + driver.get("http://localhost:8080/pollen/home"); + + if (log.isInfoEnabled()) { + log.info("Login url : " + driver.getCurrentUrl()); + } + + // click on tologin element (display the login form) + WebElement loginClick = driver.findElement(By.id("tologin")); + Assert.assertNotNull(loginClick); + loginClick.click(); + + // Find the text input element by its name + WebElement login = driver.findElement(By.name("login")); + Assert.assertEquals("input", login.getTagName()); + Assert.assertTrue(login.isDisplayed()); + login.sendKeys("user"); + + WebElement password = driver.findElement(By.name("password")); + Assert.assertTrue(password.isDisplayed()); + Assert.assertEquals("input", password.getTagName()); + password.sendKeys("user"); + + WebElement submit = driver.findElement(By.name("action:login")); + submit.click(); + + // check info_success is on + driver.findElement(By.className("info_success")); + + // check there is not a admin menu (so 2 menus) + List<WebElement> menus = driver.findElements(By.className("menu_elt")); + Assert.assertEquals(3, menus.size()); + } + + @Test + public void badLogin() throws Exception { + + WebDriver driver = getDriver(); + + driver.get("http://localhost:8080/pollen/home"); + + if (log.isInfoEnabled()) { + log.info("Login url : " + driver.getCurrentUrl()); + } + + // click on tologin element (display the login form) + WebElement loginClick = driver.findElement(By.id("tologin")); + Assert.assertNotNull(loginClick); + loginClick.click(); + + // Find the text input element by its name + WebElement login = driver.findElement(By.name("login")); + Assert.assertTrue(login.isDisplayed()); + login.sendKeys("admin"); + + WebElement password = driver.findElement(By.name("password")); + Assert.assertTrue(password.isDisplayed()); + password.sendKeys("admin" + System.currentTimeMillis()); + + WebElement submit = driver.findElement(By.name("action:login")); + submit.click(); + + driver.findElement(By.className("info_error")); + } +} Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java (from rev 3455, trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java) =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java (rev 0) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-12 16:45:52 UTC (rev 3456) @@ -0,0 +1,303 @@ +package org.chorem.pollen.ui.security; + +import org.chorem.pollen.ui.PollenBaseWebDriverIT; +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; + +/** + * Test the security on some restricted pages : + * + * <ul> + * <li>Access to "connected pages" when connected (OK)</li> + * <li>Access to "connected pages" when not connected (KO)</li> + * <li>Access to "admin pages" when not connected (KO)</li> + * <li>Access to "admin pages" when not connected as admin (KO)</li> + * <li>Access to "admin pages" when connected as admin (OK)</li> + * </ul> + * + * TODO ymartel 2012/06/12 + * Should check those security access to : + * <ul> + * <li>Access to "poll page" with a good pollId (OK)</li> + * <li>Access to "poll page" with a bad pollId (KO)</li> + * <li>Access to "restricted poll page" with a good accountId (OK)</li> + * <li>Access to "restricted poll page" with a bad accountId (KO)</li> + * </ul> + * + * @author ymartel <martel(a)codelutin.com> + */ +public class SecurityAccessSIT extends PollenBaseWebDriverIT { + + public SecurityAccessSIT(Class<? extends WebDriver> driverType) { + super(driverType); + } + + protected final String CREATEDLIST_URL = "http://localhost:8080/pollen/user/createdList"; + protected final String INVITEDLIST_URL = "http://localhost:8080/pollen/user/invitedList"; + protected final String PARTICIPATEDLIST_URL = "http://localhost:8080/pollen/user/participatedList"; + protected final String FAVORITELIST_URL = "http://localhost:8080/pollen/user/favoriteLists"; + protected final String ADMIN_POLLSLIST_URL = "http://localhost:8080/pollen/admin/pollsList"; + protected final String ADMIN_USERSLIST_URL = "http://localhost:8080/pollen/admin/usersList"; + protected final String CONNECTEDREQUIRED_URL = "http://localhost:8080/pollen/security/connected_required"; + protected final String ADMINREQUIRED_URL = "http://localhost:8080/pollen/security/admin_required"; + protected final String POLL_BASE_URL = "http://localhost:8080/pollen/poll/votefor/"; + protected final String POLL_MODIFICATION_BASE_URL = "http://localhost:8080/pollen/poll/modification/"; + protected final String NORMALPOLL_ID = "c7082f9752844b83a1859abcae3b681c"; + protected final String NORMALPOLL_ADMINTOKEN = "b9b434acd58d42fca083d473ee021fce"; + protected final String POLLREQUIRED_URL = "http://localhost:8080/pollen/security/poll_required"; + protected final String POLLACCESSREQUIRED_URL = "http://localhost:8080/pollen/security/poll_access_required"; + protected final String POLLCREATORREQUIRED_URL = "http://localhost:8080/pollen/security/poll_creator_required"; + + /** + * This test : + * <ol> + * <li>Connect the user "user"</li> + * <li>Try to access to createdList page</li> + * <li>Try to access to invitedList page</li> + * <li>Try to access to participatedList page</li> + * <li>Try to access to favoriteLists page</li> + * </ol> + * + * All the page should be accessed. + * + * @throws Exception + */ + @Test + public void accessConnectedPageAsUser() throws Exception { + + WebDriver driver = getDriver(); + + if (log.isInfoEnabled()) { + log.info("Login url : " + driver.getCurrentUrl()); + } + // login as user + connect(driver, "user", "user"); + + // try to access to createdList page, current url should be good one + driver.get(CREATEDLIST_URL); + Assert.assertEquals(CREATEDLIST_URL, driver.getCurrentUrl()); + + // try to access to participatedList page, current url should be good one + driver.get(PARTICIPATEDLIST_URL); + Assert.assertEquals(PARTICIPATEDLIST_URL, driver.getCurrentUrl()); + + // try to access to invitedList page, current url should be good one + driver.get(INVITEDLIST_URL); + Assert.assertEquals(INVITEDLIST_URL, driver.getCurrentUrl()); + + // try to access to favoriteLists page, current url should be good one + driver.get(FAVORITELIST_URL); + Assert.assertEquals(FAVORITELIST_URL, driver.getCurrentUrl()); + + } + + /** + * This test : + * <ol> + * <li>Don't login</li> + * <li>Try to access to createdList page</li> + * <li>Try to access to invitedList page</li> + * <li>Try to access to participatedList page</li> + * <li>Try to access to favoriteLists page</li> + * </ol> + * + * All the page should be redirected to connected_required page. + * + * @throws Exception + */ + @Test + public void accessConnectedPageAsAnonymous() throws Exception { + + WebDriver driver = getDriver(); + + // try to access to createdList page, current url should be the connected_required one + driver.get(CREATEDLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); + + // try to access to participatedList page, current url should be the connected_required one + driver.get(PARTICIPATEDLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); + + // try to access to invitedList page, current url should be the connected_required one + driver.get(INVITEDLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); + + // try to access to favoriteLists page, current url should be the connected_required one + driver.get(FAVORITELIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); + + } + + /** + * This test : + * <ol> + * <li>Don't login</li> + * <li>Try to access to admin polls list page</li> + * <li>Try to access to admin users list page</li> + * </ol> + * + * All the page should be redirected to connected_required page. + * + * @throws Exception + */ + @Test + public void accessAdminPageAsAnonymous() throws Exception { + + WebDriver driver = getDriver(); + + // try to access to admin polls list page, current url should be the connected_required one + driver.get(ADMIN_POLLSLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); + + // try to access to admin users list page, current url should be the connected_required one + driver.get(ADMIN_USERSLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); + + } + + /** + * This test : + * <ol> + * <li>Login as lambda user</li> + * <li>Try to access to admin polls list page</li> + * <li>Try to access to admin users list page</li> + * </ol> + * + * All the page should be redirected to admin_required page. + * + * @throws Exception + */ + @Test + public void accessAdminPageAsUser() throws Exception { + + WebDriver driver = getDriver(); + + // login as user + connect(driver, "user", "user"); + + // try to access to admin polls list page, current url should be the admin_required one + driver.get(ADMIN_POLLSLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(ADMINREQUIRED_URL)); + + // try to access to admin users list page, current url should be the admin_required one + driver.get(ADMIN_USERSLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(ADMINREQUIRED_URL)); + + } + + /** + * This test : + * <ol> + * <li>Login as admin</li> + * <li>Try to access to admin polls list page</li> + * <li>Try to access to admin users list page</li> + * </ol> + * + * All the page should be accessed. + * + * @throws Exception + */ + @Test + public void accessAdminPageAsAdmin() throws Exception { + + WebDriver driver = getDriver(); + + // login as user + connect(driver, "admin", "admin"); + + // try to access to admin polls list page, current url should be good one + driver.get(ADMIN_POLLSLIST_URL); + Assert.assertEquals(ADMIN_POLLSLIST_URL, driver.getCurrentUrl()); + + // try to access to admin users list page, current url should be good one + driver.get(ADMIN_USERSLIST_URL); + Assert.assertEquals(ADMIN_USERSLIST_URL, driver.getCurrentUrl()); + + } + + /** + * This test : + * <ol> + * <li>Try to access to normal poll with good pollId</li> + * <li>Try to access to normal poll with bad pollId (should be redirected)</li> + * <li>Try to access to moderation page for normal poll with good pollId & good tokenId</li> + * <li>Try to access to moderation page for normal poll with good pollId & bad tokenId (should be redirected)</li> + * <li>Try to access to admin page for normal poll with good pollId & good tokenId</li> + * <li>Try to access to admin page for normal poll with good pollId & bad tokenId (should be redirected)</li> + * </ol> + * + * All the page should be accessed. + * + * @throws Exception + */ + @Test + public void accessNormalPoolActionsAsAnonymous() throws Exception { + + WebDriver driver = getDriver(); + + // try to access to poll page, current url should be good one + String normalPollURL = POLL_BASE_URL + NORMALPOLL_ID; + driver.get(normalPollURL); + Assert.assertEquals(normalPollURL, driver.getCurrentUrl()); + + // try to access to poll page with bad pollId, current url should be the poll_required one + String badPollURL = POLL_BASE_URL + NORMALPOLL_ID.substring(0, 5); + driver.get(badPollURL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(POLLREQUIRED_URL)); + + // try to access to poll moderation page, current url should be good one + String moderationURL = normalPollURL + ":" + NORMALPOLL_ADMINTOKEN; + driver.get(moderationURL); + Assert.assertEquals(moderationURL, driver.getCurrentUrl()); + + // try to access to poll page with bad pollId, current url should be the poll_required one + String badModerationURL = normalPollURL + ":" + NORMALPOLL_ADMINTOKEN.substring(0, 5); + driver.get(badModerationURL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(POLLACCESSREQUIRED_URL)); + + // try to access to poll moderation page, current url should be good one + String normalPollAdminURL = POLL_MODIFICATION_BASE_URL + NORMALPOLL_ID + ":" + NORMALPOLL_ADMINTOKEN; + driver.get(normalPollAdminURL); + Assert.assertEquals(normalPollAdminURL, driver.getCurrentUrl()); + + // try to access to poll page with bad pollId, current url should be the poll_required one + String badNormalPollAdminURL = POLL_MODIFICATION_BASE_URL + NORMALPOLL_ID + ":" + NORMALPOLL_ADMINTOKEN.substring(0, 2); + driver.get(badNormalPollAdminURL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(POLLCREATORREQUIRED_URL)); + + } + + /** + * Connect as the user named "user" + * + * @param driver : the {@link WebDriver} of the current test + */ + protected void connect(WebDriver driver, String username, String pwd) { + + // Go on home page + driver.get("http://localhost:8080/pollen/home"); + + // click on tologin element (display the login form) + WebElement loginClick = driver.findElement(By.id("tologin")); + Assert.assertNotNull(loginClick); + loginClick.click(); + + // Find the text input element by its name + WebElement login = driver.findElement(By.name("login")); + Assert.assertEquals("input", login.getTagName()); + Assert.assertTrue(login.isDisplayed()); + login.sendKeys(username); + + WebElement password = driver.findElement(By.name("password")); + Assert.assertTrue(password.isDisplayed()); + Assert.assertEquals("input", password.getTagName()); + password.sendKeys(pwd); + + WebElement submit = driver.findElement(By.name("action:login")); + submit.click(); + } + +} Copied: trunk/pollen-ui-struts2/src/test/resources/log4j.properties (from rev 3451, trunk/pollen-ui-struts2-test/src/main/resources/log4j.properties) =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/log4j.properties 2012-06-12 16:45:52 UTC (rev 3456) @@ -0,0 +1,39 @@ +### +# #%L +# Pollen :: UI (struts2) +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +log4j.rootCategory=ERROR, console, file + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d [%p] %c %m%n + +log4j.logger.org.chorem.pollen=INFO +log4j.logger.org.chorem.pollen.ui.PollenShiroIsAdministratorFilter=DEBUG +log4j.logger.org.nuiton=INFO + +# FileAppender : need to have pollen.log.dir in system properties at application startup +log4j.appender.file=org.apache.log4j.RollingFileAppender +log4j.appender.file.File=${basedir}/target/pollen.log +log4j.appender.file.MaxFileSize=10MB +log4j.appender.file.MaxBackupIndex=4 +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n Property changes on: trunk/pollen-ui-struts2/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-ui-struts2/src/test/resources/pollen-test.properties (from rev 3454, trunk/pollen-ui-struts2-test/src/main/resources/pollen-test.properties) =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/pollen-test.properties (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/pollen-test.properties 2012-06-12 16:45:52 UTC (rev 3456) @@ -0,0 +1,46 @@ +### +# #%L +# Pollen :: UI (struts2) Test +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### + +# Db configuration +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password=sa +hibernate.connection.driver_class=org.h2.Driver +hibernate.show_sql=false +hibernate.hbm2ddl.auto=update + +# Database migration configuration +topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine +topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback +topia.service.migration.showSql=false + +# Version de l'application +pollen.version=${project.version} + +# url de l'application +siteUrl=http://localhost:8080/pollen + +# répertoire des données (chaque execution utilisera un sous répertoire) +pollen.dataDirectory=${basedir}/target/surefire-workdir/pollen-data + +incomingDatabase=${basedir}/target/test-classes/pollendb.h2.db \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/test/resources/pollen-test.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db (from rev 3454, trunk/pollen-ui-struts2-test/src/test/resources/pollendb.h2.db) =================================================================== (Binary files differ) Property changes on: trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL Added: trunk/pollen-ui-struts2/src/test/resources/web-test.xml =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/web-test.xml (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/web-test.xml 2012-06-12 16:45:52 UTC (rev 3456) @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<web-app id="Pollen" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <display-name>Pollen</display-name> + + <filter> + <filter-name>topiaTransaction</filter-name> + <filter-class>org.chorem.pollen.ui.PollenTopiaTransactionFilter</filter-class> + </filter> + + <filter> + <filter-name>struts-prepare</filter-name> + <filter-class> + org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter + </filter-class> + </filter> + <filter> + <filter-name>ShiroFilter</filter-name> + <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class> + </filter> + + <filter> + <filter-name>sitemesh</filter-name> + <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class> + </filter> + + <filter> + <filter-name>struts-execute</filter-name> + <filter-class> + org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter + </filter-class> + </filter> + + <filter-mapping> + <filter-name>topiaTransaction</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>ShiroFilter</filter-name> + <url-pattern>/*</url-pattern> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>ERROR</dispatcher> + </filter-mapping> + + <filter-mapping> + <filter-name>struts-prepare</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>sitemesh</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>struts-execute</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <listener> + <description>Init</description> + <listener-class>org.chorem.pollen.ui.PollenTestApplicationListener</listener-class> + </listener> + + <listener> + <description>Shiro security layer</description> + <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class> + </listener> + + <welcome-file-list> + <welcome-file>/</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>home</welcome-file> + </welcome-file-list> +</web-app> Modified: trunk/pollen-ui-struts2-test/pom.xml =================================================================== --- trunk/pollen-ui-struts2-test/pom.xml 2012-06-12 16:23:53 UTC (rev 3455) +++ trunk/pollen-ui-struts2-test/pom.xml 2012-06-12 16:45:52 UTC (rev 3456) @@ -25,6 +25,7 @@ <artifactId>pollen-ui-struts2</artifactId> <version>${project.version}</version> <type>war</type> + <classifier>embedded</classifier> </dependency> <dependency> @@ -121,30 +122,45 @@ <groupId>org.mortbay.jetty</groupId> <artifactId>jetty-maven-plugin</artifactId> <configuration> - <daemon>true</daemon> <stopKey>A</stopKey> <stopPort>1269</stopPort> - <webAppConfig> - <contextPath>/pollen</contextPath> - </webAppConfig> - <systemProperties> - <systemProperty> - <name>siteUrl</name> - <value>http://localhost:8080/pollen</value> - </systemProperty> - <systemProperty> - <name>pollen.log.dir</name> - <value>target</value> - </systemProperty> - </systemProperties> </configuration> <executions> + <execution> + <id>start-pollen</id> + <phase>pre-integration-test</phase> <goals> <goal>run</goal> </goals> - <phase>pre-integration-test</phase> + <configuration> + <daemon>true</daemon> + <stopKey>A</stopKey> + <stopPort>1269</stopPort> + <webAppConfig> + <descriptor>src/test/resources/web-test.xml</descriptor> + <contextPath>/pollen</contextPath> + </webAppConfig> + <systemProperties> + <systemProperty> + <name>siteUrl</name> + <value>http://localhost:8080/pollen</value> + </systemProperty> + <systemProperty> + <name>pollen.log.dir</name> + <value>target</value> + </systemProperty> + </systemProperties> + </configuration> </execution> + + <execution> + <id>stop-pollen</id> + <phase>post-integration-test</phase> + <goals> + <goal>stop</goal> + </goals> + </execution> </executions> </plugin> Deleted: trunk/pollen-ui-struts2-test/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-ui-struts2-test/src/main/resources/log4j.properties 2012-06-12 16:23:53 UTC (rev 3455) +++ trunk/pollen-ui-struts2-test/src/main/resources/log4j.properties 2012-06-12 16:45:52 UTC (rev 3456) @@ -1,39 +0,0 @@ -### -# #%L -# Pollen :: UI (struts2) -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -log4j.rootCategory=ERROR, console, file - -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d [%p] %c %m%n - -log4j.logger.org.chorem.pollen=INFO -log4j.logger.org.chorem.pollen.ui.PollenShiroIsAdministratorFilter=DEBUG -log4j.logger.org.nuiton=INFO - -# FileAppender : need to have pollen.log.dir in system properties at application startup -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File=${basedir}/target/pollen.log -log4j.appender.file.MaxFileSize=10MB -log4j.appender.file.MaxBackupIndex=4 -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n Deleted: trunk/pollen-ui-struts2-test/src/main/resources/pollen-test.properties =================================================================== --- trunk/pollen-ui-struts2-test/src/main/resources/pollen-test.properties 2012-06-12 16:23:53 UTC (rev 3455) +++ trunk/pollen-ui-struts2-test/src/main/resources/pollen-test.properties 2012-06-12 16:45:52 UTC (rev 3456) @@ -1,46 +0,0 @@ -### -# #%L -# Pollen :: UI (struts2) Test -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### - -# Db configuration -hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.username=sa -hibernate.connection.password=sa -hibernate.connection.driver_class=org.h2.Driver -hibernate.show_sql=false -hibernate.hbm2ddl.auto=update - -# Database migration configuration -topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine -topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback -topia.service.migration.showSql=false - -# Version de l'application -pollen.version=${project.version} - -# url de l'application -siteUrl=http://localhost:8080/pollen - -# répertoire des données (chaque execution utilisera un sous répertoire) -pollen.dataDirectory=${basedir}/target/surefire-workdir/pollen-data - -incomingDatabase=${basedir}/target/test-classes/pollendb.h2.db \ No newline at end of file Deleted: trunk/pollen-ui-struts2-test/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/pollen-ui-struts2-test/src/main/webapp/WEB-INF/web.xml 2012-06-12 16:23:53 UTC (rev 3455) +++ trunk/pollen-ui-struts2-test/src/main/webapp/WEB-INF/web.xml 2012-06-12 16:45:52 UTC (rev 3456) @@ -1,103 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<web-app id="Pollen" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - - <display-name>Pollen</display-name> - - <filter> - <filter-name>topiaTransaction</filter-name> - <filter-class>org.chorem.pollen.ui.PollenTopiaTransactionFilter</filter-class> - </filter> - - <filter> - <filter-name>struts-prepare</filter-name> - <filter-class> - org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter - </filter-class> - </filter> - <filter> - <filter-name>ShiroFilter</filter-name> - <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class> - </filter> - - <filter> - <filter-name>sitemesh</filter-name> - <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class> - </filter> - - <filter> - <filter-name>struts-execute</filter-name> - <filter-class> - org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter - </filter-class> - </filter> - - <filter-mapping> - <filter-name>topiaTransaction</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <filter-mapping> - <filter-name>ShiroFilter</filter-name> - <url-pattern>/*</url-pattern> - <dispatcher>REQUEST</dispatcher> - <dispatcher>FORWARD</dispatcher> - <dispatcher>INCLUDE</dispatcher> - <dispatcher>ERROR</dispatcher> - </filter-mapping> - - <filter-mapping> - <filter-name>struts-prepare</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <filter-mapping> - <filter-name>sitemesh</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <filter-mapping> - <filter-name>struts-execute</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <listener> - <description>Init</description> - <listener-class>org.chorem.pollen.ui.PollenTestApplicationListener</listener-class> - </listener> - - <listener> - <description>Shiro security layer</description> - <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class> - </listener> - - <welcome-file-list> - <welcome-file>/</welcome-file> - <welcome-file>index.jsp</welcome-file> - <welcome-file>home</welcome-file> - </welcome-file-list> -</web-app> Deleted: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java =================================================================== --- trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java 2012-06-12 16:23:53 UTC (rev 3455) +++ trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java 2012-06-12 16:45:52 UTC (rev 3456) @@ -1,63 +0,0 @@ -/* - * #%L - * T3 :: Web - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Rule; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.openqa.selenium.WebDriver; - -import java.util.Collection; - -/** - * Test base class for ui tests. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.4 - */ -@RunWith(value = Parameterized.class) -public abstract class PollenBaseWebDriverIT { - - /** Logger. */ - protected final Log log = LogFactory.getLog(getClass()); - - @Parameterized.Parameters - public static Collection<Object[]> driverTypes() { - return WebDriverResource.driverTypes(); - } - - @Rule - public WebDriverResource seleniumServer; - - protected PollenBaseWebDriverIT(Class<? extends WebDriver> driverType) { - seleniumServer = new WebDriverResource(getClass(), driverType); - } - - public WebDriver getDriver() { - return seleniumServer.getDriver(); - } - -} Deleted: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/WebDriverResource.java =================================================================== --- trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/WebDriverResource.java 2012-06-12 16:23:53 UTC (rev 3455) +++ trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/WebDriverResource.java 2012-06-12 16:45:52 UTC (rev 3456) @@ -1,154 +0,0 @@ -/* - * #%L - * T3 :: Web - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.rules.ExternalResource; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.chrome.ChromeDriver; -import org.openqa.selenium.chrome.ChromeDriverService; -import org.openqa.selenium.firefox.FirefoxDriver; -import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import org.openqa.selenium.remote.DesiredCapabilities; -import org.openqa.selenium.remote.RemoteWebDriver; - -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -/** - * Web driver resource. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.4 - */ -public class WebDriverResource extends ExternalResource { - - /** Logger. */ - private static final Log log = LogFactory.getLog(WebDriverResource.class); - - private static ChromeDriverService service; - - protected static final Class<? extends WebDriver>[] allDrivers = new Class[]{ -// ChromeDriver.class, -// InternetExplorerDriver.class, -// SafariDriver.class, - FirefoxDriver.class, - HtmlUnitDriver.class - }; - - protected static Collection<Object[]> safeDrivers; - - public static Collection<Object[]> driverTypes() { - if (safeDrivers == null) { - - //System.setProperty("webdriver.chrome.driver", "/usr/bin/google-chrome"); - List<Class<?>> checkedDrivers = new ArrayList<Class<?>>(); - for (Class<? extends WebDriver> driver : allDrivers) { - boolean ok = checkDriver(driver); - if (ok) { - checkedDrivers.add(driver); - } - } - //{{ChromeDriver.class}, {FirefoxDriver.class}, {HtmlUnitDriver.class}} - Object[][] data = new Object[checkedDrivers.size()][1]; - int i = 0; - for (Class<?> checkedDriver : checkedDrivers) { - data[i++][0] = checkedDriver; - } - safeDrivers = Arrays.asList(data); - } - - return safeDrivers; - } - - private static boolean checkDriver(Class<? extends WebDriver> driverType) { - - WebDriver driver = null; - boolean result = false; - try { - driver = driverType.getConstructor().newInstance(); - result = true; - } catch (Exception e) { - - // can not use this driver - if (log.isInfoEnabled()) { - log.info("Can not use driver " + driverType.getName(), e); - } - } finally { - if (driver != null) { - driver.quit(); - } - } - - return result; - } - - private final Class<?> testClass; - - private final Class<? extends WebDriver> driverType; - - protected WebDriver driver; - - public WebDriverResource(Class<?> testClass, - Class<? extends WebDriver> driverType) { - this.testClass = testClass; - this.driverType = driverType; - } - - public WebDriver getDriver() { - return driver; - } - - @Override - protected void before() throws Throwable { - if (log.isInfoEnabled()) { - log.info("Start test [" + testClass.getName() + "] with driver of type " + driverType.getName()); - } - if (ChromeDriver.class == driverType) { - - service = new ChromeDriverService.Builder() - .usingChromeDriverExecutable(new File("/usr/bin/chromium-browser")) - .usingAnyFreePort() - .build(); - service.start(); - - driver = new RemoteWebDriver(service.getUrl(), DesiredCapabilities.chrome()); - - } else { - driver = driverType.getConstructor().newInstance(); - } - } - - @Override - protected void after() { - if (ChromeDriver.class == driverType) { - service.stop(); - } - driver.quit(); - } -} Deleted: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java =================================================================== --- trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java 2012-06-12 16:23:53 UTC (rev 3455) +++ trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java 2012-06-12 16:45:52 UTC (rev 3456) @@ -1,153 +0,0 @@ -/* - * #%L - * T3 :: Web - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui.security; - -import junit.framework.Assert; -import org.chorem.pollen.ui.PollenBaseWebDriverIT; -import org.junit.Test; -import org.openqa.selenium.By; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; - -import java.util.List; - -/** - * Test the login action. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.4 - */ -public class LoginSIT extends PollenBaseWebDriverIT { - - public LoginSIT(Class<? extends WebDriver> driverType) { - super(driverType); - } - - @Test - public void loginAdmin() throws Exception { - - WebDriver driver = getDriver(); - - driver.get("http://localhost:8080/pollen/home"); - - if (log.isInfoEnabled()) { - log.info("Login url : " + driver.getCurrentUrl()); - } - - // click on tologin element (display the login form) - WebElement loginClick = driver.findElement(By.id("tologin")); - loginClick.click(); - - // Find the text input element by its name - WebElement login = driver.findElement(By.name("login")); - Assert.assertEquals("input", login.getTagName()); - Assert.assertTrue(login.isDisplayed()); - login.sendKeys("admin"); - - WebElement password = driver.findElement(By.name("password")); - Assert.assertTrue(password.isDisplayed()); - Assert.assertEquals("input", password.getTagName()); - password.sendKeys("admin"); - - WebElement submit = driver.findElement(By.name("action:login")); - Assert.assertNotNull(submit); - submit.click(); - - // check info_success is on - driver.findElement(By.className("info_success")); - - // check there is a admin menu (so 4 menus) - List<WebElement> menus = driver.findElements(By.className("menu_elt")); - Assert.assertEquals(4, menus.size()); - } - - @Test - public void loginUser() throws Exception { - - WebDriver driver = getDriver(); - - driver.get("http://localhost:8080/pollen/home"); - - if (log.isInfoEnabled()) { - log.info("Login url : " + driver.getCurrentUrl()); - } - - // click on tologin element (display the login form) - WebElement loginClick = driver.findElement(By.id("tologin")); - Assert.assertNotNull(loginClick); - loginClick.click(); - - // Find the text input element by its name - WebElement login = driver.findElement(By.name("login")); - Assert.assertEquals("input", login.getTagName()); - Assert.assertTrue(login.isDisplayed()); - login.sendKeys("user"); - - WebElement password = driver.findElement(By.name("password")); - Assert.assertTrue(password.isDisplayed()); - Assert.assertEquals("input", password.getTagName()); - password.sendKeys("user"); - - WebElement submit = driver.findElement(By.name("action:login")); - submit.click(); - - // check info_success is on - driver.findElement(By.className("info_success")); - - // check there is not a admin menu (so 2 menus) - List<WebElement> menus = driver.findElements(By.className("menu_elt")); - Assert.assertEquals(3, menus.size()); - } - - @Test - public void badLogin() throws Exception { - - WebDriver driver = getDriver(); - - driver.get("http://localhost:8080/pollen/home"); - - if (log.isInfoEnabled()) { - log.info("Login url : " + driver.getCurrentUrl()); - } - - // click on tologin element (display the login form) - WebElement loginClick = driver.findElement(By.id("tologin")); - Assert.assertNotNull(loginClick); - loginClick.click(); - - // Find the text input element by its name - WebElement login = driver.findElement(By.name("login")); - Assert.assertTrue(login.isDisplayed()); - login.sendKeys("admin"); - - WebElement password = driver.findElement(By.name("password")); - Assert.assertTrue(password.isDisplayed()); - password.sendKeys("admin" + System.currentTimeMillis()); - - WebElement submit = driver.findElement(By.name("action:login")); - submit.click(); - - driver.findElement(By.className("info_error")); - } -} Deleted: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java =================================================================== --- trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-12 16:23:53 UTC (rev 3455) +++ trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-12 16:45:52 UTC (rev 3456) @@ -1,303 +0,0 @@ -package org.chorem.pollen.ui.security; - -import org.chorem.pollen.ui.PollenBaseWebDriverIT; -import org.junit.Assert; -import org.junit.Test; -import org.openqa.selenium.By; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; - -/** - * Test the security on some restricted pages : - * - * <ul> - * <li>Access to "connected pages" when connected (OK)</li> - * <li>Access to "connected pages" when not connected (KO)</li> - * <li>Access to "admin pages" when not connected (KO)</li> - * <li>Access to "admin pages" when not connected as admin (KO)</li> - * <li>Access to "admin pages" when connected as admin (OK)</li> - * </ul> - * - * TODO ymartel 2012/06/12 - * Should check those security access to : - * <ul> - * <li>Access to "poll page" with a good pollId (OK)</li> - * <li>Access to "poll page" with a bad pollId (KO)</li> - * <li>Access to "restricted poll page" with a good accountId (OK)</li> - * <li>Access to "restricted poll page" with a bad accountId (KO)</li> - * </ul> - * - * @author ymartel <martel(a)codelutin.com> - */ -public class SecurityAccessSIT extends PollenBaseWebDriverIT { - - public SecurityAccessSIT(Class<? extends WebDriver> driverType) { - super(driverType); - } - - protected final String CREATEDLIST_URL = "http://localhost:8080/pollen/user/createdList"; - protected final String INVITEDLIST_URL = "http://localhost:8080/pollen/user/invitedList"; - protected final String PARTICIPATEDLIST_URL = "http://localhost:8080/pollen/user/participatedList"; - protected final String FAVORITELIST_URL = "http://localhost:8080/pollen/user/favoriteLists"; - protected final String ADMIN_POLLSLIST_URL = "http://localhost:8080/pollen/admin/pollsList"; - protected final String ADMIN_USERSLIST_URL = "http://localhost:8080/pollen/admin/usersList"; - protected final String CONNECTEDREQUIRED_URL = "http://localhost:8080/pollen/security/connected_required"; - protected final String ADMINREQUIRED_URL = "http://localhost:8080/pollen/security/admin_required"; - protected final String POLL_BASE_URL = "http://localhost:8080/pollen/poll/votefor/"; - protected final String POLL_MODIFICATION_BASE_URL = "http://localhost:8080/pollen/poll/modification/"; - protected final String NORMALPOLL_ID = "c7082f9752844b83a1859abcae3b681c"; - protected final String NORMALPOLL_ADMINTOKEN = "b9b434acd58d42fca083d473ee021fce"; - protected final String POLLREQUIRED_URL = "http://localhost:8080/pollen/security/poll_required"; - protected final String POLLACCESSREQUIRED_URL = "http://localhost:8080/pollen/security/poll_access_required"; - protected final String POLLCREATORREQUIRED_URL = "http://localhost:8080/pollen/security/poll_creator_required"; - - /** - * This test : - * <ol> - * <li>Connect the user "user"</li> - * <li>Try to access to createdList page</li> - * <li>Try to access to invitedList page</li> - * <li>Try to access to participatedList page</li> - * <li>Try to access to favoriteLists page</li> - * </ol> - * - * All the page should be accessed. - * - * @throws Exception - */ - @Test - public void accessConnectedPageAsUser() throws Exception { - - WebDriver driver = getDriver(); - - if (log.isInfoEnabled()) { - log.info("Login url : " + driver.getCurrentUrl()); - } - // login as user - connect(driver, "user", "user"); - - // try to access to createdList page, current url should be good one - driver.get(CREATEDLIST_URL); - Assert.assertEquals(CREATEDLIST_URL, driver.getCurrentUrl()); - - // try to access to participatedList page, current url should be good one - driver.get(PARTICIPATEDLIST_URL); - Assert.assertEquals(PARTICIPATEDLIST_URL, driver.getCurrentUrl()); - - // try to access to invitedList page, current url should be good one - driver.get(INVITEDLIST_URL); - Assert.assertEquals(INVITEDLIST_URL, driver.getCurrentUrl()); - - // try to access to favoriteLists page, current url should be good one - driver.get(FAVORITELIST_URL); - Assert.assertEquals(FAVORITELIST_URL, driver.getCurrentUrl()); - - } - - /** - * This test : - * <ol> - * <li>Don't login</li> - * <li>Try to access to createdList page</li> - * <li>Try to access to invitedList page</li> - * <li>Try to access to participatedList page</li> - * <li>Try to access to favoriteLists page</li> - * </ol> - * - * All the page should be redirected to connected_required page. - * - * @throws Exception - */ - @Test - public void accessConnectedPageAsAnonymous() throws Exception { - - WebDriver driver = getDriver(); - - // try to access to createdList page, current url should be the connected_required one - driver.get(CREATEDLIST_URL); - Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); - - // try to access to participatedList page, current url should be the connected_required one - driver.get(PARTICIPATEDLIST_URL); - Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); - - // try to access to invitedList page, current url should be the connected_required one - driver.get(INVITEDLIST_URL); - Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); - - // try to access to favoriteLists page, current url should be the connected_required one - driver.get(FAVORITELIST_URL); - Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); - - } - - /** - * This test : - * <ol> - * <li>Don't login</li> - * <li>Try to access to admin polls list page</li> - * <li>Try to access to admin users list page</li> - * </ol> - * - * All the page should be redirected to connected_required page. - * - * @throws Exception - */ - @Test - public void accessAdminPageAsAnonymous() throws Exception { - - WebDriver driver = getDriver(); - - // try to access to admin polls list page, current url should be the connected_required one - driver.get(ADMIN_POLLSLIST_URL); - Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); - - // try to access to admin users list page, current url should be the connected_required one - driver.get(ADMIN_USERSLIST_URL); - Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); - - } - - /** - * This test : - * <ol> - * <li>Login as lambda user</li> - * <li>Try to access to admin polls list page</li> - * <li>Try to access to admin users list page</li> - * </ol> - * - * All the page should be redirected to admin_required page. - * - * @throws Exception - */ - @Test - public void accessAdminPageAsUser() throws Exception { - - WebDriver driver = getDriver(); - - // login as user - connect(driver, "user", "user"); - - // try to access to admin polls list page, current url should be the admin_required one - driver.get(ADMIN_POLLSLIST_URL); - Assert.assertTrue(driver.getCurrentUrl().startsWith(ADMINREQUIRED_URL)); - - // try to access to admin users list page, current url should be the admin_required one - driver.get(ADMIN_USERSLIST_URL); - Assert.assertTrue(driver.getCurrentUrl().startsWith(ADMINREQUIRED_URL)); - - } - - /** - * This test : - * <ol> - * <li>Login as admin</li> - * <li>Try to access to admin polls list page</li> - * <li>Try to access to admin users list page</li> - * </ol> - * - * All the page should be accessed. - * - * @throws Exception - */ - @Test - public void accessAdminPageAsAdmin() throws Exception { - - WebDriver driver = getDriver(); - - // login as user - connect(driver, "admin", "admin"); - - // try to access to admin polls list page, current url should be good one - driver.get(ADMIN_POLLSLIST_URL); - Assert.assertEquals(ADMIN_POLLSLIST_URL, driver.getCurrentUrl()); - - // try to access to admin users list page, current url should be good one - driver.get(ADMIN_USERSLIST_URL); - Assert.assertEquals(ADMIN_USERSLIST_URL, driver.getCurrentUrl()); - - } - - /** - * This test : - * <ol> - * <li>Try to access to normal poll with good pollId</li> - * <li>Try to access to normal poll with bad pollId (should be redirected)</li> - * <li>Try to access to moderation page for normal poll with good pollId & good tokenId</li> - * <li>Try to access to moderation page for normal poll with good pollId & bad tokenId (should be redirected)</li> - * <li>Try to access to admin page for normal poll with good pollId & good tokenId</li> - * <li>Try to access to admin page for normal poll with good pollId & bad tokenId (should be redirected)</li> - * </ol> - * - * All the page should be accessed. - * - * @throws Exception - */ - @Test - public void accessNormalPoolActionsAsAnonymous() throws Exception { - - WebDriver driver = getDriver(); - - // try to access to poll page, current url should be good one - String normalPollURL = POLL_BASE_URL + NORMALPOLL_ID; - driver.get(normalPollURL); - Assert.assertEquals(normalPollURL, driver.getCurrentUrl()); - - // try to access to poll page with bad pollId, current url should be the poll_required one - String badPollURL = POLL_BASE_URL + NORMALPOLL_ID.substring(0, 5); - driver.get(badPollURL); - Assert.assertTrue(driver.getCurrentUrl().startsWith(POLLREQUIRED_URL)); - - // try to access to poll moderation page, current url should be good one - String moderationURL = normalPollURL + ":" + NORMALPOLL_ADMINTOKEN; - driver.get(moderationURL); - Assert.assertEquals(moderationURL, driver.getCurrentUrl()); - - // try to access to poll page with bad pollId, current url should be the poll_required one - String badModerationURL = normalPollURL + ":" + NORMALPOLL_ADMINTOKEN.substring(0, 5); - driver.get(badModerationURL); - Assert.assertTrue(driver.getCurrentUrl().startsWith(POLLACCESSREQUIRED_URL)); - - // try to access to poll moderation page, current url should be good one - String normalPollAdminURL = POLL_MODIFICATION_BASE_URL + NORMALPOLL_ID + ":" + NORMALPOLL_ADMINTOKEN; - driver.get(normalPollAdminURL); - Assert.assertEquals(normalPollAdminURL, driver.getCurrentUrl()); - - // try to access to poll page with bad pollId, current url should be the poll_required one - String badNormalPollAdminURL = POLL_MODIFICATION_BASE_URL + NORMALPOLL_ID + ":" + NORMALPOLL_ADMINTOKEN.substring(0, 2); - driver.get(badNormalPollAdminURL); - Assert.assertTrue(driver.getCurrentUrl().startsWith(POLLCREATORREQUIRED_URL)); - - } - - /** - * Connect as the user named "user" - * - * @param driver : the {@link WebDriver} of the current test - */ - protected void connect(WebDriver driver, String username, String pwd) { - - // Go on home page - driver.get("http://localhost:8080/pollen/home"); - - // click on tologin element (display the login form) - WebElement loginClick = driver.findElement(By.id("tologin")); - Assert.assertNotNull(loginClick); - loginClick.click(); - - // Find the text input element by its name - WebElement login = driver.findElement(By.name("login")); - Assert.assertEquals("input", login.getTagName()); - Assert.assertTrue(login.isDisplayed()); - login.sendKeys(username); - - WebElement password = driver.findElement(By.name("password")); - Assert.assertTrue(password.isDisplayed()); - Assert.assertEquals("input", password.getTagName()); - password.sendKeys(pwd); - - WebElement submit = driver.findElement(By.name("action:login")); - submit.click(); - } - -} Deleted: trunk/pollen-ui-struts2-test/src/test/resources/pollendb.h2.db =================================================================== (Binary files differ) Copied: trunk/pollen-ui-struts2-test/src/test/resources/web-test.xml (from rev 3451, trunk/pollen-ui-struts2-test/src/main/webapp/WEB-INF/web.xml) =================================================================== --- trunk/pollen-ui-struts2-test/src/test/resources/web-test.xml (rev 0) +++ trunk/pollen-ui-struts2-test/src/test/resources/web-test.xml 2012-06-12 16:45:52 UTC (rev 3456) @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<web-app id="Pollen" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <display-name>Pollen</display-name> + + <filter> + <filter-name>topiaTransaction</filter-name> + <filter-class>org.chorem.pollen.ui.PollenTopiaTransactionFilter</filter-class> + </filter> + + <filter> + <filter-name>struts-prepare</filter-name> + <filter-class> + org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter + </filter-class> + </filter> + <filter> + <filter-name>ShiroFilter</filter-name> + <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class> + </filter> + + <filter> + <filter-name>sitemesh</filter-name> + <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class> + </filter> + + <filter> + <filter-name>struts-execute</filter-name> + <filter-class> + org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter + </filter-class> + </filter> + + <filter-mapping> + <filter-name>topiaTransaction</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>ShiroFilter</filter-name> + <url-pattern>/*</url-pattern> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>ERROR</dispatcher> + </filter-mapping> + + <filter-mapping> + <filter-name>struts-prepare</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>sitemesh</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>struts-execute</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <listener> + <description>Init</description> + <listener-class>org.chorem.pollen.ui.PollenTestApplicationListener</listener-class> + </listener> + + <listener> + <description>Shiro security layer</description> + <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class> + </listener> + + <welcome-file-list> + <welcome-file>/</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>home</welcome-file> + </welcome-file-list> +</web-app> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-12 16:23:53 UTC (rev 3455) +++ trunk/pom.xml 2012-06-12 16:45:52 UTC (rev 3456) @@ -24,7 +24,6 @@ <module>pollen-persistence</module> <module>pollen-services</module> <module>pollen-ui-struts2</module> - <module>pollen-ui-struts2-test</module> </modules> <name>Pollen</name>

1 0

r3455 - trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security
by ymartel＠users.chorem.org 12 Jun '12

12 Jun '12

Author: ymartel Date: 2012-06-12 18:23:53 +0200 (Tue, 12 Jun 2012) New Revision: 3455 Url: http://chorem.org/repositories/revision/pollen/3455 Log: refs #606 : add tests for security access with a normal poll Modified: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java Modified: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java =================================================================== --- trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-12 16:12:48 UTC (rev 3454) +++ trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-12 16:23:53 UTC (rev 3455) @@ -44,8 +44,7 @@ protected final String CONNECTEDREQUIRED_URL = "http://localhost:8080/pollen/security/connected_required"; protected final String ADMINREQUIRED_URL = "http://localhost:8080/pollen/security/admin_required"; protected final String POLL_BASE_URL = "http://localhost:8080/pollen/poll/votefor/"; - protected final String POLL_ADMIN_BASE_URL = "http://localhost:8080/pollen/poll/votefor/"; - protected final String MODIFICATION_BASE8URL = "http://localhost:8080/pollen/poll/modification/"; + protected final String POLL_MODIFICATION_BASE_URL = "http://localhost:8080/pollen/poll/modification/"; protected final String NORMALPOLL_ID = "c7082f9752844b83a1859abcae3b681c"; protected final String NORMALPOLL_ADMINTOKEN = "b9b434acd58d42fca083d473ee021fce"; protected final String POLLREQUIRED_URL = "http://localhost:8080/pollen/security/poll_required"; @@ -245,7 +244,8 @@ Assert.assertEquals(normalPollURL, driver.getCurrentUrl()); // try to access to poll page with bad pollId, current url should be the poll_required one - driver.get(normalPollURL.substring(0, 10)); + String badPollURL = POLL_BASE_URL + NORMALPOLL_ID.substring(0, 5); + driver.get(badPollURL); Assert.assertTrue(driver.getCurrentUrl().startsWith(POLLREQUIRED_URL)); // try to access to poll moderation page, current url should be good one @@ -259,12 +259,12 @@ Assert.assertTrue(driver.getCurrentUrl().startsWith(POLLACCESSREQUIRED_URL)); // try to access to poll moderation page, current url should be good one - String normalPollAdminURL = POLL_ADMIN_BASE_URL + NORMALPOLL_ID + ":" + NORMALPOLL_ADMINTOKEN; + String normalPollAdminURL = POLL_MODIFICATION_BASE_URL + NORMALPOLL_ID + ":" + NORMALPOLL_ADMINTOKEN; driver.get(normalPollAdminURL); Assert.assertEquals(normalPollAdminURL, driver.getCurrentUrl()); // try to access to poll page with bad pollId, current url should be the poll_required one - String badNormalPollAdminURL = POLL_ADMIN_BASE_URL + NORMALPOLL_ID + ":" + NORMALPOLL_ADMINTOKEN.substring(0, 2); + String badNormalPollAdminURL = POLL_MODIFICATION_BASE_URL + NORMALPOLL_ID + ":" + NORMALPOLL_ADMINTOKEN.substring(0, 2); driver.get(badNormalPollAdminURL); Assert.assertTrue(driver.getCurrentUrl().startsWith(POLLCREATORREQUIRED_URL));

1 0

r3454 - in trunk/pollen-ui-struts2-test/src/test: java/org/chorem/pollen/ui/security resources
by ymartel＠users.chorem.org 12 Jun '12

12 Jun '12

Author: ymartel Date: 2012-06-12 18:12:48 +0200 (Tue, 12 Jun 2012) New Revision: 3454 Url: http://chorem.org/repositories/revision/pollen/3454 Log: refs #606 : add tests for security access with a normal poll Modified: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java trunk/pollen-ui-struts2-test/src/test/resources/pollendb.h2.db Modified: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java =================================================================== --- trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-12 14:25:28 UTC (rev 3453) +++ trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-12 16:12:48 UTC (rev 3454) @@ -43,6 +43,14 @@ protected final String ADMIN_USERSLIST_URL = "http://localhost:8080/pollen/admin/usersList"; protected final String CONNECTEDREQUIRED_URL = "http://localhost:8080/pollen/security/connected_required"; protected final String ADMINREQUIRED_URL = "http://localhost:8080/pollen/security/admin_required"; + protected final String POLL_BASE_URL = "http://localhost:8080/pollen/poll/votefor/"; + protected final String POLL_ADMIN_BASE_URL = "http://localhost:8080/pollen/poll/votefor/"; + protected final String MODIFICATION_BASE8URL = "http://localhost:8080/pollen/poll/modification/"; + protected final String NORMALPOLL_ID = "c7082f9752844b83a1859abcae3b681c"; + protected final String NORMALPOLL_ADMINTOKEN = "b9b434acd58d42fca083d473ee021fce"; + protected final String POLLREQUIRED_URL = "http://localhost:8080/pollen/security/poll_required"; + protected final String POLLACCESSREQUIRED_URL = "http://localhost:8080/pollen/security/poll_access_required"; + protected final String POLLCREATORREQUIRED_URL = "http://localhost:8080/pollen/security/poll_creator_required"; /** * This test : @@ -212,6 +220,57 @@ } /** + * This test : + * <ol> + * <li>Try to access to normal poll with good pollId</li> + * <li>Try to access to normal poll with bad pollId (should be redirected)</li> + * <li>Try to access to moderation page for normal poll with good pollId & good tokenId</li> + * <li>Try to access to moderation page for normal poll with good pollId & bad tokenId (should be redirected)</li> + * <li>Try to access to admin page for normal poll with good pollId & good tokenId</li> + * <li>Try to access to admin page for normal poll with good pollId & bad tokenId (should be redirected)</li> + * </ol> + * + * All the page should be accessed. + * + * @throws Exception + */ + @Test + public void accessNormalPoolActionsAsAnonymous() throws Exception { + + WebDriver driver = getDriver(); + + // try to access to poll page, current url should be good one + String normalPollURL = POLL_BASE_URL + NORMALPOLL_ID; + driver.get(normalPollURL); + Assert.assertEquals(normalPollURL, driver.getCurrentUrl()); + + // try to access to poll page with bad pollId, current url should be the poll_required one + driver.get(normalPollURL.substring(0, 10)); + Assert.assertTrue(driver.getCurrentUrl().startsWith(POLLREQUIRED_URL)); + + // try to access to poll moderation page, current url should be good one + String moderationURL = normalPollURL + ":" + NORMALPOLL_ADMINTOKEN; + driver.get(moderationURL); + Assert.assertEquals(moderationURL, driver.getCurrentUrl()); + + // try to access to poll page with bad pollId, current url should be the poll_required one + String badModerationURL = normalPollURL + ":" + NORMALPOLL_ADMINTOKEN.substring(0, 5); + driver.get(badModerationURL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(POLLACCESSREQUIRED_URL)); + + // try to access to poll moderation page, current url should be good one + String normalPollAdminURL = POLL_ADMIN_BASE_URL + NORMALPOLL_ID + ":" + NORMALPOLL_ADMINTOKEN; + driver.get(normalPollAdminURL); + Assert.assertEquals(normalPollAdminURL, driver.getCurrentUrl()); + + // try to access to poll page with bad pollId, current url should be the poll_required one + String badNormalPollAdminURL = POLL_ADMIN_BASE_URL + NORMALPOLL_ID + ":" + NORMALPOLL_ADMINTOKEN.substring(0, 2); + driver.get(badNormalPollAdminURL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(POLLCREATORREQUIRED_URL)); + + } + + /** * Connect as the user named "user" * * @param driver : the {@link WebDriver} of the current test Modified: trunk/pollen-ui-struts2-test/src/test/resources/pollendb.h2.db =================================================================== (Binary files differ)

1 0

r3453 - trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security
by ymartel＠users.chorem.org 12 Jun '12

12 Jun '12

Author: ymartel Date: 2012-06-12 16:25:28 +0200 (Tue, 12 Jun 2012) New Revision: 3453 Url: http://chorem.org/repositories/revision/pollen/3453 Log: refs #606 : add tests for security access Added: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java Added: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java =================================================================== --- trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java (rev 0) +++ trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-12 14:25:28 UTC (rev 3453) @@ -0,0 +1,244 @@ +package org.chorem.pollen.ui.security; + +import org.chorem.pollen.ui.PollenBaseWebDriverIT; +import org.junit.Assert; +import org.junit.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; + +/** + * Test the security on some restricted pages : + * + * <ul> + * <li>Access to "connected pages" when connected (OK)</li> + * <li>Access to "connected pages" when not connected (KO)</li> + * <li>Access to "admin pages" when not connected (KO)</li> + * <li>Access to "admin pages" when not connected as admin (KO)</li> + * <li>Access to "admin pages" when connected as admin (OK)</li> + * </ul> + * + * TODO ymartel 2012/06/12 + * Should check those security access to : + * <ul> + * <li>Access to "poll page" with a good pollId (OK)</li> + * <li>Access to "poll page" with a bad pollId (KO)</li> + * <li>Access to "restricted poll page" with a good accountId (OK)</li> + * <li>Access to "restricted poll page" with a bad accountId (KO)</li> + * </ul> + * + * @author ymartel <martel(a)codelutin.com> + */ +public class SecurityAccessSIT extends PollenBaseWebDriverIT { + + public SecurityAccessSIT(Class<? extends WebDriver> driverType) { + super(driverType); + } + + protected final String CREATEDLIST_URL = "http://localhost:8080/pollen/user/createdList"; + protected final String INVITEDLIST_URL = "http://localhost:8080/pollen/user/invitedList"; + protected final String PARTICIPATEDLIST_URL = "http://localhost:8080/pollen/user/participatedList"; + protected final String FAVORITELIST_URL = "http://localhost:8080/pollen/user/favoriteLists"; + protected final String ADMIN_POLLSLIST_URL = "http://localhost:8080/pollen/admin/pollsList"; + protected final String ADMIN_USERSLIST_URL = "http://localhost:8080/pollen/admin/usersList"; + protected final String CONNECTEDREQUIRED_URL = "http://localhost:8080/pollen/security/connected_required"; + protected final String ADMINREQUIRED_URL = "http://localhost:8080/pollen/security/admin_required"; + + /** + * This test : + * <ol> + * <li>Connect the user "user"</li> + * <li>Try to access to createdList page</li> + * <li>Try to access to invitedList page</li> + * <li>Try to access to participatedList page</li> + * <li>Try to access to favoriteLists page</li> + * </ol> + * + * All the page should be accessed. + * + * @throws Exception + */ + @Test + public void accessConnectedPageAsUser() throws Exception { + + WebDriver driver = getDriver(); + + if (log.isInfoEnabled()) { + log.info("Login url : " + driver.getCurrentUrl()); + } + // login as user + connect(driver, "user", "user"); + + // try to access to createdList page, current url should be good one + driver.get(CREATEDLIST_URL); + Assert.assertEquals(CREATEDLIST_URL, driver.getCurrentUrl()); + + // try to access to participatedList page, current url should be good one + driver.get(PARTICIPATEDLIST_URL); + Assert.assertEquals(PARTICIPATEDLIST_URL, driver.getCurrentUrl()); + + // try to access to invitedList page, current url should be good one + driver.get(INVITEDLIST_URL); + Assert.assertEquals(INVITEDLIST_URL, driver.getCurrentUrl()); + + // try to access to favoriteLists page, current url should be good one + driver.get(FAVORITELIST_URL); + Assert.assertEquals(FAVORITELIST_URL, driver.getCurrentUrl()); + + } + + /** + * This test : + * <ol> + * <li>Don't login</li> + * <li>Try to access to createdList page</li> + * <li>Try to access to invitedList page</li> + * <li>Try to access to participatedList page</li> + * <li>Try to access to favoriteLists page</li> + * </ol> + * + * All the page should be redirected to connected_required page. + * + * @throws Exception + */ + @Test + public void accessConnectedPageAsAnonymous() throws Exception { + + WebDriver driver = getDriver(); + + // try to access to createdList page, current url should be the connected_required one + driver.get(CREATEDLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); + + // try to access to participatedList page, current url should be the connected_required one + driver.get(PARTICIPATEDLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); + + // try to access to invitedList page, current url should be the connected_required one + driver.get(INVITEDLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); + + // try to access to favoriteLists page, current url should be the connected_required one + driver.get(FAVORITELIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); + + } + + /** + * This test : + * <ol> + * <li>Don't login</li> + * <li>Try to access to admin polls list page</li> + * <li>Try to access to admin users list page</li> + * </ol> + * + * All the page should be redirected to connected_required page. + * + * @throws Exception + */ + @Test + public void accessAdminPageAsAnonymous() throws Exception { + + WebDriver driver = getDriver(); + + // try to access to admin polls list page, current url should be the connected_required one + driver.get(ADMIN_POLLSLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); + + // try to access to admin users list page, current url should be the connected_required one + driver.get(ADMIN_USERSLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(CONNECTEDREQUIRED_URL)); + + } + + /** + * This test : + * <ol> + * <li>Login as lambda user</li> + * <li>Try to access to admin polls list page</li> + * <li>Try to access to admin users list page</li> + * </ol> + * + * All the page should be redirected to admin_required page. + * + * @throws Exception + */ + @Test + public void accessAdminPageAsUser() throws Exception { + + WebDriver driver = getDriver(); + + // login as user + connect(driver, "user", "user"); + + // try to access to admin polls list page, current url should be the admin_required one + driver.get(ADMIN_POLLSLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(ADMINREQUIRED_URL)); + + // try to access to admin users list page, current url should be the admin_required one + driver.get(ADMIN_USERSLIST_URL); + Assert.assertTrue(driver.getCurrentUrl().startsWith(ADMINREQUIRED_URL)); + + } + + /** + * This test : + * <ol> + * <li>Login as admin</li> + * <li>Try to access to admin polls list page</li> + * <li>Try to access to admin users list page</li> + * </ol> + * + * All the page should be accessed. + * + * @throws Exception + */ + @Test + public void accessAdminPageAsAdmin() throws Exception { + + WebDriver driver = getDriver(); + + // login as user + connect(driver, "admin", "admin"); + + // try to access to admin polls list page, current url should be good one + driver.get(ADMIN_POLLSLIST_URL); + Assert.assertEquals(ADMIN_POLLSLIST_URL, driver.getCurrentUrl()); + + // try to access to admin users list page, current url should be good one + driver.get(ADMIN_USERSLIST_URL); + Assert.assertEquals(ADMIN_USERSLIST_URL, driver.getCurrentUrl()); + + } + + /** + * Connect as the user named "user" + * + * @param driver : the {@link WebDriver} of the current test + */ + protected void connect(WebDriver driver, String username, String pwd) { + + // Go on home page + driver.get("http://localhost:8080/pollen/home"); + + // click on tologin element (display the login form) + WebElement loginClick = driver.findElement(By.id("tologin")); + Assert.assertNotNull(loginClick); + loginClick.click(); + + // Find the text input element by its name + WebElement login = driver.findElement(By.name("login")); + Assert.assertEquals("input", login.getTagName()); + Assert.assertTrue(login.isDisplayed()); + login.sendKeys(username); + + WebElement password = driver.findElement(By.name("password")); + Assert.assertTrue(password.isDisplayed()); + Assert.assertEquals("input", password.getTagName()); + password.sendKeys(pwd); + + WebElement submit = driver.findElement(By.name("action:login")); + submit.click(); + } + +}

1 0

r3452 - in trunk: pollen-ui-struts2 pollen-ui-struts2/src/main/assembly pollen-ui-struts2/src/test/java/org/chorem/pollen/ui pollen-ui-struts2/src/test/resources pollen-ui-struts2-test pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui pollen-ui-struts2-test/src/test/resources
by tchemit＠users.chorem.org 12 Jun '12

12 Jun '12

Author: tchemit Date: 2012-06-12 15:57:39 +0200 (Tue, 12 Jun 2012) New Revision: 3452 Url: http://chorem.org/repositories/revision/pollen/3452 Log: refs #606: Add some ITs to prevent regression (use jetty, will not work with tomcat plugin :() Added: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/WebDriverResource.java trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/security/ trunk/pollen-ui-struts2-test/src/test/resources/pollendb.h2.db Removed: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/ trunk/pollen-ui-struts2/src/test/resources/log4j.properties trunk/pollen-ui-struts2/src/test/resources/pollen-fake.properties trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db Modified: trunk/pollen-ui-struts2-test/pom.xml trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/assembly/bin.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-12 12:07:38 UTC (rev 3451) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-12 13:57:39 UTC (rev 3452) @@ -186,39 +186,6 @@ <artifactId>junit</artifactId> </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-java</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-api</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-support</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-chrome-driver</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-firefox-driver</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-htmlunit-driver</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-ie-driver</artifactId> - </dependency> - <dependency> - <groupId>org.seleniumhq.selenium</groupId> - <artifactId>selenium-safari-driver</artifactId> - </dependency> - </dependencies>  @@ -431,7 +398,7 @@ <goal>war</goal> </goals> <configuration> - <primaryArtifact>false</primaryArtifact> + <primaryArtifact>true</primaryArtifact> <webappDirectory> target/pollen-embedded-${project.version} </webappDirectory> @@ -440,7 +407,7 @@ <mainClass>org.nuiton.web.war.JettyLauncher</mainClass> </manifest> </archive> - <warName>pollen-embedded-${project.version}</warName> + <warName>pollen-${project.version}-embedded</warName> <webResources> <webResource> <directory> Modified: trunk/pollen-ui-struts2/src/main/assembly/bin.xml =================================================================== --- trunk/pollen-ui-struts2/src/main/assembly/bin.xml 2012-06-12 12:07:38 UTC (rev 3451) +++ trunk/pollen-ui-struts2/src/main/assembly/bin.xml 2012-06-12 13:57:39 UTC (rev 3452) @@ -33,7 +33,7 @@ <outputDirectory>/</outputDirectory> <fileMode>0755</fileMode> <includes> - <include>pollen-embedded-${project.version}.war</include> + <include>pollen-${project.version}-embedded.war</include> </includes> </fileSet> Deleted: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java 2012-06-12 12:07:38 UTC (rev 3451) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java 2012-06-12 13:57:39 UTC (rev 3452) @@ -1,63 +0,0 @@ -/* - * #%L - * T3 :: Web - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Rule; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.openqa.selenium.WebDriver; - -import java.util.Collection; - -/** - * Test base class for ui tests. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.4 - */ -@RunWith(value = Parameterized.class) -public abstract class PollenBaseWebDriverIT { - - /** Logger. */ - protected final Log log = LogFactory.getLog(getClass()); - - @Parameterized.Parameters - public static Collection<Object[]> driverTypes() { - return WebDriverResource.driverTypes(); - } - - @Rule - public WebDriverResource seleniumServer; - - protected PollenBaseWebDriverIT(Class<? extends WebDriver> driverType) { - seleniumServer = new WebDriverResource(getClass(), driverType); - } - - public WebDriver getDriver() { - return seleniumServer.getDriver(); - } - -} Deleted: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java 2012-06-12 12:07:38 UTC (rev 3451) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java 2012-06-12 13:57:39 UTC (rev 3452) @@ -1,154 +0,0 @@ -/* - * #%L - * T3 :: Web - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.ui; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.rules.ExternalResource; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.chrome.ChromeDriver; -import org.openqa.selenium.chrome.ChromeDriverService; -import org.openqa.selenium.firefox.FirefoxDriver; -import org.openqa.selenium.htmlunit.HtmlUnitDriver; -import org.openqa.selenium.remote.DesiredCapabilities; -import org.openqa.selenium.remote.RemoteWebDriver; - -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; - -/** - * Web driver resource. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.4 - */ -public class WebDriverResource extends ExternalResource { - - /** Logger. */ - private static final Log log = LogFactory.getLog(WebDriverResource.class); - - private static ChromeDriverService service; - - protected static final Class<? extends WebDriver>[] allDrivers = new Class[]{ -// ChromeDriver.class, -// InternetExplorerDriver.class, -// SafariDriver.class, - FirefoxDriver.class, - HtmlUnitDriver.class - }; - - protected static Collection<Object[]> safeDrivers; - - public static Collection<Object[]> driverTypes() { - if (safeDrivers == null) { - - //System.setProperty("webdriver.chrome.driver", "/usr/bin/google-chrome"); - List<Class<?>> checkedDrivers = new ArrayList<Class<?>>(); - for (Class<? extends WebDriver> driver : allDrivers) { - boolean ok = checkDriver(driver); - if (ok) { - checkedDrivers.add(driver); - } - } - //{{ChromeDriver.class}, {FirefoxDriver.class}, {HtmlUnitDriver.class}} - Object[][] data = new Object[checkedDrivers.size()][1]; - int i = 0; - for (Class<?> checkedDriver : checkedDrivers) { - data[i++][0] = checkedDriver; - } - safeDrivers = Arrays.asList(data); - } - - return safeDrivers; - } - - private static boolean checkDriver(Class<? extends WebDriver> driverType) { - - WebDriver driver = null; - boolean result = false; - try { - driver = driverType.getConstructor().newInstance(); - result = true; - } catch (Exception e) { - - // can not use this driver - if (log.isInfoEnabled()) { - log.info("Can not use driver " + driverType.getName(), e); - } - } finally { - if (driver != null) { - driver.quit(); - } - } - - return result; - } - - private final Class<?> testClass; - - private final Class<? extends WebDriver> driverType; - - protected WebDriver driver; - - public WebDriverResource(Class<?> testClass, - Class<? extends WebDriver> driverType) { - this.testClass = testClass; - this.driverType = driverType; - } - - public WebDriver getDriver() { - return driver; - } - - @Override - protected void before() throws Throwable { - if (log.isInfoEnabled()) { - log.info("Start test [" + testClass.getName() + "] with driver of type " + driverType.getName()); - } - if (ChromeDriver.class == driverType) { - - service = new ChromeDriverService.Builder() - .usingChromeDriverExecutable(new File("/usr/bin/chromium-browser")) - .usingAnyFreePort() - .build(); - service.start(); - - driver = new RemoteWebDriver(service.getUrl(), DesiredCapabilities.chrome()); - - } else { - driver = driverType.getConstructor().newInstance(); - } - } - - @Override - protected void after() { - if (ChromeDriver.class == driverType) { - service.stop(); - } - driver.quit(); - } -} Deleted: trunk/pollen-ui-struts2/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/log4j.properties 2012-06-12 12:07:38 UTC (rev 3451) +++ trunk/pollen-ui-struts2/src/test/resources/log4j.properties 2012-06-12 13:57:39 UTC (rev 3452) @@ -1,32 +0,0 @@ -### -# #%L -# Pollen :: UI (struts2) -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### -log4j.rootCategory=ERROR, console - -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern=%d [%p] %c %m%n - -log4j.logger.org.chorem=INFO -log4j.logger.org.chorem.pollen.ui.PollenShiroIsAdministratorFilter=DEBUG -log4j.logger.org.nuiton=INFO - Deleted: trunk/pollen-ui-struts2/src/test/resources/pollen-fake.properties =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/pollen-fake.properties 2012-06-12 12:07:38 UTC (rev 3451) +++ trunk/pollen-ui-struts2/src/test/resources/pollen-fake.properties 2012-06-12 13:57:39 UTC (rev 3452) @@ -1,39 +0,0 @@ -### -# #%L -# Pollen :: UI (struts2) -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2009 - 2012 CodeLutin -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. -# #L% -### - -# Db configuration -hibernate.dialect=org.hibernate.dialect.H2Dialect -hibernate.connection.username=sa -hibernate.connection.password=sa -hibernate.connection.driver_class=org.h2.Driver -hibernate.show_sql=false -hibernate.hbm2ddl.auto=update - -# Database migration configuration -topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine -topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback -topia.service.migration.showSql=false - -# Version de l'application -pollen.version=${project.version} -siteUrl=http://localhost:8080/pollen \ No newline at end of file Deleted: trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db =================================================================== (Binary files differ) Modified: trunk/pollen-ui-struts2-test/pom.xml =================================================================== --- trunk/pollen-ui-struts2-test/pom.xml 2012-06-12 12:07:38 UTC (rev 3451) +++ trunk/pollen-ui-struts2-test/pom.xml 2012-06-12 13:57:39 UTC (rev 3452) @@ -43,28 +43,25 @@ </dependency> <dependency> - <groupId>commons-io</groupId> - <artifactId>commons-io</artifactId> - </dependency> - - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> </dependency> +  <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</artifactId> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> <scope>provided</scope> </dependency> -  <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> <scope>provided</scope> </dependency> +  + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> @@ -116,84 +113,42 @@   - <packaging>war</packaging> - <build> - <testResources> - <testResource> - <directory>src/test/resources</directory> - <filtering>true</filtering> - <includes> - <include>**/*.properties</include> - <include>**/*.xml</include> - </includes> - </testResource> - <testResource> - <directory>src/test/resources</directory> - <filtering>false</filtering> - <excludes> - <exclude>**/*.properties</exclude> - <exclude>**/*.xml</exclude> - </excludes> - </testResource> - </testResources> - - <pluginManagement> - <plugins> - - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <overlays> - <overlay> - <groupId>${project.groupId}</groupId> - <artifactId>pollen-ui-struts2</artifactId> - <type>war</type> - </overlay> - </overlays> - </configuration> - </plugin> - - </plugins> - </pluginManagement> - <plugins> <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-maven-plugin</artifactId> + <groupId>org.mortbay.jetty</groupId> + <artifactId>jetty-maven-plugin</artifactId> + <configuration> + <daemon>true</daemon> + <stopKey>A</stopKey> + <stopPort>1269</stopPort> + <webAppConfig> + <contextPath>/pollen</contextPath> + </webAppConfig> + <systemProperties> + <systemProperty> + <name>siteUrl</name> + <value>http://localhost:8080/pollen</value> + </systemProperty> + <systemProperty> + <name>pollen.log.dir</name> + <value>target</value> + </systemProperty> + </systemProperties> + </configuration> <executions> <execution> - <id>start-web-server</id> - <phase>pre-integration-test</phase> <goals> <goal>run</goal> </goals> - <configuration> - <fork>true</fork> - <path>/pollen</path> - <systemProperties> - <pollen.log.dir>target</pollen.log.dir> - </systemProperties> - <uriEncoding>UTF-8</uriEncoding> - </configuration> + <phase>pre-integration-test</phase> </execution> - <execution> - <id>stop-web-server</id> - <phase>post-integration-test</phase> - <goals> - <goal>shutdown</goal> - </goals> - <configuration> - - <path>/pollen</path> - </configuration> - </execution> - </executions> </plugin> + <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> @@ -209,9 +164,9 @@ </goals> <configuration> <skip>false</skip> -  + </includes> </configuration> </execution> </executions> Copied: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java (from rev 3449, trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java) =================================================================== --- trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java (rev 0) +++ trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java 2012-06-12 13:57:39 UTC (rev 3452) @@ -0,0 +1,63 @@ +/* + * #%L + * T3 :: Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Rule; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.openqa.selenium.WebDriver; + +import java.util.Collection; + +/** + * Test base class for ui tests. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +@RunWith(value = Parameterized.class) +public abstract class PollenBaseWebDriverIT { + + /** Logger. */ + protected final Log log = LogFactory.getLog(getClass()); + + @Parameterized.Parameters + public static Collection<Object[]> driverTypes() { + return WebDriverResource.driverTypes(); + } + + @Rule + public WebDriverResource seleniumServer; + + protected PollenBaseWebDriverIT(Class<? extends WebDriver> driverType) { + seleniumServer = new WebDriverResource(getClass(), driverType); + } + + public WebDriver getDriver() { + return seleniumServer.getDriver(); + } + +} Property changes on: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/WebDriverResource.java (from rev 3449, trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java) =================================================================== --- trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/WebDriverResource.java (rev 0) +++ trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/WebDriverResource.java 2012-06-12 13:57:39 UTC (rev 3452) @@ -0,0 +1,154 @@ +/* + * #%L + * T3 :: Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.rules.ExternalResource; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.openqa.selenium.chrome.ChromeDriverService; +import org.openqa.selenium.firefox.FirefoxDriver; +import org.openqa.selenium.htmlunit.HtmlUnitDriver; +import org.openqa.selenium.remote.DesiredCapabilities; +import org.openqa.selenium.remote.RemoteWebDriver; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +/** + * Web driver resource. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class WebDriverResource extends ExternalResource { + + /** Logger. */ + private static final Log log = LogFactory.getLog(WebDriverResource.class); + + private static ChromeDriverService service; + + protected static final Class<? extends WebDriver>[] allDrivers = new Class[]{ +// ChromeDriver.class, +// InternetExplorerDriver.class, +// SafariDriver.class, + FirefoxDriver.class, + HtmlUnitDriver.class + }; + + protected static Collection<Object[]> safeDrivers; + + public static Collection<Object[]> driverTypes() { + if (safeDrivers == null) { + + //System.setProperty("webdriver.chrome.driver", "/usr/bin/google-chrome"); + List<Class<?>> checkedDrivers = new ArrayList<Class<?>>(); + for (Class<? extends WebDriver> driver : allDrivers) { + boolean ok = checkDriver(driver); + if (ok) { + checkedDrivers.add(driver); + } + } + //{{ChromeDriver.class}, {FirefoxDriver.class}, {HtmlUnitDriver.class}} + Object[][] data = new Object[checkedDrivers.size()][1]; + int i = 0; + for (Class<?> checkedDriver : checkedDrivers) { + data[i++][0] = checkedDriver; + } + safeDrivers = Arrays.asList(data); + } + + return safeDrivers; + } + + private static boolean checkDriver(Class<? extends WebDriver> driverType) { + + WebDriver driver = null; + boolean result = false; + try { + driver = driverType.getConstructor().newInstance(); + result = true; + } catch (Exception e) { + + // can not use this driver + if (log.isInfoEnabled()) { + log.info("Can not use driver " + driverType.getName(), e); + } + } finally { + if (driver != null) { + driver.quit(); + } + } + + return result; + } + + private final Class<?> testClass; + + private final Class<? extends WebDriver> driverType; + + protected WebDriver driver; + + public WebDriverResource(Class<?> testClass, + Class<? extends WebDriver> driverType) { + this.testClass = testClass; + this.driverType = driverType; + } + + public WebDriver getDriver() { + return driver; + } + + @Override + protected void before() throws Throwable { + if (log.isInfoEnabled()) { + log.info("Start test [" + testClass.getName() + "] with driver of type " + driverType.getName()); + } + if (ChromeDriver.class == driverType) { + + service = new ChromeDriverService.Builder() + .usingChromeDriverExecutable(new File("/usr/bin/chromium-browser")) + .usingAnyFreePort() + .build(); + service.start(); + + driver = new RemoteWebDriver(service.getUrl(), DesiredCapabilities.chrome()); + + } else { + driver = driverType.getConstructor().newInstance(); + } + } + + @Override + protected void after() { + if (ChromeDriver.class == driverType) { + service.stop(); + } + driver.quit(); + } +} Property changes on: trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/WebDriverResource.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-ui-struts2-test/src/test/resources/pollendb.h2.db (from rev 3451, trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db) =================================================================== (Binary files differ) Property changes on: trunk/pollen-ui-struts2-test/src/test/resources/pollendb.h2.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: svn:keywords + Author Date Id Revision HeadURL

1 0

12 Jun '12

Author: tchemit Date: 2012-06-12 14:07:38 +0200 (Tue, 12 Jun 2012) New Revision: 3451 Url: http://chorem.org/repositories/revision/pollen/3451 Log: refs #606: Add some ITs to prevent regression : - add a new module for this purpose - improve ApplicationListener to be overrideable - improve configuration to be overrideable Added: trunk/pollen-ui-struts2-test/ trunk/pollen-ui-struts2-test/LICENSE.txt trunk/pollen-ui-struts2-test/README.txt trunk/pollen-ui-struts2-test/changelog.txt trunk/pollen-ui-struts2-test/pom.xml trunk/pollen-ui-struts2-test/src/ trunk/pollen-ui-struts2-test/src/license/ trunk/pollen-ui-struts2-test/src/license/THIRD-PARTY.properties trunk/pollen-ui-struts2-test/src/main/ trunk/pollen-ui-struts2-test/src/main/java/ trunk/pollen-ui-struts2-test/src/main/resources/ trunk/pollen-ui-struts2-test/src/main/resources/log4j.properties trunk/pollen-ui-struts2-test/src/main/resources/pollen-test.properties trunk/pollen-ui-struts2-test/src/main/webapp/ trunk/pollen-ui-struts2-test/src/main/webapp/WEB-INF/ trunk/pollen-ui-struts2-test/src/main/webapp/WEB-INF/web.xml trunk/pollen-ui-struts2-test/src/site/ trunk/pollen-ui-struts2-test/src/site/site_en.xml trunk/pollen-ui-struts2-test/src/site/site_fr.xml trunk/pollen-ui-struts2-test/src/test/ trunk/pollen-ui-struts2-test/src/test/java/ trunk/pollen-ui-struts2-test/src/test/java/org/ trunk/pollen-ui-struts2-test/src/test/java/org/chorem/ trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ trunk/pollen-ui-struts2-test/src/test/java/org/chorem/pollen/ui/ trunk/pollen-ui-struts2-test/src/test/resources/ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTestApplicationListener.java Removed: trunk/pollen-ui-struts2/src/site/fr/ Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db trunk/pom.xml Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-12 10:13:48 UTC (rev 3450) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-12 12:07:38 UTC (rev 3451) @@ -50,43 +50,28 @@ public class PollenConfiguration { /** Logger. */ - protected static final Log log = + private static final Log log = LogFactory.getLog(PollenConfiguration.class); /** Delegate application config object containing configuration. */ - protected ApplicationConfig applicationConfig; + private ApplicationConfig applicationConfig; public PollenConfiguration() { this("pollen.properties", null); } - public PollenConfiguration(String file, Properties defaultOptions) { + public PollenConfiguration(String file, + Properties defaultOptions) { if (log.isInfoEnabled()) { log.info(this + " is initializing..."); } - applicationConfig = new ApplicationConfig(file); - try { - applicationConfig.loadDefaultOptions( - PollenConfigurationOption.values()); + loadApplicationConfig(file, defaultOptions); - if (defaultOptions != null) { - Enumeration<?> enumeration = defaultOptions.propertyNames(); - while (enumeration.hasMoreElements()) { - String key = (String) enumeration.nextElement(); - String property = defaultOptions.getProperty(key); - applicationConfig.setDefaultOption(key, property); - } - } - applicationConfig.parse(); - } catch (ArgumentsParserException e) { - throw new PollenTechnicalException( - "Could not parse configuration", e); - } - // application url is a mandatory property String applicationUrl = - applicationConfig.getOption(PollenConfigurationOption.APPLICATION_URL.key); + applicationConfig.getOption( + PollenConfigurationOption.APPLICATION_URL.key); if (StringUtils.isBlank(applicationUrl)) { throw new IllegalStateException( "No application url defined in configuration, please fill the property '" + @@ -198,6 +183,12 @@ return result; } + protected File getDataDirectory() { + File result = applicationConfig.getOptionAsFile( + PollenConfigurationOption.DATA_DIR.key); + return result; + } + public int getNbVotesPerPage() { int result = applicationConfig.getOptionAsInt( PollenConfigurationOption.NB_VOTES_PER_PAGE.key); @@ -216,62 +207,51 @@ } public void setAdminLogin(String adminLogin) { - applicationConfig.setOption( - PollenConfigurationOption.ADMIN_LOGIN.key, adminLogin); + setOption(PollenConfigurationOption.ADMIN_LOGIN.key, adminLogin); } public void setAdminPassword(String adminPassword) { - applicationConfig.setOption( - PollenConfigurationOption.ADMIN_PASSWORD.key, adminPassword); + setOption(PollenConfigurationOption.ADMIN_PASSWORD.key, adminPassword); } public void setAdminEmail(String adminEmail) { - applicationConfig.setOption( - PollenConfigurationOption.ADMIN_EMAIL.key, adminEmail); + setOption(PollenConfigurationOption.ADMIN_EMAIL.key, adminEmail); } public void setContactEmail(String contactEmail) { - applicationConfig.setOption( - PollenConfigurationOption.CONTACT_EMAIL.key, contactEmail); + setOption(PollenConfigurationOption.CONTACT_EMAIL.key, contactEmail); } public void setEmailHost(String emailHost) { - applicationConfig.setOption( - PollenConfigurationOption.EMAIL_HOST.key, emailHost); + setOption(PollenConfigurationOption.EMAIL_HOST.key, emailHost); } public void setEmailPort(int emailPort) { - applicationConfig.setOption( - PollenConfigurationOption.EMAIL_PORT.key, String.valueOf(emailPort)); + setOption(PollenConfigurationOption.EMAIL_PORT.key, String.valueOf(emailPort)); } public void setEmailFrom(String emailFrom) { - applicationConfig.setOption( - PollenConfigurationOption.EMAIL_FROM.key, emailFrom); + setOption(PollenConfigurationOption.EMAIL_FROM.key, emailFrom); } public void setEmailDirectory(File emailDirectory) { - applicationConfig.setOption( - PollenConfigurationOption.EMAIL_DIR.key, - emailDirectory.getAbsolutePath()); + setOption(PollenConfigurationOption.EMAIL_DIR.key, + emailDirectory.getAbsolutePath()); } public void setFeedDirectory(File feedDirectory) { - applicationConfig.setOption( - PollenConfigurationOption.FEED_DIR.key, - feedDirectory.getAbsolutePath()); + setOption(PollenConfigurationOption.FEED_DIR.key, + feedDirectory.getAbsolutePath()); } public void setImageDirectory(File imageDirectory) { - applicationConfig.setOption( - PollenConfigurationOption.IMG_DIR.key, - imageDirectory.getAbsolutePath()); + setOption(PollenConfigurationOption.IMG_DIR.key, + imageDirectory.getAbsolutePath()); } public void setNbVotesPerPage(int nbVotesPerPage) { - applicationConfig.setOption( - PollenConfigurationOption.NB_VOTES_PER_PAGE.key, - String.valueOf(nbVotesPerPage)); + setOption(PollenConfigurationOption.NB_VOTES_PER_PAGE.key, + String.valueOf(nbVotesPerPage)); } public void setCharset(String charset) { @@ -279,7 +259,6 @@ PollenConfigurationOption.CHARSET.key, charset); } - @Override public String toString() { return ReflectionToStringBuilder.toString(this); @@ -295,6 +274,35 @@ return result != null && result; } + protected void loadApplicationConfig(String file, Properties defaultOptions) { + applicationConfig = new ApplicationConfig(file); + try { + applicationConfig.loadDefaultOptions( + PollenConfigurationOption.values()); + + if (defaultOptions != null) { + Enumeration<?> enumeration = defaultOptions.propertyNames(); + while (enumeration.hasMoreElements()) { + String key = (String) enumeration.nextElement(); + String property = defaultOptions.getProperty(key); + applicationConfig.setDefaultOption(key, property); + } + } + applicationConfig.parse(); + } catch (ArgumentsParserException e) { + throw new PollenTechnicalException( + "Could not parse configuration", e); + } + } + + protected File getOptionAsFile(String key) { + return applicationConfig.getOptionAsFile(key); + } + + protected void setOption(String key, String value) { + applicationConfig.setOption(key, value); + } + /** * Creates a directory given the configuration given key. * Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-12 10:13:48 UTC (rev 3450) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-12 12:07:38 UTC (rev 3451) @@ -535,74 +535,6 @@ </profile> - <profile> - <id>selenium</id> - <activation> - <property> - <name>selenium</name> - <value>true</value> - </property> - </activation> - - <build> - <defaultGoal>integration-test</defaultGoal> - <plugins> - - <plugin> - <groupId>org.apache.tomcat.maven</groupId> - <artifactId>tomcat7-maven-plugin</artifactId> - <executions> - <execution> - <phase>pre-integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <fork>true</fork> - <path>/pollen</path> - <useTestClasspath>true</useTestClasspath> - <systemProperties> - <pollenConfigurationFile> - ${basedir}/target/test-classes/pollen-fake.properties - </pollenConfigurationFile> - <generateDataDirectory> - ${basedir}/target/pollen-dataDirectory - </generateDataDirectory> - <incomingDatabase>${basedir}/target/test-classes/pollendb.h2.db</incomingDatabase> - </systemProperties> - <uriEncoding>UTF-8</uriEncoding> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - <skip>true</skip> - </configuration> - <executions> - - <execution> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <skip>false</skip> - <includes> - <include>**/*SIT.java</include> - </includes> - </configuration> - </execution> - </executions> - </plugin> - - </plugins> - </build> - </profile> - </profiles> </project> Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-12 10:13:48 UTC (rev 3450) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-12 12:07:38 UTC (rev 3451) @@ -25,12 +25,10 @@ import com.google.common.collect.Maps; import com.opensymphony.xwork2.ActionContext; import org.apache.commons.io.FileUtils; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenApplicationContext; import org.chorem.pollen.PollenConfiguration; -import org.chorem.pollen.PollenConfigurationOption; import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.PollenTopiaRootContextFactory; import org.chorem.pollen.entities.PollenDAOHelper; @@ -54,7 +52,6 @@ import java.util.Date; import java.util.Locale; import java.util.Map; -import java.util.Properties; /** * To listen start or end of the application. @@ -70,7 +67,7 @@ public class PollenApplicationListener implements ServletContextListener { /** Logger. */ - protected static final Log log = + private static final Log log = LogFactory.getLog(PollenApplicationListener.class); @Override @@ -96,51 +93,8 @@ applicationContext); // initialize configuration - PollenConfiguration configuration; - String pollenConfigurationFile = System.getProperty("pollenConfigurationFile"); - if (StringUtils.isNotBlank(pollenConfigurationFile)) { - if (log.isInfoEnabled()) { - log.info("Used custom configuration file " - + pollenConfigurationFile); - } - String generateDataDirectory = System.getProperty("generateDataDirectory"); + PollenConfiguration configuration = prepareConfiguration(); - Properties defaultOptions = new Properties(); - if (StringUtils.isNotBlank(generateDataDirectory)) { - - File dataDirectory = new File( - generateDataDirectory + - File.separator + System.nanoTime()); - if (log.isInfoEnabled()) { - log.info("Use data directory " + dataDirectory); - } - defaultOptions.put(PollenConfigurationOption.DATA_DIR.getKey(), - dataDirectory.getAbsolutePath()); - - String incomingDb = System.getProperty("incomingDatabase"); - - if (StringUtils.isNotBlank(incomingDb)) { - - // copy db to correct path - File dbDirectory = new File(dataDirectory, "db"); - - try { - FileUtils.copyFileToDirectory(new File(incomingDb), dbDirectory); - } catch (IOException e) { - throw new IllegalStateException( - "Could not copy db to "+dbDirectory); - } - } - } - - - configuration = new PollenConfiguration(pollenConfigurationFile, - defaultOptions); - - } else { - - configuration = new PollenConfiguration(); - } applicationContext.setConfiguration(configuration); File temporaryDirectory = configuration.getTemporaryDirectory(); @@ -207,6 +161,21 @@ } } + /** + * Prepare the configuration to be used. + * <p/> + * <strong>Note:</strong> This method is here mainly to be able to + * override configuration for tests environnements. + * + * @return the instanciated configuration + * @see PollenTestApplicationListener + * @since 1.4 + */ + protected PollenConfiguration prepareConfiguration() { + PollenConfiguration configuration = new PollenConfiguration(); + return configuration; + } + private void initPollenNotifierworker(PollenApplicationContext applicationContext) { PollenServiceContext serviceContext = DefaultPollenServiceContext.newContext( Locale.getDefault(), Added: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTestApplicationListener.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTestApplicationListener.java (rev 0) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTestApplicationListener.java 2012-06-12 12:07:38 UTC (rev 3451) @@ -0,0 +1,94 @@ +/* + * #%L + * Pollen :: UI (struts2) + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.apache.commons.io.FileUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenConfiguration; +import org.chorem.pollen.PollenConfigurationOption; + +import java.io.File; +import java.io.IOException; +import java.util.Properties; + +/** + * Pollen application listener used for test purposes. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class PollenTestApplicationListener extends PollenApplicationListener { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(PollenTestApplicationListener.class); + + @Override + protected PollenConfiguration prepareConfiguration() { + PollenConfiguration configuration; + + configuration = new PollenConfiguration("pollen-test.properties", + null) { + + @Override + protected void loadApplicationConfig(String file, + Properties defaultOptions) { + super.loadApplicationConfig(file, defaultOptions); + + // let's add a suffix (to isolate this data dir) + File dataDirectory = new File(getDataDirectory(), + String.valueOf(System.nanoTime())); + if (log.isInfoEnabled()) { + log.info("Data directory = " + dataDirectory); + } + setOption(PollenConfigurationOption.DATA_DIR.getKey(), + dataDirectory.getAbsolutePath()); + + + File incomingDatabase = getOptionAsFile("incomingDatabase"); + + if (log.isInfoEnabled()) { + log.info("Incoming db = " + incomingDatabase); + } + // copy db to correct path + File dbDirectory = new File(dataDirectory, "db"); + + try { + if (log.isInfoEnabled()) { + log.info("Copy incoming db [" + incomingDatabase + + "] to [" + dbDirectory + "]"); + } + FileUtils.copyFileToDirectory( + incomingDatabase, dbDirectory); + } catch (IOException e) { + throw new IllegalStateException( + "Could not copy db to " + dbDirectory); + } + + } + }; + + return configuration; + } +} Property changes on: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenTestApplicationListener.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Property changes on: trunk/pollen-ui-struts2-test ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iml *.iws *.log .classpath .project Added: trunk/pollen-ui-struts2-test/LICENSE.txt =================================================================== --- trunk/pollen-ui-struts2-test/LICENSE.txt (rev 0) +++ trunk/pollen-ui-struts2-test/LICENSE.txt 2012-06-12 12:07:38 UTC (rev 3451) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/pollen-ui-struts2-test/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2-test/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-ui-struts2-test/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2-test/pom.xml =================================================================== --- trunk/pollen-ui-struts2-test/pom.xml (rev 0) +++ trunk/pollen-ui-struts2-test/pom.xml 2012-06-12 12:07:38 UTC (rev 3451) @@ -0,0 +1,266 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.4-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-ui-struts2-test</artifactId> + + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-ui-struts2</artifactId> + <version>${project.version}</version> + <type>war</type> + </dependency> + + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>commons-collections</groupId> + <artifactId>commons-collections</artifactId> + </dependency> + + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-java</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-api</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-support</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-chrome-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-firefox-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-htmlunit-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-ie-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-safari-driver</artifactId> + </dependency> + + </dependencies> + +  +  +  + + <name>Pollen :: UI (struts2) Test</name> + <description>Test des Interfaces Graphiques Struts2 pour Pollen</description> + +  +  +  + + <packaging>war</packaging> + + <build> + + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.properties</include> + <include>**/*.xml</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.properties</exclude> + <exclude>**/*.xml</exclude> + </excludes> + </testResource> + </testResources> + + <pluginManagement> + <plugins> + + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <overlays> + <overlay> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-ui-struts2</artifactId> + <type>war</type> + </overlay> + </overlays> + </configuration> + </plugin> + + </plugins> + </pluginManagement> + + <plugins> + + <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <executions> + <execution> + <id>start-web-server</id> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <fork>true</fork> + <path>/pollen</path> + <systemProperties> + <pollen.log.dir>target</pollen.log.dir> + </systemProperties> + <uriEncoding>UTF-8</uriEncoding> + </configuration> + </execution> + <execution> + <id>stop-web-server</id> + <phase>post-integration-test</phase> + <goals> + <goal>shutdown</goal> + </goals> + <configuration> + + <path>/pollen</path> + </configuration> + </execution> + + </executions> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> +  + <skip>true</skip> + </configuration> + <executions> + + <execution> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> +  + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + + </build> + + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <reportPlugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </plugin> + </reportPlugins> + </configuration> + </plugin> + </plugins> + </build> + + </profile> + + </profiles> + +</project> + Property changes on: trunk/pollen-ui-struts2-test/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2-test/src/license/THIRD-PARTY.properties =================================================================== --- trunk/pollen-ui-struts2-test/src/license/THIRD-PARTY.properties (rev 0) +++ trunk/pollen-ui-struts2-test/src/license/THIRD-PARTY.properties 2012-06-12 12:07:38 UTC (rev 3451) @@ -0,0 +1,38 @@ +# Generated by org.codehaus.mojo.license.AddThirdPartyMojo +#------------------------------------------------------------------------------- +# Already used licenses in project : +# - Apache Software License - Version 2.0 +# - BSD License +# - BSD-style license +# - Bouncy Castle License +# - CDDL +# - COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +# - Eclipse Public License - Version 1.0 +# - GNU Affero General Public License version 3 +# - GNU Lesser General Public Licence +# - GPLv2+CE +# - Indiana University Extreme! Lab Software License, vesion 1.1.1 +# - Lesser General Public License (LGPL) v 3.0 +# - Lesser General Public License (LPGL) +# - Lesser General Public License (LPGL) v 2.1 +# - MIT License +# - MPL 1.1 +# - Mozilla Public License +# - Similar to Apache License but with the acknowledgment clause removed +# - The Apache Software License, Version 1.1 +# - The Apache Software License, Version 2.0 +# - The H2 License, Version 1.0 +# - license.txt +#------------------------------------------------------------------------------- +# Please fill the missing licenses for dependencies : +# +# +#Fri Apr 13 19:37:43 CEST 2012 +antlr--antlr--2.7.6=BSD License +commons-primitives--commons-primitives--1.0=The Apache Software License, Version 2.0 +dom4j--dom4j--1.6.1=BSD License +javax.servlet--servlet-api--2.5=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +javax.transaction--jta--1.1=COMMON DEVELOPMENT AND DISTRIBUTION LICENSE (CDDL) Version 1.0 +jdom--jdom--1.0=The Apache Software License, Version 2.0 +oro--oro--2.0.8=The Apache Software License, Version 2.0 +rome--rome--1.0=The Apache Software License, Version 2.0 Property changes on: trunk/pollen-ui-struts2-test/src/license/THIRD-PARTY.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2-test/src/main/resources/log4j.properties =================================================================== --- trunk/pollen-ui-struts2-test/src/main/resources/log4j.properties (rev 0) +++ trunk/pollen-ui-struts2-test/src/main/resources/log4j.properties 2012-06-12 12:07:38 UTC (rev 3451) @@ -0,0 +1,39 @@ +### +# #%L +# Pollen :: UI (struts2) +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +log4j.rootCategory=ERROR, console, file + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d [%p] %c %m%n + +log4j.logger.org.chorem.pollen=INFO +log4j.logger.org.chorem.pollen.ui.PollenShiroIsAdministratorFilter=DEBUG +log4j.logger.org.nuiton=INFO + +# FileAppender : need to have pollen.log.dir in system properties at application startup +log4j.appender.file=org.apache.log4j.RollingFileAppender +log4j.appender.file.File=${basedir}/target/pollen.log +log4j.appender.file.MaxFileSize=10MB +log4j.appender.file.MaxBackupIndex=4 +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern=%d{yyyy/MM/dd hh:mm:ss} %5p (%F:%L) %m%n Property changes on: trunk/pollen-ui-struts2-test/src/main/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2-test/src/main/resources/pollen-test.properties =================================================================== --- trunk/pollen-ui-struts2-test/src/main/resources/pollen-test.properties (rev 0) +++ trunk/pollen-ui-struts2-test/src/main/resources/pollen-test.properties 2012-06-12 12:07:38 UTC (rev 3451) @@ -0,0 +1,46 @@ +### +# #%L +# Pollen :: UI (struts2) Test +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### + +# Db configuration +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password=sa +hibernate.connection.driver_class=org.h2.Driver +hibernate.show_sql=false +hibernate.hbm2ddl.auto=update + +# Database migration configuration +topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine +topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback +topia.service.migration.showSql=false + +# Version de l'application +pollen.version=${project.version} + +# url de l'application +siteUrl=http://localhost:8080/pollen + +# répertoire des données (chaque execution utilisera un sous répertoire) +pollen.dataDirectory=${basedir}/target/surefire-workdir/pollen-data + +incomingDatabase=${basedir}/target/test-classes/pollendb.h2.db \ No newline at end of file Property changes on: trunk/pollen-ui-struts2-test/src/main/resources/pollen-test.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2-test/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/pollen-ui-struts2-test/src/main/webapp/WEB-INF/web.xml (rev 0) +++ trunk/pollen-ui-struts2-test/src/main/webapp/WEB-INF/web.xml 2012-06-12 12:07:38 UTC (rev 3451) @@ -0,0 +1,103 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<web-app id="Pollen" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + + <display-name>Pollen</display-name> + + <filter> + <filter-name>topiaTransaction</filter-name> + <filter-class>org.chorem.pollen.ui.PollenTopiaTransactionFilter</filter-class> + </filter> + + <filter> + <filter-name>struts-prepare</filter-name> + <filter-class> + org.apache.struts2.dispatcher.ng.filter.StrutsPrepareFilter + </filter-class> + </filter> + <filter> + <filter-name>ShiroFilter</filter-name> + <filter-class>org.apache.shiro.web.servlet.ShiroFilter</filter-class> + </filter> + + <filter> + <filter-name>sitemesh</filter-name> + <filter-class>com.opensymphony.sitemesh.webapp.SiteMeshFilter</filter-class> + </filter> + + <filter> + <filter-name>struts-execute</filter-name> + <filter-class> + org.apache.struts2.dispatcher.ng.filter.StrutsExecuteFilter + </filter-class> + </filter> + + <filter-mapping> + <filter-name>topiaTransaction</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>ShiroFilter</filter-name> + <url-pattern>/*</url-pattern> + <dispatcher>REQUEST</dispatcher> + <dispatcher>FORWARD</dispatcher> + <dispatcher>INCLUDE</dispatcher> + <dispatcher>ERROR</dispatcher> + </filter-mapping> + + <filter-mapping> + <filter-name>struts-prepare</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>sitemesh</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <filter-mapping> + <filter-name>struts-execute</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <listener> + <description>Init</description> + <listener-class>org.chorem.pollen.ui.PollenTestApplicationListener</listener-class> + </listener> + + <listener> + <description>Shiro security layer</description> + <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class> + </listener> + + <welcome-file-list> + <welcome-file>/</welcome-file> + <welcome-file>index.jsp</welcome-file> + <welcome-file>home</welcome-file> + </welcome-file-list> +</web-app> Property changes on: trunk/pollen-ui-struts2-test/src/main/webapp/WEB-INF/web.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2-test/src/site/site_en.xml =================================================================== --- trunk/pollen-ui-struts2-test/src/site/site_en.xml (rev 0) +++ trunk/pollen-ui-struts2-test/src/site/site_en.xml 2012-06-12 12:07:38 UTC (rev 3451) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project name="${project.name}"> + +  + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item name="About" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/pollen-ui-struts2-test/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2-test/src/site/site_fr.xml =================================================================== --- trunk/pollen-ui-struts2-test/src/site/site_fr.xml (rev 0) +++ trunk/pollen-ui-struts2-test/src/site/site_fr.xml 2012-06-12 12:07:38 UTC (rev 3451) @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="UTF-8"?> + + +<project name="${project.name}"> + +  + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/pollen-ui-struts2-test/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-12 10:13:48 UTC (rev 3450) +++ trunk/pom.xml 2012-06-12 12:07:38 UTC (rev 3451) @@ -24,6 +24,7 @@ <module>pollen-persistence</module> <module>pollen-services</module> <module>pollen-ui-struts2</module> + <module>pollen-ui-struts2-test</module> </modules> <name>Pollen</name>

1 0

r3450 - in trunk: pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/test/resources
by tchemit＠users.chorem.org 12 Jun '12

12 Jun '12

Author: tchemit Date: 2012-06-12 12:13:48 +0200 (Tue, 12 Jun 2012) New Revision: 3450 Url: http://chorem.org/repositories/revision/pollen/3450 Log: always use new date from serviceContext Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-06-12 09:08:23 UTC (rev 3449) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollFeedService.java 2012-06-12 10:13:48 UTC (rev 3450) @@ -269,7 +269,7 @@ entry = new SyndEntryImpl(); entry.setTitle(title); entry.setLink(voteUrl.getUrl()); - entry.setPublishedDate(new Date()); + entry.setPublishedDate(serviceContext.getCurrentTime()); description = new SyndContentImpl(); description.setType("text/plain"); description.setValue(content); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-12 09:08:23 UTC (rev 3449) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-12 10:13:48 UTC (rev 3450) @@ -724,7 +724,7 @@ choice.setValidate(true); } } - Date now = new Date(); + Date now = serviceContext.getCurrentTime(); if (poll.getEndDate() == null || now.before(poll.getEndDate())) { poll.setEndDate(now); } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-06-12 09:08:23 UTC (rev 3449) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PreventRuleService.java 2012-06-12 10:13:48 UTC (rev 3450) @@ -78,7 +78,7 @@ // envoi d'un email si endDate-nowDate <= preventRuleSensibility if (poll.getEndDate() != null) { - Date now = new Date(); + Date now = serviceContext.getCurrentTime(); // timeValue = endDate-nowDate long timeValue = poll.getEndDate().getTime() - now.getTime(); Modified: trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db =================================================================== (Binary files differ)

1 0

r3449 - in trunk: . pollen-ui-struts2 pollen-ui-struts2/src/main/java/org/chorem/pollen/ui pollen-ui-struts2/src/main/webapp/WEB-INF/decorators pollen-ui-struts2/src/test pollen-ui-struts2/src/test/java/org/chorem/pollen/ui pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security pollen-ui-struts2/src/test/resources
by tchemit＠users.chorem.org 12 Jun '12

12 Jun '12

Author: tchemit Date: 2012-06-12 11:08:23 +0200 (Tue, 12 Jun 2012) New Revision: 3449 Url: http://chorem.org/repositories/revision/pollen/3449 Log: refs #606: Add some ITs to prevent regression Added: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java trunk/pollen-ui-struts2/src/test/resources/ trunk/pollen-ui-struts2/src/test/resources/log4j.properties trunk/pollen-ui-struts2/src/test/resources/pollen-fake.properties trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db Modified: trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp trunk/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-12 09:02:54 UTC (rev 3448) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-12 09:08:23 UTC (rev 3449) @@ -186,6 +186,39 @@ <artifactId>junit</artifactId> </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-java</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-api</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-support</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-chrome-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-firefox-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-htmlunit-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-ie-driver</artifactId> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-safari-driver</artifactId> + </dependency> + </dependencies>  @@ -217,7 +250,23 @@  <finalName>pollen-${project.version}</finalName> -  + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + <includes> + <include>**/*.properties</include> + </includes> + </testResource> + <testResource> + <directory>src/test/resources</directory> + <filtering>false</filtering> + <excludes> + <exclude>**/*.properties</exclude> + </excludes> + </testResource> + </testResources> + <plugins> <plugin> @@ -323,6 +372,7 @@ </execution> </executions> </plugin> +  <plugin> @@ -485,6 +535,74 @@ </profile> + <profile> + <id>selenium</id> + <activation> + <property> + <name>selenium</name> + <value>true</value> + </property> + </activation> + + <build> + <defaultGoal>integration-test</defaultGoal> + <plugins> + + <plugin> + <groupId>org.apache.tomcat.maven</groupId> + <artifactId>tomcat7-maven-plugin</artifactId> + <executions> + <execution> + <phase>pre-integration-test</phase> + <goals> + <goal>run</goal> + </goals> + <configuration> + <fork>true</fork> + <path>/pollen</path> + <useTestClasspath>true</useTestClasspath> + <systemProperties> + <pollenConfigurationFile> + ${basedir}/target/test-classes/pollen-fake.properties + </pollenConfigurationFile> + <generateDataDirectory> + ${basedir}/target/pollen-dataDirectory + </generateDataDirectory> + <incomingDatabase>${basedir}/target/test-classes/pollendb.h2.db</incomingDatabase> + </systemProperties> + <uriEncoding>UTF-8</uriEncoding> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> +  + <skip>true</skip> + </configuration> + <executions> + + <execution> + <phase>integration-test</phase> + <goals> + <goal>test</goal> + </goals> + <configuration> + <skip>false</skip> + <includes> + <include>**/*SIT.java</include> + </includes> + </configuration> + </execution> + </executions> + </plugin> + + </plugins> + </build> + </profile> + </profiles> </project> Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-12 09:02:54 UTC (rev 3448) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-12 09:08:23 UTC (rev 3449) @@ -25,10 +25,12 @@ import com.google.common.collect.Maps; import com.opensymphony.xwork2.ActionContext; import org.apache.commons.io.FileUtils; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenApplicationContext; import org.chorem.pollen.PollenConfiguration; +import org.chorem.pollen.PollenConfigurationOption; import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.PollenTopiaRootContextFactory; import org.chorem.pollen.entities.PollenDAOHelper; @@ -52,6 +54,7 @@ import java.util.Date; import java.util.Locale; import java.util.Map; +import java.util.Properties; /** * To listen start or end of the application. @@ -93,7 +96,51 @@ applicationContext); // initialize configuration - PollenConfiguration configuration = new PollenConfiguration(); + PollenConfiguration configuration; + String pollenConfigurationFile = System.getProperty("pollenConfigurationFile"); + if (StringUtils.isNotBlank(pollenConfigurationFile)) { + if (log.isInfoEnabled()) { + log.info("Used custom configuration file " + + pollenConfigurationFile); + } + String generateDataDirectory = System.getProperty("generateDataDirectory"); + + Properties defaultOptions = new Properties(); + if (StringUtils.isNotBlank(generateDataDirectory)) { + + File dataDirectory = new File( + generateDataDirectory + + File.separator + System.nanoTime()); + if (log.isInfoEnabled()) { + log.info("Use data directory " + dataDirectory); + } + defaultOptions.put(PollenConfigurationOption.DATA_DIR.getKey(), + dataDirectory.getAbsolutePath()); + + String incomingDb = System.getProperty("incomingDatabase"); + + if (StringUtils.isNotBlank(incomingDb)) { + + // copy db to correct path + File dbDirectory = new File(dataDirectory, "db"); + + try { + FileUtils.copyFileToDirectory(new File(incomingDb), dbDirectory); + } catch (IOException e) { + throw new IllegalStateException( + "Could not copy db to "+dbDirectory); + } + } + } + + + configuration = new PollenConfiguration(pollenConfigurationFile, + defaultOptions); + + } else { + + configuration = new PollenConfiguration(); + } applicationContext.setConfiguration(configuration); File temporaryDirectory = configuration.getTemporaryDirectory(); Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-06-12 09:02:54 UTC (rev 3448) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/decorators/layout-default.jsp 2012-06-12 09:08:23 UTC (rev 3449) @@ -124,7 +124,7 @@ </span> </s:if> <s:else> - <span onClick="$('#login_menu').toggle()"> + <span id='tologin' onClick="$('#login_menu').toggle()"> <s:text name="pollen.menu.login"/> </span> Added: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java (rev 0) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java 2012-06-12 09:08:23 UTC (rev 3449) @@ -0,0 +1,63 @@ +/* + * #%L + * T3 :: Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Rule; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.openqa.selenium.WebDriver; + +import java.util.Collection; + +/** + * Test base class for ui tests. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +@RunWith(value = Parameterized.class) +public abstract class PollenBaseWebDriverIT { + + /** Logger. */ + protected final Log log = LogFactory.getLog(getClass()); + + @Parameterized.Parameters + public static Collection<Object[]> driverTypes() { + return WebDriverResource.driverTypes(); + } + + @Rule + public WebDriverResource seleniumServer; + + protected PollenBaseWebDriverIT(Class<? extends WebDriver> driverType) { + seleniumServer = new WebDriverResource(getClass(), driverType); + } + + public WebDriver getDriver() { + return seleniumServer.getDriver(); + } + +} Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java (rev 0) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java 2012-06-12 09:08:23 UTC (rev 3449) @@ -0,0 +1,154 @@ +/* + * #%L + * T3 :: Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.rules.ExternalResource; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.chrome.ChromeDriver; +import org.openqa.selenium.chrome.ChromeDriverService; +import org.openqa.selenium.firefox.FirefoxDriver; +import org.openqa.selenium.htmlunit.HtmlUnitDriver; +import org.openqa.selenium.remote.DesiredCapabilities; +import org.openqa.selenium.remote.RemoteWebDriver; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; + +/** + * Web driver resource. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class WebDriverResource extends ExternalResource { + + /** Logger. */ + private static final Log log = LogFactory.getLog(WebDriverResource.class); + + private static ChromeDriverService service; + + protected static final Class<? extends WebDriver>[] allDrivers = new Class[]{ +// ChromeDriver.class, +// InternetExplorerDriver.class, +// SafariDriver.class, + FirefoxDriver.class, + HtmlUnitDriver.class + }; + + protected static Collection<Object[]> safeDrivers; + + public static Collection<Object[]> driverTypes() { + if (safeDrivers == null) { + + //System.setProperty("webdriver.chrome.driver", "/usr/bin/google-chrome"); + List<Class<?>> checkedDrivers = new ArrayList<Class<?>>(); + for (Class<? extends WebDriver> driver : allDrivers) { + boolean ok = checkDriver(driver); + if (ok) { + checkedDrivers.add(driver); + } + } + //{{ChromeDriver.class}, {FirefoxDriver.class}, {HtmlUnitDriver.class}} + Object[][] data = new Object[checkedDrivers.size()][1]; + int i = 0; + for (Class<?> checkedDriver : checkedDrivers) { + data[i++][0] = checkedDriver; + } + safeDrivers = Arrays.asList(data); + } + + return safeDrivers; + } + + private static boolean checkDriver(Class<? extends WebDriver> driverType) { + + WebDriver driver = null; + boolean result = false; + try { + driver = driverType.getConstructor().newInstance(); + result = true; + } catch (Exception e) { + + // can not use this driver + if (log.isInfoEnabled()) { + log.info("Can not use driver " + driverType.getName(), e); + } + } finally { + if (driver != null) { + driver.quit(); + } + } + + return result; + } + + private final Class<?> testClass; + + private final Class<? extends WebDriver> driverType; + + protected WebDriver driver; + + public WebDriverResource(Class<?> testClass, + Class<? extends WebDriver> driverType) { + this.testClass = testClass; + this.driverType = driverType; + } + + public WebDriver getDriver() { + return driver; + } + + @Override + protected void before() throws Throwable { + if (log.isInfoEnabled()) { + log.info("Start test [" + testClass.getName() + "] with driver of type " + driverType.getName()); + } + if (ChromeDriver.class == driverType) { + + service = new ChromeDriverService.Builder() + .usingChromeDriverExecutable(new File("/usr/bin/chromium-browser")) + .usingAnyFreePort() + .build(); + service.start(); + + driver = new RemoteWebDriver(service.getUrl(), DesiredCapabilities.chrome()); + + } else { + driver = driverType.getConstructor().newInstance(); + } + } + + @Override + protected void after() { + if (ChromeDriver.class == driverType) { + service.stop(); + } + driver.quit(); + } +} Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java (rev 0) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java 2012-06-12 09:08:23 UTC (rev 3449) @@ -0,0 +1,153 @@ +/* + * #%L + * T3 :: Web + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 - 2011 IRD, Codelutin, Tony Chemit + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.ui.security; + +import junit.framework.Assert; +import org.chorem.pollen.ui.PollenBaseWebDriverIT; +import org.junit.Test; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; + +import java.util.List; + +/** + * Test the login action. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class LoginSIT extends PollenBaseWebDriverIT { + + public LoginSIT(Class<? extends WebDriver> driverType) { + super(driverType); + } + + @Test + public void loginAdmin() throws Exception { + + WebDriver driver = getDriver(); + + driver.get("http://localhost:8080/pollen/home"); + + if (log.isInfoEnabled()) { + log.info("Login url : " + driver.getCurrentUrl()); + } + + // click on tologin element (display the login form) + WebElement loginClick = driver.findElement(By.id("tologin")); + loginClick.click(); + + // Find the text input element by its name + WebElement login = driver.findElement(By.name("login")); + Assert.assertEquals("input", login.getTagName()); + Assert.assertTrue(login.isDisplayed()); + login.sendKeys("admin"); + + WebElement password = driver.findElement(By.name("password")); + Assert.assertTrue(password.isDisplayed()); + Assert.assertEquals("input", password.getTagName()); + password.sendKeys("admin"); + + WebElement submit = driver.findElement(By.name("action:login")); + Assert.assertNotNull(submit); + submit.click(); + + // check info_success is on + driver.findElement(By.className("info_success")); + + // check there is a admin menu (so 4 menus) + List<WebElement> menus = driver.findElements(By.className("menu_elt")); + Assert.assertEquals(4, menus.size()); + } + + @Test + public void loginUser() throws Exception { + + WebDriver driver = getDriver(); + + driver.get("http://localhost:8080/pollen/home"); + + if (log.isInfoEnabled()) { + log.info("Login url : " + driver.getCurrentUrl()); + } + + // click on tologin element (display the login form) + WebElement loginClick = driver.findElement(By.id("tologin")); + Assert.assertNotNull(loginClick); + loginClick.click(); + + // Find the text input element by its name + WebElement login = driver.findElement(By.name("login")); + Assert.assertEquals("input", login.getTagName()); + Assert.assertTrue(login.isDisplayed()); + login.sendKeys("user"); + + WebElement password = driver.findElement(By.name("password")); + Assert.assertTrue(password.isDisplayed()); + Assert.assertEquals("input", password.getTagName()); + password.sendKeys("user"); + + WebElement submit = driver.findElement(By.name("action:login")); + submit.click(); + + // check info_success is on + driver.findElement(By.className("info_success")); + + // check there is not a admin menu (so 2 menus) + List<WebElement> menus = driver.findElements(By.className("menu_elt")); + Assert.assertEquals(3, menus.size()); + } + + @Test + public void badLogin() throws Exception { + + WebDriver driver = getDriver(); + + driver.get("http://localhost:8080/pollen/home"); + + if (log.isInfoEnabled()) { + log.info("Login url : " + driver.getCurrentUrl()); + } + + // click on tologin element (display the login form) + WebElement loginClick = driver.findElement(By.id("tologin")); + Assert.assertNotNull(loginClick); + loginClick.click(); + + // Find the text input element by its name + WebElement login = driver.findElement(By.name("login")); + Assert.assertTrue(login.isDisplayed()); + login.sendKeys("admin"); + + WebElement password = driver.findElement(By.name("password")); + Assert.assertTrue(password.isDisplayed()); + password.sendKeys("admin" + System.currentTimeMillis()); + + WebElement submit = driver.findElement(By.name("action:login")); + submit.click(); + + driver.findElement(By.className("info_error")); + } +} Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-ui-struts2/src/test/resources/log4j.properties (from rev 3441, trunk/pollen-ui-struts2/src/main/resources/log4j.properties) =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/log4j.properties 2012-06-12 09:08:23 UTC (rev 3449) @@ -0,0 +1,32 @@ +### +# #%L +# Pollen :: UI (struts2) +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +log4j.rootCategory=ERROR, console + +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern=%d [%p] %c %m%n + +log4j.logger.org.chorem=INFO +log4j.logger.org.chorem.pollen.ui.PollenShiroIsAdministratorFilter=DEBUG +log4j.logger.org.nuiton=INFO + Added: trunk/pollen-ui-struts2/src/test/resources/pollen-fake.properties =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/pollen-fake.properties (rev 0) +++ trunk/pollen-ui-struts2/src/test/resources/pollen-fake.properties 2012-06-12 09:08:23 UTC (rev 3449) @@ -0,0 +1,39 @@ +### +# #%L +# Pollen :: UI (struts2) +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### + +# Db configuration +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.username=sa +hibernate.connection.password=sa +hibernate.connection.driver_class=org.h2.Driver +hibernate.show_sql=false +hibernate.hbm2ddl.auto=update + +# Database migration configuration +topia.service.migration=org.nuiton.topia.migration.TopiaMigrationEngine +topia.service.migration.callback=org.chorem.pollen.entities.migration.PollenMigrationCallback +topia.service.migration.showSql=false + +# Version de l'application +pollen.version=${project.version} +siteUrl=http://localhost:8080/pollen \ No newline at end of file Property changes on: trunk/pollen-ui-struts2/src/test/resources/pollen-fake.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db =================================================================== (Binary files differ) Property changes on: trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-12 09:02:54 UTC (rev 3448) +++ trunk/pom.xml 2012-06-12 09:08:23 UTC (rev 3449) @@ -192,6 +192,7 @@ <slf4jVersion>1.6.5</slf4jVersion> <jettyVersion>${jettyPluginVersion}</jettyVersion> <hibernateVersion>3.6.10.Final</hibernateVersion> + <seleniumVersion>2.21.0</seleniumVersion> <pollenI18nBundle>pollen-i18n</pollenI18nBundle>  @@ -418,6 +419,56 @@ <version>1.1.3</version> </dependency> +  + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-api</artifactId> + <version>${seleniumVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-support</artifactId> + <version>${seleniumVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-chrome-driver</artifactId> + <version>${seleniumVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-ie-driver</artifactId> + <version>${seleniumVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-safari-driver</artifactId> + <version>${seleniumVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-firefox-driver</artifactId> + <version>${seleniumVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-htmlunit-driver</artifactId> + <version>${seleniumVersion}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>org.seleniumhq.selenium</groupId> + <artifactId>selenium-java</artifactId> + <version>${seleniumVersion}</version> + <scope>test</scope> + </dependency> + </dependencies> </dependencyManagement>

1 0

r3448 - trunk/pollen-persistence/src/main/java/org/chorem/pollen
by tchemit＠users.chorem.org 12 Jun '12

12 Jun '12

Author: tchemit Date: 2012-06-12 11:02:54 +0200 (Tue, 12 Jun 2012) New Revision: 3448 Url: http://chorem.org/repositories/revision/pollen/3448 Log: fix default value loading in configuration Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-11 16:04:49 UTC (rev 3447) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-12 09:02:54 UTC (rev 3448) @@ -38,6 +38,7 @@ import java.io.File; import java.io.IOException; import java.net.URL; +import java.util.Enumeration; import java.util.Properties; /** @@ -64,11 +65,19 @@ if (log.isInfoEnabled()) { log.info(this + " is initializing..."); } - applicationConfig = new ApplicationConfig(defaultOptions, file); - + applicationConfig = new ApplicationConfig(file); try { applicationConfig.loadDefaultOptions( PollenConfigurationOption.values()); + + if (defaultOptions != null) { + Enumeration<?> enumeration = defaultOptions.propertyNames(); + while (enumeration.hasMoreElements()) { + String key = (String) enumeration.nextElement(); + String property = defaultOptions.getProperty(key); + applicationConfig.setDefaultOption(key, property); + } + } applicationConfig.parse(); } catch (ArgumentsParserException e) { throw new PollenTechnicalException(

1 0

r3447 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org 11 Jun '12

11 Jun '12

Author: tchemit Date: 2012-06-11 18:04:49 +0200 (Mon, 11 Jun 2012) New Revision: 3447 Url: http://chorem.org/repositories/revision/pollen/3447 Log: fix url format on resume page Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java 2012-06-11 15:55:33 UTC (rev 3446) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollUrlService.java 2012-06-11 16:04:49 UTC (rev 3447) @@ -94,9 +94,12 @@ Preconditions.checkNotNull(poll); Preconditions.checkNotNull(action); - String prefix = '/' + action.getActionPrefix() + '/'; + String prefix = action.getActionPrefix() + '/'; - URL applicationUrl = serviceContext.getApplicationURL(); + String applicationUrl = serviceContext.getApplicationURL().toString(); + if (!applicationUrl.endsWith("/")) { + applicationUrl += '/'; + } String baseUrl = applicationUrl + prefix; PollUri pollUri; if (pollAccount == null) {

1 0