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

r3466 - trunk/pollen-ui-struts2/src/main/resources/i18n
by ymartel＠users.chorem.org June 13, 2012

June 13, 2012

Author: ymartel Date: 2012-06-13 16:38:19 +0200 (Wed, 13 Jun 2012) New Revision: 3466 Url: http://chorem.org/repositories/revision/pollen/3466 Log: fix some i18n values Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-13 12:54:52 UTC (rev 3465) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-13 14:38:19 UTC (rev 3466) @@ -23,7 +23,7 @@ pollen.action.deletePoll=Delete the poll pollen.action.deletePollAccount=Delete selected member pollen.action.deleteUser=Delete selected user -pollen.action.deleteVote=Supprimer ce vote +pollen.action.deleteVote=Delete this vote pollen.action.editFavoriteList=Edit a list pollen.action.editPoll=Edit the poll pollen.action.editPollAccount=Edit selected member @@ -34,11 +34,11 @@ pollen.action.login=Log me In pollen.action.modify=Modify pollen.action.pollChoiceDelete=Delete this choice -pollen.action.pollChoiceDown=Descendre ce choix -pollen.action.pollChoiceUp=Monter ce choix +pollen.action.pollChoiceDown=Down this choice +pollen.action.pollChoiceUp=Up this choice pollen.action.pollClone=Copy the poll to create a new one pollen.action.pollClose=Close the poll -pollen.action.pollCommentDelete=Supprimer le commentaire +pollen.action.pollCommentDelete=Delete the comment pollen.action.pollDelete=Delete the poll pollen.action.pollEdit=Edit poll pollen.action.pollExport=Export poll @@ -47,8 +47,8 @@ pollen.action.pollResult=Display poll results pollen.action.pollSummary=Poll summary pollen.action.pollVote=Vote -pollen.action.pollVotingListDelete=Supprimer le groupe de votants -pollen.action.pollVotingListEdit=Editer ce groupe de votants +pollen.action.pollVotingListDelete=Delete the voting list +pollen.action.pollVotingListEdit=Edit that voting list pollen.action.register=Register pollen.action.send=Send pollen.action.validate=Submit

1 0

r3465 - in trunk/pollen-ui-struts2/src: main/resources/i18n test/java/org/chorem/pollen/ui test/java/org/chorem/pollen/ui/its
by ymartel＠users.chorem.org June 13, 2012

June 13, 2012

Author: ymartel Date: 2012-06-13 14:54:52 +0200 (Wed, 13 Jun 2012) New Revision: 3465 Url: http://chorem.org/repositories/revision/pollen/3465 Log: refs #606 : make only one simple package for ITs Added: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java 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/ Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/LoginSIT.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/SecurityAccessSIT.java Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-13 12:32:09 UTC (rev 3464) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-13 12:54:52 UTC (rev 3465) @@ -209,9 +209,9 @@ pollen.error.vote.maxChoiceNb=Le nombre de choix maximal est de %d. pollen.error.vote.percentage=La somme des valeurs doit être égale à 100. pollen.fieldset.choice.options=Les choix -pollen.fieldset.creator.options=Vous pollen.fieldset.choice.options.help=Configurer les choix du sondage pollen.fieldset.connexionInformation=Information de connexion +pollen.fieldset.creator.options=Vous pollen.fieldset.creator.options.help=Renseigner les informations sur le créateur du sondage pollen.fieldset.login=Connexion pollen.fieldset.notification.options=Notifications 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-13 12:32:09 UTC (rev 3464) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java 2012-06-13 12:54:52 UTC (rev 3465) @@ -1,140 +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.AfterClass; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Rule; -import org.junit.runner.RunWith; -import org.junit.runners.Parameterized; -import org.openqa.selenium.By; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; - -import java.util.Collection; -import java.util.List; - -/** - * 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 PollenFixtures fixtures ; - - protected WebDriver driver; - - @Before - public void setUp() throws Exception { - driver = seleniumServer.getDriver(); - fixtures = seleniumServer.getFixtures(); - } - - @AfterClass - public static void afterClass() { - WebDriverResource.afterClass(); - - } - - protected PollenBaseWebDriverIT(Class<? extends WebDriver> driverType) { - seleniumServer = new WebDriverResource(driverType); - } - - protected void gotoUrl(String url, boolean strict) { - gotoUrl(url, null, strict); - } - - protected void gotoUrl(String url) { - gotoUrl(url, null, true); - } - - protected void gotoUrl(String url, String fallBackUrl) { - gotoUrl(url, fallBackUrl, true); - } - - protected void gotoUrl(String url, String fallBackUrl, boolean strict) { - driver.get(url); - String expectedUrl; - if (fallBackUrl == null) { - expectedUrl = url; - } else { - expectedUrl = fallBackUrl; - } - - if (strict) { - Assert.assertEquals(expectedUrl, driver.getCurrentUrl()); - } else { - Assert.assertTrue(driver.getCurrentUrl().startsWith(expectedUrl)); - } - } - - protected WebElement findElement(By by) { - WebElement element = driver.findElement(by); - return element; - } - - protected List<WebElement> findElements(By by) { - List<WebElement> result = driver.findElements(by); - return result; - } - - /** Try to log in using the given {@code username} and {@code password}. */ - protected void connect(String username, String password) { - - // 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 loginElement = driver.findElement(By.name("login")); - Assert.assertEquals("input", loginElement.getTagName()); - Assert.assertTrue(loginElement.isDisplayed()); - loginElement.sendKeys(username); - - WebElement passwordElement = driver.findElement(By.name("password")); - Assert.assertTrue(passwordElement.isDisplayed()); - Assert.assertEquals("input", passwordElement.getTagName()); - passwordElement.sendKeys(password); - - WebElement submit = driver.findElement(By.name("action:login")); - submit.click(); - } -} 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-13 12:32:09 UTC (rev 3464) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java 2012-06-13 12:54:52 UTC (rev 3465) @@ -1,184 +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 com.google.common.collect.Lists; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.rules.TestWatcher; -import org.junit.runner.Description; -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 TestWatcher { - - /** Logger. */ - private static final Log log = LogFactory.getLog(WebDriverResource.class); - - private static ChromeDriverService service; - - protected static Collection<Object[]> safeDrivers; - - public static Collection<Object[]> driverTypes() { - if (safeDrivers == null) { - - List<Class<? extends WebDriver>> allDrivers = Lists.newArrayList(); - allDrivers.add(HtmlUnitDriver.class); - allDrivers.add(FirefoxDriver.class); -// allDrivers.add(ChromeDriver.class); -// allDrivers.add(InternetExplorerDriver.class); -// allDrivers.add(SafariDriver.class); - - List<Class<?>> checkedDrivers = new ArrayList<Class<?>>(); - for (Class<? extends WebDriver> driver : allDrivers) { - boolean ok = checkDriver(driver); - if (ok) { - checkedDrivers.add(driver); - } - } - 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) { - - boolean result = false; - try { - createDriver(driverType, true); - result = true; - } catch (Exception e) { - - // can not use this driver - if (log.isInfoEnabled()) { - log.info("Can not use driver " + driverType.getName(), e); - } - } - - return result; - } - - private final Class<? extends WebDriver> driverType; - - private final PollenFixtures fixtures; - - protected WebDriver driver; - - public WebDriverResource(Class<? extends WebDriver> driverType) { - this.driverType = driverType; - fixtures = new PollenFixtures(); - } - - public WebDriver getDriver() { - return driver; - } - - public PollenFixtures getFixtures() { - return fixtures; - } - - @Override - protected void starting(Description description) { - String testName = description.getClassName() + "#" + description.getMethodName() + " on [" + driverType.getName() + "]"; - - if (log.isInfoEnabled()) { - log.info("Start test " + testName); - } - - try { - driver = createDriver(driverType, false); - - } catch (Exception e) { - throw new IllegalStateException("Could not begin test " + testName); - } - } - - @Override - protected void finished(Description description) { - - // close current driver - driver.quit(); - } - - public static void afterClass() { - - if (service != null) { - service.stop(); - } - } - - protected static WebDriver createDriver(Class<? extends WebDriver> driverType, boolean clear) throws Exception { - WebDriver result; - - if (ChromeDriver.class == driverType) { - - service = new ChromeDriverService.Builder() - .usingChromeDriverExecutable(new File("/usr/bin/chromium-browser")) - .usingAnyFreePort() - .build(); - service.start(); - - result = new RemoteWebDriver(service.getUrl(), DesiredCapabilities.chrome()); - - } else { - result = driverType.getConstructor().newInstance(); - } - - if (clear) { - - if (result != null) { - result.close(); - } - - if (service != null) { - service.stop(); - } - - } - return result; - } -} Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/LoginSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java 2012-06-13 12:32:09 UTC (rev 3464) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/LoginSIT.java 2012-06-13 12:54:52 UTC (rev 3465) @@ -21,9 +21,8 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package org.chorem.pollen.ui.security; +package org.chorem.pollen.ui.its; -import org.chorem.pollen.ui.PollenBaseWebDriverIT; import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.By; Copied: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java (from rev 3464, trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java) =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java (rev 0) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java 2012-06-13 12:54:52 UTC (rev 3465) @@ -0,0 +1,295 @@ +/* + * #%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.its; + +import com.google.common.collect.Lists; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.ui.PollenFixtures; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Rule; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; +import org.junit.runner.RunWith; +import org.junit.runners.Parameterized; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +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; + +/** + * Test base class for ui tests. + * + * @author tchemit <chemit(a)codelutin.com> + * @author ymartel <martel(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 PollenFixtures fixtures ; + + protected WebDriver driver; + + @Before + public void setUp() throws Exception { + driver = seleniumServer.getDriver(); + fixtures = seleniumServer.getFixtures(); + } + + @AfterClass + public static void afterClass() { + WebDriverResource.afterClass(); + + } + + protected PollenBaseWebDriverIT(Class<? extends WebDriver> driverType) { + seleniumServer = new WebDriverResource(driverType); + } + + protected void gotoUrl(String url, boolean strict) { + gotoUrl(url, null, strict); + } + + protected void gotoUrl(String url) { + gotoUrl(url, null, true); + } + + protected void gotoUrl(String url, String fallBackUrl) { + gotoUrl(url, fallBackUrl, true); + } + + protected void gotoUrl(String url, String fallBackUrl, boolean strict) { + driver.get(url); + String expectedUrl; + if (fallBackUrl == null) { + expectedUrl = url; + } else { + expectedUrl = fallBackUrl; + } + + if (strict) { + Assert.assertEquals(expectedUrl, driver.getCurrentUrl()); + } else { + Assert.assertTrue(driver.getCurrentUrl().startsWith(expectedUrl)); + } + } + + protected WebElement findElement(By by) { + WebElement element = driver.findElement(by); + return element; + } + + protected List<WebElement> findElements(By by) { + List<WebElement> result = driver.findElements(by); + return result; + } + + /** Try to log in using the given {@code username} and {@code password}. */ + protected void connect(String username, String password) { + + // 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 loginElement = driver.findElement(By.name("login")); + Assert.assertEquals("input", loginElement.getTagName()); + Assert.assertTrue(loginElement.isDisplayed()); + loginElement.sendKeys(username); + + WebElement passwordElement = driver.findElement(By.name("password")); + Assert.assertTrue(passwordElement.isDisplayed()); + Assert.assertEquals("input", passwordElement.getTagName()); + passwordElement.sendKeys(password); + + WebElement submit = driver.findElement(By.name("action:login")); + submit.click(); + } + + /** + * Web driver resource. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ + public static class WebDriverResource extends TestWatcher { + + /** Logger. */ + private static final Log log = LogFactory.getLog(WebDriverResource.class); + + private static ChromeDriverService service; + + protected static Collection<Object[]> safeDrivers; + + public static Collection<Object[]> driverTypes() { + if (safeDrivers == null) { + + List<Class<? extends WebDriver>> allDrivers = Lists.newArrayList(); + allDrivers.add(HtmlUnitDriver.class); + allDrivers.add(FirefoxDriver.class); + // allDrivers.add(ChromeDriver.class); + // allDrivers.add(InternetExplorerDriver.class); + // allDrivers.add(SafariDriver.class); + + List<Class<?>> checkedDrivers = new ArrayList<Class<?>>(); + for (Class<? extends WebDriver> driver : allDrivers) { + boolean ok = checkDriver(driver); + if (ok) { + checkedDrivers.add(driver); + } + } + 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) { + + boolean result = false; + try { + createDriver(driverType, true); + result = true; + } catch (Exception e) { + + // can not use this driver + if (log.isInfoEnabled()) { + log.info("Can not use driver " + driverType.getName(), e); + } + } + + return result; + } + + private final Class<? extends WebDriver> driverType; + + private final PollenFixtures fixtures; + + protected WebDriver driver; + + public WebDriverResource(Class<? extends WebDriver> driverType) { + this.driverType = driverType; + fixtures = new PollenFixtures(); + } + + public WebDriver getDriver() { + return driver; + } + + public PollenFixtures getFixtures() { + return fixtures; + } + + @Override + protected void starting(Description description) { + String testName = description.getClassName() + "#" + description.getMethodName() + " on [" + driverType.getName() + "]"; + + if (log.isInfoEnabled()) { + log.info("Start test " + testName); + } + + try { + driver = createDriver(driverType, false); + + } catch (Exception e) { + throw new IllegalStateException("Could not begin test " + testName); + } + } + + @Override + protected void finished(Description description) { + + // close current driver + driver.quit(); + } + + public static void afterClass() { + + if (service != null) { + service.stop(); + } + } + + protected static WebDriver createDriver(Class<? extends WebDriver> driverType, boolean clear) throws Exception { + WebDriver result; + + if (ChromeDriver.class == driverType) { + + service = new ChromeDriverService.Builder() + .usingChromeDriverExecutable(new File("/usr/bin/chromium-browser")) + .usingAnyFreePort() + .build(); + service.start(); + + result = new RemoteWebDriver(service.getUrl(), DesiredCapabilities.chrome()); + + } else { + result = driverType.getConstructor().newInstance(); + } + + if (clear) { + + if (result != null) { + result.close(); + } + + if (service != null) { + service.stop(); + } + + } + return result; + } + } +} Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/PollenBaseWebDriverIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/SecurityAccessSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-13 12:32:09 UTC (rev 3464) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/SecurityAccessSIT.java 2012-06-13 12:54:52 UTC (rev 3465) @@ -20,10 +20,9 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * #L% */ -package org.chorem.pollen.ui.security; +package org.chorem.pollen.ui.its; import org.chorem.pollen.bean.PollUri; -import org.chorem.pollen.ui.PollenBaseWebDriverIT; import org.junit.Test; import org.openqa.selenium.WebDriver;

1 0

r3464 - in trunk/pollen-ui-struts2/src/main: java/org/chorem/pollen/ui/actions/poll resources/i18n webapp/WEB-INF/jsp/poll webapp/js
by tchemit＠users.chorem.org June 13, 2012

June 13, 2012

Author: tchemit Date: 2012-06-13 14:32:09 +0200 (Wed, 13 Jun 2012) New Revision: 3464 Url: http://chorem.org/repositories/revision/pollen/3464 Log: fixes #610: Improve the interaction between continuous and public result options in poll form fixes #611: Improve the interaction between anonymous and anonymousVoteAllowed options result in poll form - improve poll form options layout Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-13 10:23:07 UTC (rev 3463) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-13 12:32:09 UTC (rev 3464) @@ -258,7 +258,7 @@ public String execute() throws Exception { // Save choices and votingLists only if vote is not started - if (!isVoteStarted()) { + if (!isVoteStarted()) { //TODO-tchemit comment me 2012-06-04 A merge would be nicer but more complex to code // Clear previous collections to save those from the form poll.clearChoice(); @@ -284,8 +284,20 @@ } else { // reset value poll.setMaxChoiceNb(0); + } + if (!poll.isPublicResults()) { + + // force to not have continous results + poll.setContinuousResults(false); } + + if (poll.isAnonymous()) { + + // force to not have choice to vote anonymously + poll.setAnonymousVoteAllowed(false); + } + //TODO-tchemit comment me 2012-06-04 A merge would be nicer but more complex to code poll.clearPreventRule(); Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-13 10:23:07 UTC (rev 3463) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-13 12:32:09 UTC (rev 3464) @@ -80,7 +80,7 @@ pollen.common.displayType-normal=Results pollen.common.editAction=Edit pollen.common.email=Em@il -pollen.common.endChoiceDate=end choice date +pollen.common.endChoiceDate=End choice date pollen.common.endDate=End date pollen.common.favoriteList.csvImport.help=The file to upload is a text file that contains one row per participant.<br/><br/>The first line must be <strong>votingId,email</strong>, then each next ones will define the participant's name and his email separated by a comma.<br/><br/>Here is an example \:<br/> pollen.common.firstName=First name @@ -139,6 +139,7 @@ pollen.common.vote.return=Back to poll pollen.common.vote.return-help=Back to poll pollen.common.voteAction=Vote +pollen.common.voteAnonymous=Anonymous vote pollen.common.voteCountingType=Response type pollen.common.voteCountingType.help=Normal\: selecting 1 to n choices among available choices <br/><br/> Percentage\: allocating a percentage to each choice <br/><br/> Condorcet\: ranking choices in order of preference <br/><br/> Number \: Free response. Summed and the average numbers. pollen.common.voteCountingTypeHelp.condorcet=Condorcet vote\: rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. @@ -207,15 +208,24 @@ pollen.error.userNotAllowed=You are not allowed to count the votes for this poll. pollen.error.vote.maxChoiceNb=The maximal number of choices is %d. pollen.error.vote.percentage=The sum of the values must be equals to 100. +pollen.fieldset.choice.options=Choices +pollen.fieldset.choice.options.help=Configure choices of the poll pollen.fieldset.connexionInformation=Connexion informations +pollen.fieldset.creator.options=You +pollen.fieldset.creator.options.help=To fill some informations about the creator of this poll pollen.fieldset.login=Login +pollen.fieldset.notification.options=Notifications +pollen.fieldset.notification.options.help=Configure notifications of this poll pollen.fieldset.poll.choices=Choices pollen.fieldset.poll.general=Your poll pollen.fieldset.poll.options=Options -pollen.fieldset.poll.you=You pollen.fieldset.pollAccount.toAddToFavoriteList=Add a new member pollen.fieldset.pollAccount.toDeleteFromFavoriteList=Remove a member pollen.fieldset.pollAccount.toEditToFavoriteList=Edit member +pollen.fieldset.pollDate.options=Date validity of the poll +pollen.fieldset.pollDate.options.help=Configure when vote is authorized +pollen.fieldset.result.options=Results +pollen.fieldset.result.options.help=Configure results of the poll pollen.fieldset.userFavoriteList.toCreate=Create a new list pollen.fieldset.userFavoriteList.toDelete=List de favoris à supprimer pollen.fieldset.userInformation=User information @@ -315,4 +325,3 @@ pollen.title.usersList=Users administration pollen.warning.poll.is.closed.so.read.only=Poll is closed, you can not modifiy it anymore. title=Create a poll -vote.anonymous=Anonymous vote Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-13 10:23:07 UTC (rev 3463) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-13 12:32:09 UTC (rev 3464) @@ -139,6 +139,7 @@ pollen.common.vote.return=Retour au sondage pollen.common.vote.return-help=Retour au sondage pollen.common.voteAction=Vote +pollen.common.voteAnonymous=Vote anonyme pollen.common.voteCountingType=Type de Réponse pollen.common.voteCountingType.help=Normal \: sélection de 1 ou n choix parmis les choix possibles <br/><br/> Pourcentage \: attribution d'un pourcentage à chaque choix <br/><br/> Condorcet \: classement des choix par ordre de préférence <br/><br/> Nombre \: Réponse libre. Fait la somme et la moyenne des nombres pollen.common.voteCountingTypeHelp.condorcet=Vote Condorcet \: classer les choix par ordre de préférence de 1 à N (1\=préféré). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. @@ -207,15 +208,24 @@ pollen.error.userNotAllowed=Vous n'êtes pas autorisé à dépouiller ce sondage. pollen.error.vote.maxChoiceNb=Le nombre de choix maximal est de %d. pollen.error.vote.percentage=La somme des valeurs doit être égale à 100. +pollen.fieldset.choice.options=Les choix +pollen.fieldset.creator.options=Vous +pollen.fieldset.choice.options.help=Configurer les choix du sondage pollen.fieldset.connexionInformation=Information de connexion +pollen.fieldset.creator.options.help=Renseigner les informations sur le créateur du sondage pollen.fieldset.login=Connexion +pollen.fieldset.notification.options=Notifications +pollen.fieldset.notification.options.help=Configurer les notifications du sondage pollen.fieldset.poll.choices=Les choix pollen.fieldset.poll.general=Votre sondage pollen.fieldset.poll.options=Les options -pollen.fieldset.poll.you=Vous pollen.fieldset.pollAccount.toAddToFavoriteList=Ajouter un membre pollen.fieldset.pollAccount.toDeleteFromFavoriteList=Supprimer un membre pollen.fieldset.pollAccount.toEditToFavoriteList=Editer le membre +pollen.fieldset.pollDate.options=Plage de validité +pollen.fieldset.pollDate.options.help=Configurer la plage de validité du sondage +pollen.fieldset.result.options=Les résultats +pollen.fieldset.result.options.help=Pour configurer les résultats du sondage pollen.fieldset.userFavoriteList.toCreate=Créer une nouvelle liste pollen.fieldset.userFavoriteList.toDelete=List de favoris à supprimer pollen.fieldset.userInformation=Informations de l'utilisateur @@ -315,4 +325,3 @@ pollen.title.usersList=Gestion des utilisateurs pollen.warning.poll.is.closed.so.read.only=Le sondage est clos, vous ne pouvez plus le modifer title=Création d'un sondage -vote.anonymous=Vote anonyme Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-06-13 10:23:07 UTC (rev 3463) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-06-13 12:32:09 UTC (rev 3464) @@ -52,6 +52,8 @@ choiceAddAllowed:'<s:property value="%{poll.choiceAddAllowed}"/>', limitChoice:'<s:property value="%{limitChoice}"/>', reminder:'<s:property value="%{reminder}"/>', + publicOption:'<s:property value="%{poll.publicResults}"/>', + anonymousOption:'<s:property value="%{poll.anonymous}"/>', voteCountingType:'<s:property value="%{poll.voteCountingType.name()}"/>', choiceType:'<s:property value="%{poll.choiceType.name()}"/>', pollType:'<s:property value="%{poll.pollType.name()}"/>', @@ -119,7 +121,12 @@ <div id="toptions"> <fieldset> - <legend><s:text name="pollen.fieldset.poll.you"/></legend> + <legend> + <s:text name="pollen.fieldset.creator.options"/> + <img src="<s:url value='/img/tooltip.png'/>" class="tooltip" + title="<s:text name='pollen.fieldset.creator.options.help'/>" + alt="<s:text name='pollen.fieldset.creator.options.help'/>"/> + </legend> <s:textfield key="poll.creator.votingId" size="80" label="%{getText('pollen.common.login')}"/> <s:textfield key="poll.creator.email" size="80" @@ -130,36 +137,41 @@ <s:hidden name="userId" value="%{poll.creator.userAccount.topiaId}"/> </s:if> </fieldset> + <br/> + <fieldset> + <legend> + <s:text name="pollen.fieldset.pollDate.options"/> + <img src="<s:url value='/img/tooltip.png'/>" class="tooltip" + title="<s:text name='pollen.fieldset.pollDate.options.help'/>" + alt="<s:text name='pollen.fieldset.pollDate.options.help'/>"/> + </legend> + + <sj:datepicker key="poll.beginDate" + displayFormat="%{getText('pollen.common.datePickerPattern')}" + label="%{getText('pollen.common.beginDate')}" + timepicker="true" + disabled="%{voteStarted}"/> + <sj:datepicker key="poll.endDate" + displayFormat="%{getText('pollen.common.datePickerPattern')}" + timepicker="true" + label="%{getText('pollen.common.endDate')}"/> + </fieldset> <br/> <fieldset> - <legend><s:text name="pollen.fieldset.poll.options"/></legend> - - <s:checkbox key="poll.anonymous" - label="%{getText('pollen.common.pollOption.anonymous')}" - disabled="%{voteStarted}" - tooltip="%{getText('pollen.common.pollOption.anonymous.help')}" - tooltipIconPath="/img/tooltip.png"/> - <s:checkbox key="poll.anonymousVoteAllowed" - label="%{getText('pollen.common.pollOption.anonymousVoteAllowed')}" - disabled="%{voteStarted}" - tooltip="%{getText('pollen.common.pollOption.anonymousVoteAllowed.help')}" - tooltipIconPath="/img/tooltip.png"/> - <s:checkbox key="poll.continuousResults" - label="%{getText('pollen.common.pollOption.continuousResults')}" - tooltip="%{getText('pollen.common.pollOption.continuousResults.help')}" - tooltipIconPath="/img/tooltip.png"/> - <s:checkbox key="poll.publicResults" - label="%{getText('pollen.common.pollOption.publicResults')}" - tooltip="%{getText('pollen.common.pollOption.publicResults.help')}" - tooltipIconPath="/img/tooltip.png"/> + <legend> + <s:text name="pollen.fieldset.choice.options"/> + <img src="<s:url value='/img/tooltip.png'/>" class="tooltip" + title="<s:text name='pollen.fieldset.choice.options.help'/>" + alt="<s:text name='pollen.fieldset.choice.options.help'/>"/> + </legend> <s:checkbox key="poll.choiceAddAllowed" label="%{getText('pollen.common.pollOption.choiceAddAllowed')}" disabled="%{voteStarted}" tooltip="%{getText('pollen.common.pollOption.choiceAddAllowed.help')}" tooltipIconPath="/img/tooltip.png"/> - <div id='addChoiceAddAllowedPanel' class="hidden"> + <%--<div id='addChoiceAddAllowedPanel' class="hidden">--%> <sj:datepicker key="poll.beginChoiceDate" label="%{getText('pollen.common.beginChoiceDate')}" displayFormat="%{getText('pollen.common.datePickerPattern')}" @@ -170,17 +182,48 @@ displayFormat="%{getText('pollen.common.datePickerPattern')}" timepicker="true" disabled="%{voteStarted}"/> - </div> + <%--</div>--%> <s:checkbox key="limitChoice" label="%{getText('pollen.common.pollOption.limitChoice')}" disabled="%{voteStarted}" tooltip="%{getText('pollen.common.pollOption.limitChoice.help')}" tooltipIconPath="/img/tooltip.png"/> - <div id='maxChoiceNbPanel' class="hidden"> + <%--<div id='maxChoiceNbPanel' class="hidden">--%> <s:textfield key="maxChoices" label="%{getText('pollen.common.pollOption.maxChoiceNb')}" disabled="%{voteStarted}"/> - </div> + <%--</div>--%> + </fieldset> + <br/> + + <fieldset> + <legend> + <s:text name="pollen.fieldset.result.options"/> + <img src="<s:url value='/img/tooltip.png'/>" class="tooltip" + title="<s:text name='pollen.fieldset.result.options.help'/>" + alt="<s:text name='pollen.fieldset.result.options.help'/>"/> + </legend> + + <s:checkbox key="poll.publicResults" + label="%{getText('pollen.common.pollOption.publicResults')}" + tooltip="%{getText('pollen.common.pollOption.publicResults.help')}" + tooltipIconPath="/img/tooltip.png"/> + <%--<div id='publicPanel' class="hidden">--%> + <s:checkbox key="poll.continuousResults" + label="%{getText('pollen.common.pollOption.continuousResults')}" + tooltip="%{getText('pollen.common.pollOption.continuousResults.help')}" + tooltipIconPath="/img/tooltip.png"/> + <%--</div>--%> + </fieldset> + <br/> + + <fieldset> + <legend> + <s:text name="pollen.fieldset.notification.options"/> + <img src="<s:url value='/img/tooltip.png'/>" class="tooltip" + title="<s:text name='pollen.fieldset.notification.options.help'/>" + alt="<s:text name='pollen.fieldset.notification.options.help'/>"/> + </legend> <s:checkbox key="notification" label="%{getText('pollen.common.pollOption.notification')}" tooltip="%{getText('pollen.common.pollOption.notification.help')}" @@ -189,29 +232,13 @@ label="%{getText('pollen.common.pollOption.reminder')}" tooltip="%{getText('pollen.common.pollOption.reminder.help')}" tooltipIconPath="/img/tooltip.png"/> - <div id='reminderPanel' class="hidden"> + <%--<div id='reminderPanel' class="hidden">--%> <s:textfield key="reminderHourCountdown" label="%{getText('pollen.common.pollOption.reminderHourCountdown')}"/> - </div> + <%--</div>--%> </fieldset> - <br/> - <fieldset> - <legend><s:text name="pollen.fieldset.poll.general"/></legend> - <sj:datepicker key="poll.beginDate" - displayFormat="%{getText('pollen.common.datePickerPattern')}" - label="%{getText('pollen.common.beginDate')}" - timepicker="true" - disabled="%{voteStarted}"/> - <sj:datepicker key="poll.endDate" - displayFormat="%{getText('pollen.common.datePickerPattern')}" - timepicker="true" - label="%{getText('pollen.common.endDate')}"/> - </fieldset> - - <br/> - <fieldset> <legend> <s:text name="pollen.common.pollType"/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-13 10:23:07 UTC (rev 3463) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-13 12:32:09 UTC (rev 3464) @@ -418,7 +418,7 @@ <s:if test="voteAllowed"> <div id="buttons"> <s:if test="poll.anonymousVoteAllowed"> - <s:checkbox key="vote.anonymous"/> + <s:checkbox key="vote.anonymous" label='%{getText("pollen.common.voteAnonymous")}'/> <br/> </s:if> <s:submit action="vote/%{uriId}" key="pollen.action.pollVote" Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-13 10:23:07 UTC (rev 3463) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-13 12:32:09 UTC (rev 3464) @@ -558,33 +558,51 @@ jQuery(document).ready(function () { function changeChoiceAddAllowed(val) { - if (val) { - $('#addChoiceAddAllowedPanel').show(); - } else { - $('#addChoiceAddAllowedPanel').hide(); - } +// if (val) { +// $('#addChoiceAddAllowedPanel').show(); +// } else { +// $('#addChoiceAddAllowedPanel').hide(); +// } $('[name="poll.beginChoiceDate"],[name="poll.endChoiceDate"]').attr( 'disabled', !val); } function changeLimitChoice(val) { - if (val) { - $('#maxChoiceNbPanel').show(); - } else { - $('#maxChoiceNbPanel').hide(); - } +// if (val) { +// $('#maxChoiceNbPanel').show(); +// } else { +// $('#maxChoiceNbPanel').hide(); +// } $('[name="maxChoices"]').attr('disabled', !val); } function changeReminder(val) { - if (val) { - $('#reminderPanel').show(); - } else { - $('#reminderPanel').hide(); - } +// if (val) { +// $('#reminderPanel').show(); +// } else { +// $('#reminderPanel').hide(); +// } $('[name="reminderHourCountdown"]').attr('disabled', !val); } + function changePublicOption(val) { +// if (val) { +// $('#publicPanel').show(); +// } else { +// $('#publicPanel').hide(); +// } + $('[name="poll.continuousResults"]').attr('disabled', !val); + } + + function changeAnonymousOption(val) { +// if (val) { +// $('#anonymousPanel').show(); +// } else { +// $('#anonymousPanel').hide(); +// } + $('[name="poll.anonymousVoteAllowed"]').attr('disabled', !val); + } + function changePollType(type) { $('.pollType').addClass('hidden'); @@ -609,6 +627,10 @@ changeChoiceAddAllowed($(this).prop('checked')); }); + $('[name="poll.publicResults"]').change(function () { + changePublicOption($(this).prop('checked')); + }); + $('[name="limitChoice"]').change(function () { changeLimitChoice($(this).prop('checked')); }); @@ -621,10 +643,10 @@ var val = $(this).prop('checked'); $('[name="poll.anonymousVoteAllowed"]').prop('checked', val); }); - $('[name="poll.continuousResults"]').change(function () { - var val = $(this).prop('checked'); - $('[name="poll.publicResults"]').prop('checked', val); - }); +// $('[name="poll.continuousResults"]').change(function () { +// var val = $(this).prop('checked'); +// $('[name="poll.publicResults"]').prop('checked', val); +// }); $('[name="poll.choiceType"]').change(function () { changeChoiceType($(this).val()); @@ -648,10 +670,13 @@ changeChoiceAddAllowed(datas['choiceAddAllowed'] == 'true'); changeLimitChoice(datas['limitChoice'] == 'true'); changeReminder(datas['reminder'] == 'true'); + changePublicOption(datas['publicOption'] == 'true'); + changeAnonymousOption(datas['anonymousOption'] == 'true'); changeChoiceType(datas['choiceType']); changePollType(datas['pollType']); + $('img[src$="tooltip.png"]').addClass("tooltip"); $('.tooltip').tipTip({ defaultPosition:'top' }); });

1 0

r3463 - trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security
by ymartel＠users.chorem.org June 13, 2012

June 13, 2012

Author: ymartel Date: 2012-06-13 12:23:07 +0200 (Wed, 13 Jun 2012) New Revision: 3463 Url: http://chorem.org/repositories/revision/pollen/3463 Log: refs #606 : add tests for security access with a normal poll as owner and as admin Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-13 01:23:02 UTC (rev 3462) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-13 10:23:07 UTC (rev 3463) @@ -36,13 +36,17 @@ * <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> + * <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 "poll admin page" with a good tokenId (OK)</li> + * <li>Access to "poll admin page" with a bad tokenId (KO)</li> + * <li>Access to "poll moderation page" with a good tokenId (OK)</li> + * <li>Access to "poll moderation page" with a bad tokenId (KO)</li> * </ul> * <p/> * 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> @@ -191,7 +195,7 @@ // Go on home page gotoUrl(fixtures.homeURL()); - // login as user + // login as admin connect("admin", "admin"); // try to access to admin polls list page, current url should be good one @@ -208,8 +212,9 @@ * <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> + * <li>Try to access to modification page for normal poll with just a good pollId</li> + * <li>Try to access to modification page for normal poll with good pollId & good tokenId</li> + * <li>Try to access to modification page for normal poll with good pollId & bad tokenId (should be redirected)</li> * </ol> * <p/> * All the page should be accessed. @@ -246,4 +251,116 @@ gotoUrl(fixtures.modificationURL(PollUri.newPollUri(pollId, badCreatorId)), fixtures.poll_creator_requiredURL(), false); } + /** + * This test : + * <ol> + * <li>Login as Admin</li> + * <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> + * <p/> + * All the page should be accessed. + * + * @throws Exception + */ + @Test + public void accessNormalPoolActionsAsAdmin() throws Exception { + + // Go on home page + gotoUrl(fixtures.homeURL()); + + // login as admin + connect("admin", "admin"); + + String pollId = fixtures.normalPollId(); + String badPollId = pollId + System.nanoTime(); + String creatorId = fixtures.normalPollCreatorId(); + String badCreatorId = creatorId + System.nanoTime(); + + // try to access to poll page, current url should be good one + String normalPollURL = fixtures.voteforURL(PollUri.newPollUri(pollId)); + gotoUrl(normalPollURL); + + // try to access to poll page with bad pollId, current url should be the poll_required one + gotoUrl(fixtures.voteforURL(PollUri.newPollUri(badPollId)), fixtures.poll_requiredURL(), false); + + // try to access to poll moderation page, current url should be good one + String moderationURL = fixtures.voteforURL(PollUri.newPollUri(pollId, creatorId)); + gotoUrl(moderationURL); + + // try to access to poll page with bad creatorId, current url should be the poll_required one + gotoUrl(fixtures.voteforURL(PollUri.newPollUri(pollId, badCreatorId)), fixtures.poll_access_requiredURL(), false); + + // try to access to poll modification page without creator Id, current url should be good one (admin access) + String simpleNormalPollAdminURL = fixtures.modificationURL(PollUri.newPollUri(pollId)); + gotoUrl(simpleNormalPollAdminURL); + + // try to access to poll modification page with creator Id, current url should be good one + String normalPollAdminURL = fixtures.modificationURL(PollUri.newPollUri(pollId, creatorId)); + gotoUrl(normalPollAdminURL); + + // try to access to poll modifcation page with bad creatorId, current url should be the poll_creator_required one, even if we are admin + gotoUrl(fixtures.modificationURL(PollUri.newPollUri(pollId, badCreatorId)), fixtures.poll_creator_requiredURL(), false); + } + + /** + * This test : + * <ol> + * <li>Login as "User" (owner of the poll)</li> + * <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> + * <p/> + * All the page should be accessed. + * + * @throws Exception + */ + @Test + public void accessNormalPoolActionsAsOwner() throws Exception { + + // Go on home page + gotoUrl(fixtures.homeURL()); + + // login as user + connect("user", "user"); + + String pollId = fixtures.normalPollId(); + String badPollId = pollId + System.nanoTime(); + String creatorId = fixtures.normalPollCreatorId(); + String badCreatorId = creatorId + System.nanoTime(); + + // try to access to poll page, current url should be good one + String normalPollURL = fixtures.voteforURL(PollUri.newPollUri(pollId)); + gotoUrl(normalPollURL); + + // try to access to poll page with bad pollId, current url should be the poll_required one + gotoUrl(fixtures.voteforURL(PollUri.newPollUri(badPollId)), fixtures.poll_requiredURL(), false); + + // try to access to poll moderation page, current url should be good one + String moderationURL = fixtures.voteforURL(PollUri.newPollUri(pollId, creatorId)); + gotoUrl(moderationURL); + + // try to access to poll page with bad pollId, current url should be the poll_required one + gotoUrl(fixtures.voteforURL(PollUri.newPollUri(pollId, badCreatorId)), fixtures.poll_access_requiredURL(), false); + + // try to access to poll modification page without creator Id, current url should be good one (owner access) + String simpleNormalPollModificationURL = fixtures.modificationURL(PollUri.newPollUri(pollId)); + gotoUrl(simpleNormalPollModificationURL); + + // try to access to poll modification page with creator Id, current url should be good one + String normalPollModificationURL = fixtures.modificationURL(PollUri.newPollUri(pollId, creatorId)); + gotoUrl(normalPollModificationURL); + + // try to access to poll modifcation page with bad creatorId, current url should be the poll_creator_required one, even if we are owner + gotoUrl(fixtures.modificationURL(PollUri.newPollUri(pollId, badCreatorId)), fixtures.poll_creator_requiredURL(), false); + } + }

1 0

r3462 - trunk/pollen-ui-struts2
by tchemit＠users.chorem.org June 13, 2012

June 13, 2012

Author: tchemit Date: 2012-06-13 03:23:02 +0200 (Wed, 13 Jun 2012) New Revision: 3462 Url: http://chorem.org/repositories/revision/pollen/3462 Log: refs #606: Add some ITs to prevent regression (make tests works from parent mo) Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-13 01:08:53 UTC (rev 3461) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-13 01:23:02 UTC (rev 3462) @@ -390,10 +390,10 @@ </goals> <configuration> <generatedClasses> - target/pollen-embedded-temp-${project.version}/WEB-INF/classes + ${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes </generatedClasses> <webXmlFragment> - target/pollen-embedded-temp-${project.version}/WEB-INF/webfrag.xml + ${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/webfrag.xml </webXmlFragment> <packageRoot>org.apache.jsp</packageRoot> @@ -437,7 +437,7 @@ <configuration> <primaryArtifact>false</primaryArtifact> <webappDirectory> - target/pollen-embedded-${project.version} + ${basedir}/target/pollen-embedded-${project.version} </webappDirectory> <archive> <manifest> @@ -569,7 +569,7 @@ <configuration> <daemon>true</daemon> <webAppConfig> - <descriptor>src/test/resources/web-test.xml</descriptor> + <descriptor>${basedir}/src/test/resources/web-test.xml</descriptor> <contextPath>/pollen</contextPath> </webAppConfig>

1 0

r3461 - in trunk/pollen-ui-struts2: . src/main/java/org/chorem/pollen/ui src/test/java/org/chorem/pollen/ui src/test/resources
by tchemit＠users.chorem.org June 13, 2012

June 13, 2012

Author: tchemit Date: 2012-06-13 03:08:53 +0200 (Wed, 13 Jun 2012) New Revision: 3461 Url: http://chorem.org/repositories/revision/pollen/3461 Log: refs #606: Add some ITs to prevent regression (utilisation d'un port 8765 pour les tests et r?\195?\169cup?\195?\169ration dans les fixtures) 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/test/java/org/chorem/pollen/ui/PollenFixtures.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenTestApplicationListener.java trunk/pollen-ui-struts2/src/test/resources/pollen-test.properties Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-12 23:53:35 UTC (rev 3460) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-13 01:08:53 UTC (rev 3461) @@ -243,6 +243,9 @@ target/${project.build.finalName}.war, target/${project.build.finalName}-bin.zip </redmine.releaseFiles> + + <defaultSiteUrl>http://localhost:8080/poll</defaultSiteUrl> + <defaultLogDir>${basedir}/target</defaultLogDir> </properties> <build> @@ -286,7 +289,6 @@ </plugins> - <pluginManagement> <plugins> <plugin> @@ -302,11 +304,11 @@ <systemProperties> <systemProperty> <name>siteUrl</name> - <value>http://localhost:8080/pollen</value> + <value>${defaultSiteUrl}</value> </systemProperty> <systemProperty> <name>pollen.log.dir</name> - <value>target</value> + <value>${defaultLogDir}</value> </systemProperty> </systemProperties> </configuration> @@ -318,8 +320,8 @@ <configuration> <path>/pollen</path> <systemProperties> - <siteUrl>http://localhost:8080/pollen</siteUrl> - <pollen.log.dir>target</pollen.log.dir> + <siteUrl>${defaultSiteUrl}</siteUrl> + <pollen.log.dir>${defaultLogDir}</pollen.log.dir> </systemProperties> <uriEncoding>UTF-8</uriEncoding> </configuration> @@ -331,8 +333,8 @@ <configuration> <path>/pollen</path> <systemProperties> - <siteUrl>http://localhost:8080/pollen</siteUrl> - <pollen.log.dir>target</pollen.log.dir> + <siteUrl>${defaultSiteUrl}</siteUrl> + <pollen.log.dir>${defaultLogDir}</pollen.log.dir> </systemProperties> <uriEncoding>UTF-8</uriEncoding> </configuration> @@ -545,6 +547,11 @@ <value>!true</value> </property> </activation> + <properties> + <pollenTestServerPort>8765</pollenTestServerPort> + <pollenTestUrl>http://localhost:${pollenTestServerPort}/pollen</pollenTestUrl> + </properties> + <build> <defaultGoal>post-integration-test</defaultGoal> <plugins> @@ -564,8 +571,19 @@ <webAppConfig> <descriptor>src/test/resources/web-test.xml</descriptor> <contextPath>/pollen</contextPath> + </webAppConfig> <useTestClasspath>true</useTestClasspath> + <systemProperties> + <systemProperty> + <name>siteUrl</name> + <value>${pollenTestUrl}</value> + </systemProperty> + <systemProperty> + <name>jetty.port</name> + <value>${pollenTestServerPort}</value> + </systemProperty> + </systemProperties> </configuration> </execution> @@ -589,6 +607,9 @@ <goal>test</goal> </goals> <configuration> + <environmentVariables> + <siteUrl>${pollenTestUrl}</siteUrl> + </environmentVariables> <includes> <include>**/*SIT.java</include> </includes> 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 23:53:35 UTC (rev 3460) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-13 01:08:53 UTC (rev 3461) @@ -95,6 +95,9 @@ // initialize configuration PollenConfiguration configuration = prepareConfiguration(); + if (log.isInfoEnabled()) { + log.info("Base url "+configuration.getApplicationUrl()); + } applicationContext.setConfiguration(configuration); File temporaryDirectory = configuration.getTemporaryDirectory(); Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java 2012-06-12 23:53:35 UTC (rev 3460) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java 2012-06-13 01:08:53 UTC (rev 3461) @@ -22,6 +22,9 @@ */ package org.chorem.pollen.ui; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.bean.PollUri; /** @@ -32,8 +35,42 @@ */ public class PollenFixtures { - public static final String PREFIX_URL = "http://localhost:8080/pollen/"; + /** Logger. */ + private static final Log log = LogFactory.getLog(PollenFixtures.class); + /** + * The base url of the application. + * <p/> + * This url contains also the web context. This url is obtain from + * the configuration. + * <p/> + * Example: + * <p/> + * <pre>http://localhost:8765/pollen</pre> + * + * @see PollenConfiguration#getApplicationUrl() + */ + protected static String baseUrl; + + public String baseUrl() { + if (baseUrl == null) { + + //get it from configuration + + PollenConfiguration configuration = new PollenConfiguration( + "pollen-test.properties", + null); + baseUrl = configuration.getApplicationUrl().toString(); + if (!baseUrl.endsWith("/")) { + baseUrl += "/"; + } + if (log.isInfoEnabled()) { + log.info("Base url = " + baseUrl); + } + } + return baseUrl; + } + public String normalPollId() { return "c7082f9752844b83a1859abcae3b681c"; } @@ -43,43 +80,43 @@ } public String homeURL() { - return PREFIX_URL + "home"; + return baseUrl() + "home"; } public String createdListURL() { - return PREFIX_URL + "user/createdList"; + return baseUrl() + "user/createdList"; } public String invitedListURL() { - return PREFIX_URL + "user/invitedList"; + return baseUrl() + "user/invitedList"; } public String participatedListURL() { - return PREFIX_URL + "user/participatedList"; + return baseUrl() + "user/participatedList"; } public String favoriteListsURL() { - return PREFIX_URL + "user/favoriteLists"; + return baseUrl() + "user/favoriteLists"; } public String pollsListURL() { - return PREFIX_URL + "admin/pollsList"; + return baseUrl() + "admin/pollsList"; } public String usersListURL() { - return PREFIX_URL + "admin/usersList"; + return baseUrl() + "admin/usersList"; } public String connected_requiredURL() { - return PREFIX_URL + "security/connected_required"; + return baseUrl() + "security/connected_required"; } public String admin_requiredURL() { - return PREFIX_URL + "security/admin_required"; + return baseUrl() + "security/admin_required"; } public String voteforURL() { - return PREFIX_URL + "poll/votefor/"; + return baseUrl() + "poll/votefor/"; } public String voteforURL(PollUri pollUri) { @@ -91,18 +128,18 @@ } public String modificationURL() { - return PREFIX_URL + "poll/modification/"; + return baseUrl() + "poll/modification/"; } public String poll_requiredURL() { - return PREFIX_URL + "security/poll_required"; + return baseUrl() + "security/poll_required"; } public String poll_access_requiredURL() { - return PREFIX_URL + "security/poll_access_required"; + return baseUrl() + "security/poll_access_required"; } public String poll_creator_requiredURL() { - return PREFIX_URL + "security/poll_creator_required"; + return baseUrl() + "security/poll_creator_required"; } } Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenTestApplicationListener.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenTestApplicationListener.java 2012-06-12 23:53:35 UTC (rev 3460) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenTestApplicationListener.java 2012-06-13 01:08:53 UTC (rev 3461) @@ -46,11 +46,10 @@ @Override protected PollenConfiguration prepareConfiguration() { - PollenConfiguration configuration; + PollenConfiguration configuration = new PollenConfiguration( + "pollen-test.properties", + null) { - configuration = new PollenConfiguration("pollen-test.properties", - null) { - @Override protected void loadApplicationConfig(String file, Properties defaultOptions) { Modified: trunk/pollen-ui-struts2/src/test/resources/pollen-test.properties =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/pollen-test.properties 2012-06-12 23:53:35 UTC (rev 3460) +++ trunk/pollen-ui-struts2/src/test/resources/pollen-test.properties 2012-06-13 01:08:53 UTC (rev 3461) @@ -37,10 +37,8 @@ # 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 +# emplacement de la base de test à utiliser (elle sera recopié à chaque démarrage d'un build de tests) incomingDatabase=${basedir}/target/test-classes/pollendb.h2.db \ No newline at end of file

1 0

r3460 - in trunk: pollen-services/src/main/java/org/chorem/pollen/bean pollen-services/src/main/java/org/chorem/pollen/services pollen-ui-struts2/src/main/java/org/chorem/pollen/ui pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-ui-struts2/src/main/resources/i18n pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll pollen-ui-struts2/src/main/webapp/js
by tchemit＠users.chorem.org June 12, 2012

June 12, 2012

Author: tchemit Date: 2012-06-13 01:53:35 +0200 (Wed, 13 Jun 2012) New Revision: 3460 Url: http://chorem.org/repositories/revision/pollen/3460 Log: refs #592: End date of a poll can be anterior than today refs #593: Disable Dates for choices add does not work refs #595: Can set a negative max choice refs #597: Forbid to have two images with the same name refs #607: Can set negative reminderHourCountdown Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java 2012-06-12 21:30:47 UTC (rev 3459) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/ChoiceHelper.java 2012-06-12 23:53:35 UTC (rev 3460) @@ -22,13 +22,11 @@ */ package org.chorem.pollen.bean; -import com.google.common.base.Function; import com.google.common.collect.Iterables; import org.chorem.pollen.business.persistence.Choice; import org.chorem.pollen.common.ChoiceType; +import org.chorem.pollen.services.PollenServiceFunctions; -import java.util.Date; - /** * Used to manage all objects from {@link Choice} inheritance tree depends * on {@link ChoiceType}. @@ -43,43 +41,48 @@ private ChoiceHelper() { } - public static Object toValue(Choice choice, ChoiceType choiceType) { - Object result; - switch (choiceType) { - case DATE: - if (choice instanceof PollDateChoice) { - result = ((PollDateChoice) choice).getDate(); - } else { - result = new Date(Long.parseLong(choice.getName())); - } - break; - case IMAGE: - if (choice instanceof PollImageChoice) { - result = ((PollImageChoice) choice).getLocation(); - } else { - result = choice.getName(); - } - break; - case TEXT: - default: - result = choice.getName(); - } - return result; - } +// public static Object toValue(Choice choice, ChoiceType choiceType) { +// Object result; +// switch (choiceType) { +// case DATE: +// if (choice instanceof PollDateChoice) { +// result = ((PollDateChoice) choice).getDate(); +// } else { +// result = new Date(Long.parseLong(choice.getName())); +// } +// break; +// case IMAGE: +// if (choice instanceof PollImageChoice) { +// result = ((PollImageChoice) choice).getLocation(); +// } else { +// result = choice.getName(); +// } +// break; +// case TEXT: +// default: +// result = choice.getName(); +// } +// return result; +// } - public static Function<Choice, Object> toValue(final ChoiceType type) { - return new Function<Choice, Object>() { +// public static Function<Choice, Object> toValue(final ChoiceType type) { +// return new Function<Choice, Object>() { +// +// @Override +// public Object apply(Choice input) { +// return toValue(input, type); +// } +// }; +// } - @Override - public Object apply(Choice input) { - return toValue(input, type); - } - }; - } +// public static Iterable<Object> toValues(Iterable<Choice> choices, +// ChoiceType choiceType) { +// return Iterables.transform(choices, toValue(choiceType)); +// } - public static Iterable<Object> toValues(Iterable<Choice> choices, - ChoiceType choiceType) { - return Iterables.transform(choices, toValue(choiceType)); + public static Iterable<String> toNames(Iterable<Choice> choices) { + return Iterables.transform(choices, + PollenServiceFunctions.CHOICE_TO_NAME); } public static String getValuePropertyName(ChoiceType choiceType) { Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-06-12 21:30:47 UTC (rev 3459) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-06-12 23:53:35 UTC (rev 3460) @@ -73,6 +73,13 @@ } } + public static final Function<Choice, String> CHOICE_TO_NAME = new Function<Choice, String>() { + @Override + public String apply(Choice input) { + return input.getName(); + } + }; + public static TopiaIdExtractor newTopiaIdExtractor() { return new TopiaIdExtractor(); } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-06-12 21:30:47 UTC (rev 3459) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenSession.java 2012-06-12 23:53:35 UTC (rev 3460) @@ -32,6 +32,7 @@ import javax.servlet.ServletRequest; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -151,4 +152,15 @@ messages.add(message); } } + + public void removeDynamicDataWithPrefix(String prefix) { + Iterator<Map.Entry<String, Object>> itr = + getDynamicData().entrySet().iterator(); + while (itr.hasNext()) { + Map.Entry<String, Object> entry = itr.next(); + if (entry.getKey().startsWith(prefix)) { + itr.remove(); + } + } + } } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 2012-06-12 21:30:47 UTC (rev 3459) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/io/GetPollImageChoice.java 2012-06-12 23:53:35 UTC (rev 3460) @@ -85,7 +85,7 @@ if (StringUtils.isNotBlank(choiceTokenId)) { // use location from session - file = getPollenSession().consumeDynamicData(choiceTokenId); + file = getPollenSession().getDynamicData(choiceTokenId); } else { // using pollId / choiceId to find image to render Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-12 21:30:47 UTC (rev 3459) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-12 23:53:35 UTC (rev 3460) @@ -59,6 +59,8 @@ private static final long serialVersionUID = 1L; + public static final String IMAGECHOICES_THUMB_PREFIX = "imagechoicesThumb_"; + protected Poll poll; private Map<String, String> pollTypes; @@ -88,8 +90,10 @@ private boolean limitChoice; - private int reminderHourCountdown = 2; + private Integer maxChoices; + private Integer reminderHourCountdown; + /** To create a new personToList. */ private transient Function<PersonToList, PersonToList> persontoListCreator; @@ -162,6 +166,14 @@ this.notification = notification; } + public Integer getMaxChoices() { + return maxChoices; + } + + public void setMaxChoices(Integer maxChoices) { + this.maxChoices = maxChoices; + } + public boolean isReminder() { return reminder; } @@ -178,11 +190,11 @@ this.limitChoice = limitChoice; } - public int getReminderHourCountdown() { + public Integer getReminderHourCountdown() { return reminderHourCountdown; } - public void setReminderHourCountdown(int reminderHourCountdown) { + public void setReminderHourCountdown(Integer reminderHourCountdown) { this.reminderHourCountdown = reminderHourCountdown; } @@ -196,18 +208,6 @@ return pollType == PollType.GROUP; } -// public String getPollVoteUrl() { -// return getPollUrlService().getPollVoteUrl(poll, false).getUrl(); -// } -// -// public String getPollModerateUrl() { -// return getPollUrlService().getPollVoteUrl(poll, true).getUrl(); -// } -// -// public String getPollEditUrl() { -// return getPollUrlService().getPollEditUrl(poll).getUrl(); -// } - public int getSelectedTab() { int result = 0; return result; @@ -238,6 +238,8 @@ public void prepareFormPage() throws Exception { + getPollenSession().removeDynamicDataWithPrefix(IMAGECHOICES_THUMB_PREFIX); + pollTypes = decorateToName(PollType.values()); choiceTypes = decorateToName(ChoiceType.values()); voteCountingTypes = decorateToName(VoteCountingType.values()); @@ -349,7 +351,7 @@ // keep in session the location of this thumb (do not // want to expose the full path location in url) getPollenSession().putDynamicData( - "imagechoicesThumb_" + choice.getName(), + IMAGECHOICES_THUMB_PREFIX + choice.getName(), thumbFile); } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java 2012-06-12 21:30:47 UTC (rev 3459) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AddChoice.java 2012-06-12 23:53:35 UTC (rev 3460) @@ -97,22 +97,21 @@ String propName = ChoiceHelper.getValuePropertyName(choiceType); - Object value = ChoiceHelper.toValue(choice, choiceType); + String choiceName = choice.getName(); // -- Validate value notEmpty - if (value == null || - (value instanceof String && StringUtils.isBlank((String) value))) { + if (StringUtils.isBlank(choiceName)) { String typeLabel = getText(choiceType.getI18nKey()); addFieldError("choice." + propName, _("pollen.error.choice.empty", typeLabel)); } else { // Retrieve existing values to check if the new choice not already exists - Iterable<Object> pollChoiceValues = ChoiceHelper.toValues( - getPoll().getChoice(), choiceType); + Iterable<String> pollChoiceValues = ChoiceHelper.toNames( + getPoll().getChoice()); // -- Validate value notExists - if (Iterables.contains(pollChoiceValues, value)) { + if (Iterables.contains(pollChoiceValues, choiceName)) { addFieldError("choice." + propName, _("pollen.error.poll.detected.duplicate.choice.name")); } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java 2012-06-12 21:30:47 UTC (rev 3459) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/LoadPoll.java 2012-06-12 23:53:35 UTC (rev 3460) @@ -129,11 +129,21 @@ setLimitChoice(poll.getMaxChoiceNb() > 0); + if (isLimitChoice()) { + setMaxChoices(poll.getMaxChoiceNb()); + } else { + // set default max choices + setMaxChoices(1); + } PreventRule reminder = poll.getPreventRuleByScope( PreventRuleService.SCOPE_REMINDER); if (reminder != null) { setReminder(true); setReminderHourCountdown(reminder.getSensibility()); + } else { + setReminder(false); + // set default reminderHourCountdown + setReminderHourCountdown(2); } PreventRule notification = poll.getPreventRuleByScope( Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-12 21:30:47 UTC (rev 3459) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/SavePoll.java 2012-06-12 23:53:35 UTC (rev 3460) @@ -210,7 +210,6 @@ Collection<VotingList> pollVotingLists = isVoteStarted() ? poll.getVotingList() : votingLists.values(); - if (ChoiceType.IMAGE == poll.getChoiceType()) { // recopy images for new choices, the one uploaded will be @@ -278,9 +277,14 @@ } } - // Reset maxChoiceNb if limitChoice is unchecked - if (!isLimitChoice()) { + if (isLimitChoice()) { + + // push back filled value + poll.setMaxChoiceNb(getMaxChoices()); + } else { + // reset value poll.setMaxChoiceNb(0); + } //TODO-tchemit comment me 2012-06-04 A merge would be nicer but more complex to code poll.clearPreventRule(); @@ -391,13 +395,13 @@ _("pollen.error.poll.required.one.choice")); } else { - ChoiceType choiceType = poll.getChoiceType(); - int inputChoicesSize = choices.size(); - Set<Object> choiceValues = - Sets.newHashSet(ChoiceHelper.toValues(choices.values(), - choiceType)); + // get all names from choices + Set<String> choiceNames = + Sets.newHashSet(ChoiceHelper.toNames(choices.values())); - if (inputChoicesSize > choiceValues.size()) { + if (choices.size() > choiceNames.size()) { + + // theire is some duplicated names addInformationsError( "poll.choices", _("pollen.error.poll.detected.duplicate.choice.name")); @@ -437,12 +441,15 @@ } String creatorEmail = poll.getCreator().getEmail(); - if (StringUtils.isNotBlank(creatorEmail) && !StringUtil.isEmail(creatorEmail)) { + if (StringUtils.isNotBlank(creatorEmail) && + !StringUtil.isEmail(creatorEmail)) { addOptionsError("poll.creator.email", _("pollen.error.email.invalid")); } + Date currentTime = serviceContext.getCurrentTime(); + if (validateEndDate(poll.getBeginChoiceDate(), poll.getEndChoiceDate())) { addOptionsError( @@ -450,17 +457,64 @@ _("pollen.error.poll.endChoiceDate.before.beginChoiceDate")); } + if (validateEndDate(currentTime, poll.getEndChoiceDate())) { + + addOptionsError( + "poll.endChoiceDate", + _("pollen.error.poll.endChoiceDate.before.now")); + } + if (validateEndDate(poll.getBeginDate(), poll.getEndDate())) { addOptionsError("poll.endDate", _("pollen.error.poll.endDate.before.beginDate")); } + + if (validateEndDate(currentTime, poll.getEndDate())) { + + addOptionsError( + "poll.endDate", + _("pollen.error.poll.endDate.before.now")); + } + if (validateEndDate(poll.getEndChoiceDate(), poll.getEndDate())) { addOptionsError("poll.endChoiceDate", _("pollen.error.poll.endChoiceDate.after.endDate")); } + + if (isLimitChoice()) { + + // validate maxChoices + + if (getMaxChoices() == null) { + // maxChoices == null + addOptionsError("maxChoices", + _("pollen.error.poll.maxChoice.required")); + } else if (getMaxChoices() < 1) { + // maxChoices <= 0 + addOptionsError("maxChoices", + _("pollen.error.poll.maxChoice.greater.than.0")); + } + } + + if (isReminder()) { + + // validate reminderHourCountdown + + if (getReminderHourCountdown() == null) { + + // reminderHourCountdown == null + addOptionsError("reminderHourCountdown", + _("pollen.error.poll.reminderHourCountdown.required")); + } else if (getReminderHourCountdown() < 1) { + + // reminderHourCountdown <= 0 + addOptionsError("reminderHourCountdown", + _("pollen.error.poll.reminderHourCountdown.greater.than.0")); + } + } } protected void validateVotingList(int votingListNumber, Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-12 21:30:47 UTC (rev 3459) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-12 23:53:35 UTC (rev 3460) @@ -150,7 +150,6 @@ pollen.common.voterName=Votant pollen.common.votingList=Group pollen.common.weight=Weight -pollen.error.accountNotFound= pollen.error.choice.empty=%s mandatory pollen.error.comment.name.empty=Comment name mandatory pollen.error.comment.text.empty=Comment text mandatory @@ -174,11 +173,17 @@ pollen.error.poll.detected.duplicate.choice.name=Choices must be unique. pollen.error.poll.endChoiceDate.after.endDate=The choice end date must be sooner than the poll end date. pollen.error.poll.endChoiceDate.before.beginChoiceDate=The choice end date must be later than the begin date. +pollen.error.poll.endChoiceDate.before.now=The choice end date must be later than current date. pollen.error.poll.endDate.before.beginDate=The poll end date must be later than the begin date. +pollen.error.poll.endDate.before.now=The poll end date must be later than current date. +pollen.error.poll.maxChoice.greater.than.0=Number of choices must be strictly greater than 0 +pollen.error.poll.maxChoice.required=Number of choices mandatory pollen.error.poll.notfound=No such poll exists. Please make sure that you are using the correct link and copy it completely into your browser's address field. pollen.error.poll.personToList.email.doublon=Email must be unique pollen.error.poll.personToList.votingId.doublon=The voter's name must be unique -pollen.error.poll.personToList.weight.not.valid=The voter's weight is not valid (must be greater than 0) +pollen.error.poll.personToList.weight.not.valid=The voter's weight is not valid (must be greater than 0). +pollen.error.poll.reminderHourCountdown.greater.than.0=Reminder hour countdown must be strictly greater than 0. +pollen.error.poll.reminderHourCountdown.required=Reminder hour countdown mandatory. pollen.error.poll.required.one.choice=You must provide at least one choice pollen.error.poll.required.one.personToList=You must provide at least one voter pollen.error.poll.required.title=You must provide a title for the poll Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-12 21:30:47 UTC (rev 3459) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-12 23:53:35 UTC (rev 3460) @@ -150,7 +150,6 @@ pollen.common.voterName=Votant pollen.common.votingList=Groupe pollen.common.weight=Poids -pollen.error.accountNotFound= pollen.error.choice.empty=%s obligatoire pollen.error.comment.name.empty=Nom du commentaire obligatoire pollen.error.comment.text.empty=Texte du commentaire obligatoire @@ -174,11 +173,17 @@ pollen.error.poll.detected.duplicate.choice.name=Les choix doivent être uniques. pollen.error.poll.endChoiceDate.after.endDate=La date de fin d'ajout de choix doit-être antérieure à la date de fin du sondage. pollen.error.poll.endChoiceDate.before.beginChoiceDate=La date de fin d'ajout de choix doit-être postérieure à la date de début. +pollen.error.poll.endChoiceDate.before.now=La date de fin d'ajout de choix doit-être postérieure à la date actuelle. pollen.error.poll.endDate.before.beginDate=La date de fin du sondage doit-être postérieure à la date de début. +pollen.error.poll.endDate.before.now=La date de fin du sondage doit-être postérieure à la date actuelle. +pollen.error.poll.maxChoice.greater.than.0=Nombre de choix maximum doit être strictement supérieur à 0 +pollen.error.poll.maxChoice.required=Nombre de choix maximum obligatoire pollen.error.poll.notfound=Il n'y a pas de sondage à cette adresse. Veuillez verifier que vous utilisez le lien correcte et copiez-le complètement dans le champ d'adresse de votre navigateur. pollen.error.poll.personToList.email.doublon=Les emails doivent être uniques. pollen.error.poll.personToList.votingId.doublon=Les noms des votants doivent être uniques. pollen.error.poll.personToList.weight.not.valid=Poids du votant non valide (doit être une nombre supérieur à 0). +pollen.error.poll.reminderHourCountdown.greater.than.0=Le nombre d'heures doit être strictement supérieure à 0. +pollen.error.poll.reminderHourCountdown.required=Le nombre d'heures est obligatoire. pollen.error.poll.required.one.choice=Vous devez saisir au moins un choix. pollen.error.poll.required.one.personToList=Aucun votant renseigné pollen.error.poll.required.title=Vous devez fournir un titre pour le sondage Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-06-12 21:30:47 UTC (rev 3459) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/create.jsp 2012-06-12 23:53:35 UTC (rev 3460) @@ -104,6 +104,7 @@ <legend> <s:text name="pollen.common.voteCountingType"/> <img src="<s:url value='/img/tooltip.png'/>" class="tooltip" + alt="<s:text name='pollen.common.voteCountingType.help'/>" title="<s:text name='pollen.common.voteCountingType.help'/>"/> </legend> <s:radio key='poll.voteCountingType' list="voteCountingTypes" @@ -176,7 +177,7 @@ tooltip="%{getText('pollen.common.pollOption.limitChoice.help')}" tooltipIconPath="/img/tooltip.png"/> <div id='maxChoiceNbPanel' class="hidden"> - <s:textfield key="poll.maxChoiceNb" + <s:textfield key="maxChoices" label="%{getText('pollen.common.pollOption.maxChoiceNb')}" disabled="%{voteStarted}"/> </div> @@ -215,7 +216,8 @@ <legend> <s:text name="pollen.common.pollType"/> <img src="<s:url value='/img/tooltip.png'/>" class="tooltip" - title="<s:text name='pollen.common.pollType.help'/>"/> + title="<s:text name='pollen.common.pollType.help'/>" + alt="<s:text name='pollen.common.pollType.help'/>"/> </legend> <s:radio key='poll.pollType' list="pollTypes" label='%{getText("pollen.common.pollType")}' Modified: trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-12 21:30:47 UTC (rev 3459) +++ trunk/pollen-ui-struts2/src/main/webapp/js/createPoll.js 2012-06-12 23:53:35 UTC (rev 3460) @@ -563,6 +563,8 @@ } else { $('#addChoiceAddAllowedPanel').hide(); } + $('[name="poll.beginChoiceDate"],[name="poll.endChoiceDate"]').attr( + 'disabled', !val); } function changeLimitChoice(val) { @@ -571,6 +573,7 @@ } else { $('#maxChoiceNbPanel').hide(); } + $('[name="maxChoices"]').attr('disabled', !val); } function changeReminder(val) { @@ -579,6 +582,7 @@ } else { $('#reminderPanel').hide(); } + $('[name="reminderHourCountdown"]').attr('disabled', !val); } function changePollType(type) {

1 0

r3459 - in trunk/pollen-ui-struts2/src: jetty test/java/org/chorem/pollen/ui test/java/org/chorem/pollen/ui/security test/resources
by tchemit＠users.chorem.org June 12, 2012

June 12, 2012

Author: tchemit Date: 2012-06-12 23:30:47 +0200 (Tue, 12 Jun 2012) New Revision: 3459 Url: http://chorem.org/repositories/revision/pollen/3459 Log: add headers Modified: trunk/pollen-ui-struts2/src/jetty/jetty-context.xml trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java trunk/pollen-ui-struts2/src/test/resources/web-test.xml Modified: trunk/pollen-ui-struts2/src/jetty/jetty-context.xml =================================================================== --- trunk/pollen-ui-struts2/src/jetty/jetty-context.xml 2012-06-12 21:28:29 UTC (rev 3458) +++ trunk/pollen-ui-struts2/src/jetty/jetty-context.xml 2012-06-12 21:30:47 UTC (rev 3459) @@ -1,4 +1,27 @@ <?xml version="1.0" encoding="ISO-8859-1"?> + + <!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> <Configure class="org.eclipse.jetty.webapp.WebAppContext"> Property changes on: trunk/pollen-ui-struts2/src/jetty/jetty-context.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java 2012-06-12 21:28:29 UTC (rev 3458) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java 2012-06-12 21:30:47 UTC (rev 3459) @@ -1,3 +1,25 @@ +/* + * #%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.chorem.pollen.bean.PollUri; Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-12 21:28:29 UTC (rev 3458) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-12 21:30:47 UTC (rev 3459) @@ -1,3 +1,25 @@ +/* + * #%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.security; import org.chorem.pollen.bean.PollUri; @@ -26,6 +48,8 @@ * </ul> * * @author ymartel <martel(a)codelutin.com> + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 */ public class SecurityAccessSIT extends PollenBaseWebDriverIT { Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/test/resources/web-test.xml =================================================================== --- trunk/pollen-ui-struts2/src/test/resources/web-test.xml 2012-06-12 21:28:29 UTC (rev 3458) +++ trunk/pollen-ui-struts2/src/test/resources/web-test.xml 2012-06-12 21:30:47 UTC (rev 3459) @@ -2,8 +2,8 @@ <!-- #%L Pollen :: UI (struts2) - $Id: web.xml 3451 2012-06-12 12:07:38Z tchemit $ - $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2-test/src/main/weba… $ + $Id$ + $HeadURL$ %% Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit %% Property changes on: trunk/pollen-ui-struts2/src/test/resources/web-test.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r3458 - in trunk: . pollen-ui-struts2 pollen-ui-struts2/src pollen-ui-struts2/src/jetty 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 June 12, 2012

June 12, 2012

Author: tchemit Date: 2012-06-12 23:28:29 +0200 (Tue, 12 Jun 2012) New Revision: 3458 Url: http://chorem.org/repositories/revision/pollen/3458 Log: refs #606: Add some ITs to prevent regression - improve its (we should hide the driver from tests - improve jetty configuration Added: trunk/pollen-ui-struts2/src/jetty/ trunk/pollen-ui-struts2/src/jetty/jetty-context.xml trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java Removed: trunk/pollen-ui-struts2-test/ Modified: trunk/pollen-ui-struts2/pom.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/WebDriverResource.java 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/pollendb.h2.db Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-12 16:46:42 UTC (rev 3457) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-12 21:28:29 UTC (rev 3458) @@ -295,6 +295,7 @@ <configuration> <stopKey>A</stopKey> <stopPort>1269</stopPort> + <contextXml>${basedir}/src/jetty/jetty-context.xml</contextXml> <webAppConfig> <contextPath>/pollen</contextPath> </webAppConfig> @@ -393,6 +394,7 @@ target/pollen-embedded-temp-${project.version}/WEB-INF/webfrag.xml </webXmlFragment> <packageRoot>org.apache.jsp</packageRoot> + </configuration> </execution> </executions> @@ -474,29 +476,6 @@ </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> @@ -563,9 +542,8 @@ <activation> <property> <name>maven.test.skip</name> - <value>!false</value> + <value>!true</value> </property> - </activation> <build> <defaultGoal>post-integration-test</defaultGoal> @@ -573,37 +551,21 @@ <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> + <goal>start</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> @@ -619,10 +581,6 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> - <configuration> -  - <skip>true</skip> - </configuration> <executions> <execution> @@ -631,7 +589,6 @@ <goal>test</goal> </goals> <configuration> - <skip>false</skip> <includes> <include>**/*SIT.java</include> </includes> Added: trunk/pollen-ui-struts2/src/jetty/jetty-context.xml =================================================================== --- trunk/pollen-ui-struts2/src/jetty/jetty-context.xml (rev 0) +++ trunk/pollen-ui-struts2/src/jetty/jetty-context.xml 2012-06-12 21:28:29 UTC (rev 3458) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="ISO-8859-1"?> +<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://www.eclipse.org/jetty/configure.dtd"> + +<Configure class="org.eclipse.jetty.webapp.WebAppContext"> + <Call name="setAttribute"> + <Arg>org.eclipse.jetty.server.webapp.WebInfIncludeJarPattern</Arg> + <Arg>.*/.*jsp-api-[^/]\.jar$|./.*jsp-[^/]\.jar$|./.*taglibs[^/]*\.jar$</Arg> + </Call> +</Configure> \ No newline at end of file Modified: 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 16:46:42 UTC (rev 3457) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenBaseWebDriverIT.java 2012-06-12 21:28:29 UTC (rev 3458) @@ -25,12 +25,18 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.Before; import org.junit.Rule; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; +import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; import java.util.Collection; +import java.util.List; /** * Test base class for ui tests. @@ -52,12 +58,83 @@ @Rule public WebDriverResource seleniumServer; + protected PollenFixtures fixtures ; + + protected WebDriver driver; + + @Before + public void setUp() throws Exception { + driver = seleniumServer.getDriver(); + fixtures = seleniumServer.getFixtures(); + } + + @AfterClass + public static void afterClass() { + WebDriverResource.afterClass(); + + } + protected PollenBaseWebDriverIT(Class<? extends WebDriver> driverType) { - seleniumServer = new WebDriverResource(getClass(), driverType); + seleniumServer = new WebDriverResource(driverType); } - public WebDriver getDriver() { - return seleniumServer.getDriver(); + protected void gotoUrl(String url, boolean strict) { + gotoUrl(url, null, strict); } + protected void gotoUrl(String url) { + gotoUrl(url, null, true); + } + + protected void gotoUrl(String url, String fallBackUrl) { + gotoUrl(url, fallBackUrl, true); + } + + protected void gotoUrl(String url, String fallBackUrl, boolean strict) { + driver.get(url); + String expectedUrl; + if (fallBackUrl == null) { + expectedUrl = url; + } else { + expectedUrl = fallBackUrl; + } + + if (strict) { + Assert.assertEquals(expectedUrl, driver.getCurrentUrl()); + } else { + Assert.assertTrue(driver.getCurrentUrl().startsWith(expectedUrl)); + } + } + + protected WebElement findElement(By by) { + WebElement element = driver.findElement(by); + return element; + } + + protected List<WebElement> findElements(By by) { + List<WebElement> result = driver.findElements(by); + return result; + } + + /** Try to log in using the given {@code username} and {@code password}. */ + protected void connect(String username, String password) { + + // 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 loginElement = driver.findElement(By.name("login")); + Assert.assertEquals("input", loginElement.getTagName()); + Assert.assertTrue(loginElement.isDisplayed()); + loginElement.sendKeys(username); + + WebElement passwordElement = driver.findElement(By.name("password")); + Assert.assertTrue(passwordElement.isDisplayed()); + Assert.assertEquals("input", passwordElement.getTagName()); + passwordElement.sendKeys(password); + + WebElement submit = driver.findElement(By.name("action:login")); + submit.click(); + } } Added: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java (rev 0) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/PollenFixtures.java 2012-06-12 21:28:29 UTC (rev 3458) @@ -0,0 +1,86 @@ +package org.chorem.pollen.ui; + +import org.chorem.pollen.bean.PollUri; + +/** + * Some fixtures for tests. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.4 + */ +public class PollenFixtures { + + public static final String PREFIX_URL = "http://localhost:8080/pollen/"; + + public String normalPollId() { + return "c7082f9752844b83a1859abcae3b681c"; + } + + public String normalPollCreatorId() { + return "b9b434acd58d42fca083d473ee021fce"; + } + + public String homeURL() { + return PREFIX_URL + "home"; + } + + public String createdListURL() { + return PREFIX_URL + "user/createdList"; + } + + public String invitedListURL() { + return PREFIX_URL + "user/invitedList"; + } + + public String participatedListURL() { + return PREFIX_URL + "user/participatedList"; + } + + public String favoriteListsURL() { + return PREFIX_URL + "user/favoriteLists"; + } + + public String pollsListURL() { + return PREFIX_URL + "admin/pollsList"; + } + + public String usersListURL() { + return PREFIX_URL + "admin/usersList"; + } + + public String connected_requiredURL() { + return PREFIX_URL + "security/connected_required"; + } + + public String admin_requiredURL() { + return PREFIX_URL + "security/admin_required"; + } + + public String voteforURL() { + return PREFIX_URL + "poll/votefor/"; + } + + public String voteforURL(PollUri pollUri) { + return voteforURL() + pollUri.toString(); + } + + public String modificationURL(PollUri pollUri) { + return modificationURL() + pollUri.toString(); + } + + public String modificationURL() { + return PREFIX_URL + "poll/modification/"; + } + + public String poll_requiredURL() { + return PREFIX_URL + "security/poll_required"; + } + + public String poll_access_requiredURL() { + return PREFIX_URL + "security/poll_access_required"; + } + + public String poll_creator_requiredURL() { + return PREFIX_URL + "security/poll_creator_required"; + } +} Modified: 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 16:46:42 UTC (rev 3457) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/WebDriverResource.java 2012-06-12 21:28:29 UTC (rev 3458) @@ -23,9 +23,11 @@ */ package org.chorem.pollen.ui; +import com.google.common.collect.Lists; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.junit.rules.ExternalResource; +import org.junit.rules.TestWatcher; +import org.junit.runner.Description; import org.openqa.selenium.WebDriver; import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.chrome.ChromeDriverService; @@ -46,27 +48,25 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.4 */ -public class WebDriverResource extends ExternalResource { +public class WebDriverResource extends TestWatcher { /** 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<? extends WebDriver>> allDrivers = Lists.newArrayList(); + allDrivers.add(HtmlUnitDriver.class); + allDrivers.add(FirefoxDriver.class); +// allDrivers.add(ChromeDriver.class); +// allDrivers.add(InternetExplorerDriver.class); +// allDrivers.add(SafariDriver.class); + List<Class<?>> checkedDrivers = new ArrayList<Class<?>>(); for (Class<? extends WebDriver> driver : allDrivers) { boolean ok = checkDriver(driver); @@ -74,7 +74,6 @@ checkedDrivers.add(driver); } } - //{{ChromeDriver.class}, {FirefoxDriver.class}, {HtmlUnitDriver.class}} Object[][] data = new Object[checkedDrivers.size()][1]; int i = 0; for (Class<?> checkedDriver : checkedDrivers) { @@ -88,10 +87,9 @@ private static boolean checkDriver(Class<? extends WebDriver> driverType) { - WebDriver driver = null; boolean result = false; try { - driver = driverType.getConstructor().newInstance(); + createDriver(driverType, true); result = true; } catch (Exception e) { @@ -99,36 +97,63 @@ 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; + private final PollenFixtures fixtures; + protected WebDriver driver; - public WebDriverResource(Class<?> testClass, - Class<? extends WebDriver> driverType) { - this.testClass = testClass; + public WebDriverResource(Class<? extends WebDriver> driverType) { this.driverType = driverType; + fixtures = new PollenFixtures(); } public WebDriver getDriver() { return driver; } + public PollenFixtures getFixtures() { + return fixtures; + } + @Override - protected void before() throws Throwable { + protected void starting(Description description) { + String testName = description.getClassName() + "#" + description.getMethodName() + " on [" + driverType.getName() + "]"; + if (log.isInfoEnabled()) { - log.info("Start test [" + testClass.getName() + "] with driver of type " + driverType.getName()); + log.info("Start test " + testName); } + + try { + driver = createDriver(driverType, false); + + } catch (Exception e) { + throw new IllegalStateException("Could not begin test " + testName); + } + } + + @Override + protected void finished(Description description) { + + // close current driver + driver.quit(); + } + + public static void afterClass() { + + if (service != null) { + service.stop(); + } + } + + protected static WebDriver createDriver(Class<? extends WebDriver> driverType, boolean clear) throws Exception { + WebDriver result; + if (ChromeDriver.class == driverType) { service = new ChromeDriverService.Builder() @@ -137,18 +162,23 @@ .build(); service.start(); - driver = new RemoteWebDriver(service.getUrl(), DesiredCapabilities.chrome()); + result = new RemoteWebDriver(service.getUrl(), DesiredCapabilities.chrome()); } else { - driver = driverType.getConstructor().newInstance(); + result = driverType.getConstructor().newInstance(); } - } - @Override - protected void after() { - if (ChromeDriver.class == driverType) { - service.stop(); + if (clear) { + + if (result != null) { + result.close(); + } + + if (service != null) { + service.stop(); + } + } - driver.quit(); + return result; } } Modified: 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 2012-06-12 16:46:42 UTC (rev 3457) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/LoginSIT.java 2012-06-12 21:28:29 UTC (rev 3458) @@ -23,8 +23,8 @@ */ package org.chorem.pollen.ui.security; -import junit.framework.Assert; import org.chorem.pollen.ui.PollenBaseWebDriverIT; +import org.junit.Assert; import org.junit.Test; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; @@ -47,107 +47,40 @@ @Test public void loginAdmin() throws Exception { - WebDriver driver = getDriver(); + gotoUrl(fixtures.homeURL()); - driver.get("http://localhost:8080/pollen/home"); + connect("admin", "admin"); - 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")); + findElement(By.className("info_success")); // check there is a admin menu (so 4 menus) - List<WebElement> menus = driver.findElements(By.className("menu_elt")); + List<WebElement> menus = findElements(By.className("menu_elt")); Assert.assertEquals(4, menus.size()); } @Test public void loginUser() throws Exception { - WebDriver driver = getDriver(); + gotoUrl(fixtures.homeURL()); - driver.get("http://localhost:8080/pollen/home"); + connect("user", "user"); - 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")); + findElement(By.className("info_success")); - // check there is not a admin menu (so 2 menus) - List<WebElement> menus = driver.findElements(By.className("menu_elt")); + // check there is not a admin menu (so 3 menus) + List<WebElement> menus = findElements(By.className("menu_elt")); Assert.assertEquals(3, menus.size()); } @Test public void badLogin() throws Exception { - WebDriver driver = getDriver(); + gotoUrl(fixtures.homeURL()); - driver.get("http://localhost:8080/pollen/home"); + connect("admin", "admin" + System.currentTimeMillis()); - 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")); + findElement(By.className("info_error")); } } Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-12 16:46:42 UTC (rev 3457) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/security/SecurityAccessSIT.java 2012-06-12 21:28:29 UTC (rev 3458) @@ -1,15 +1,13 @@ package org.chorem.pollen.ui.security; +import org.chorem.pollen.bean.PollUri; 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 : - * + * <p/> * <ul> * <li>Access to "connected pages" when connected (OK)</li> * <li>Access to "connected pages" when not connected (KO)</li> @@ -17,7 +15,7 @@ * <li>Access to "admin pages" when not connected as admin (KO)</li> * <li>Access to "admin pages" when connected as admin (OK)</li> * </ul> - * + * <p/> * TODO ymartel 2012/06/12 * Should check those security access to : * <ul> @@ -35,22 +33,6 @@ 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> @@ -60,7 +42,7 @@ * <li>Try to access to participatedList page</li> * <li>Try to access to favoriteLists page</li> * </ol> - * + * <p/> * All the page should be accessed. * * @throws Exception @@ -68,30 +50,23 @@ @Test public void accessConnectedPageAsUser() throws Exception { - WebDriver driver = getDriver(); + // Go on home page + gotoUrl(fixtures.homeURL()); - if (log.isInfoEnabled()) { - log.info("Login url : " + driver.getCurrentUrl()); - } // login as user - connect(driver, "user", "user"); + connect("user", "user"); // try to access to createdList page, current url should be good one - driver.get(CREATEDLIST_URL); - Assert.assertEquals(CREATEDLIST_URL, driver.getCurrentUrl()); + gotoUrl(fixtures.createdListURL()); // try to access to participatedList page, current url should be good one - driver.get(PARTICIPATEDLIST_URL); - Assert.assertEquals(PARTICIPATEDLIST_URL, driver.getCurrentUrl()); + gotoUrl(fixtures.participatedListURL()); // try to access to invitedList page, current url should be good one - driver.get(INVITEDLIST_URL); - Assert.assertEquals(INVITEDLIST_URL, driver.getCurrentUrl()); + gotoUrl(fixtures.invitedListURL()); // try to access to favoriteLists page, current url should be good one - driver.get(FAVORITELIST_URL); - Assert.assertEquals(FAVORITELIST_URL, driver.getCurrentUrl()); - + gotoUrl(fixtures.favoriteListsURL()); } /** @@ -103,7 +78,7 @@ * <li>Try to access to participatedList page</li> * <li>Try to access to favoriteLists page</li> * </ol> - * + * <p/> * All the page should be redirected to connected_required page. * * @throws Exception @@ -111,24 +86,17 @@ @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)); + gotoUrl(fixtures.createdListURL(), fixtures.connected_requiredURL(), false); // 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)); + gotoUrl(fixtures.participatedListURL(), fixtures.connected_requiredURL(), false); // 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)); + gotoUrl(fixtures.invitedListURL(), fixtures.connected_requiredURL(), false); // 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)); - + gotoUrl(fixtures.favoriteListsURL(), fixtures.connected_requiredURL(), false); } /** @@ -138,7 +106,7 @@ * <li>Try to access to admin polls list page</li> * <li>Try to access to admin users list page</li> * </ol> - * + * <p/> * All the page should be redirected to connected_required page. * * @throws Exception @@ -146,16 +114,11 @@ @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)); + gotoUrl(fixtures.pollsListURL(), fixtures.connected_requiredURL(), false); // 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)); - + gotoUrl(fixtures.usersListURL(), fixtures.connected_requiredURL(), false); } /** @@ -165,7 +128,7 @@ * <li>Try to access to admin polls list page</li> * <li>Try to access to admin users list page</li> * </ol> - * + * <p/> * All the page should be redirected to admin_required page. * * @throws Exception @@ -173,19 +136,17 @@ @Test public void accessAdminPageAsUser() throws Exception { - WebDriver driver = getDriver(); + // Go on home page + gotoUrl(fixtures.homeURL()); // login as user - connect(driver, "user", "user"); + connect("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)); + gotoUrl(fixtures.pollsListURL(), fixtures.admin_requiredURL(), false); // 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)); - + gotoUrl(fixtures.usersListURL(), fixtures.admin_requiredURL(), false); } /** @@ -195,7 +156,7 @@ * <li>Try to access to admin polls list page</li> * <li>Try to access to admin users list page</li> * </ol> - * + * <p/> * All the page should be accessed. * * @throws Exception @@ -203,19 +164,17 @@ @Test public void accessAdminPageAsAdmin() throws Exception { - WebDriver driver = getDriver(); + // Go on home page + gotoUrl(fixtures.homeURL()); // login as user - connect(driver, "admin", "admin"); + connect("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()); + gotoUrl(fixtures.pollsListURL()); // 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()); - + gotoUrl(fixtures.usersListURL()); } /** @@ -228,7 +187,7 @@ * <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> - * + * <p/> * All the page should be accessed. * * @throws Exception @@ -236,68 +195,31 @@ @Test public void accessNormalPoolActionsAsAnonymous() throws Exception { - WebDriver driver = getDriver(); + String pollId = fixtures.normalPollId(); + String badPollId = pollId + System.nanoTime(); + String creatorId = fixtures.normalPollCreatorId(); + String badCreatorId = creatorId + System.nanoTime(); // 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()); + String normalPollURL = fixtures.voteforURL(PollUri.newPollUri(pollId)); + gotoUrl(normalPollURL); // 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)); + gotoUrl(fixtures.voteforURL(PollUri.newPollUri(badPollId)), fixtures.poll_requiredURL(), false); // 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()); + String moderationURL = fixtures.voteforURL(PollUri.newPollUri(pollId, creatorId)); + gotoUrl(moderationURL); // 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)); + gotoUrl(fixtures.voteforURL(PollUri.newPollUri(pollId, badCreatorId)), fixtures.poll_access_requiredURL(), false); // 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()); + String normalPollAdminURL = fixtures.modificationURL(PollUri.newPollUri(pollId, creatorId)); + gotoUrl(normalPollAdminURL); // 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)); - + gotoUrl(fixtures.modificationURL(PollUri.newPollUri(pollId, badCreatorId)), fixtures.poll_creator_requiredURL(), false); } - /** - * 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(); - } - } Modified: trunk/pollen-ui-struts2/src/test/resources/pollendb.h2.db =================================================================== (Binary files differ)

1 0

r3457 - trunk/pollen-ui-struts2-test
by tchemit＠users.chorem.org June 12, 2012

June 12, 2012

Author: tchemit Date: 2012-06-12 18:46:42 +0200 (Tue, 12 Jun 2012) New Revision: 3457 Url: http://chorem.org/repositories/revision/pollen/3457 Log: refs #606: Add some ITs to prevent regression (finally use same module with jetty) Removed: 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/ Deleted: trunk/pollen-ui-struts2-test/LICENSE.txt =================================================================== --- trunk/pollen-ui-struts2-test/LICENSE.txt 2012-06-12 16:45:52 UTC (rev 3456) +++ trunk/pollen-ui-struts2-test/LICENSE.txt 2012-06-12 16:46:42 UTC (rev 3457) @@ -1,661 +0,0 @@ - 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 Deleted: trunk/pollen-ui-struts2-test/README.txt =================================================================== Deleted: trunk/pollen-ui-struts2-test/changelog.txt =================================================================== Deleted: trunk/pollen-ui-struts2-test/pom.xml =================================================================== --- trunk/pollen-ui-struts2-test/pom.xml 2012-06-12 16:45:52 UTC (rev 3456) +++ trunk/pollen-ui-struts2-test/pom.xml 2012-06-12 16:46:42 UTC (rev 3457) @@ -1,237 +0,0 @@ -<?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> - <classifier>embedded</classifier> - </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>com.google.guava</groupId> - <artifactId>guava</artifactId> - </dependency> - -  - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>javax.activation</groupId> - <artifactId>activation</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> - -  -  -  - - <build> - - <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> - <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> - - <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> -

1 0