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

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

12 Jun '12

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

1 0

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

12 Jun '12

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

1 0

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

12 Jun '12

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

1 0

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

11 Jun '12

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

1 0

r3446 - trunk/doc
by tchemit＠users.chorem.org 11 Jun '12

11 Jun '12

Author: tchemit Date: 2012-06-11 17:55:33 +0200 (Mon, 11 Jun 2012) New Revision: 3446 Url: http://chorem.org/repositories/revision/pollen/3446 Log: add tests roadmap Added: trunk/doc/tests.rst Added: trunk/doc/tests.rst =================================================================== --- trunk/doc/tests.rst (rev 0) +++ trunk/doc/tests.rst 2012-06-11 15:55:33 UTC (rev 3446) @@ -0,0 +1,119 @@ +~~~~~~~~~~ +Tests d'UI +~~~~~~~~~~ + +Abstract +======== + +- Tests Pollen by ui. +- Needs a db with + - 1 admin user *admin/admin* + - 1 none admin user *user/user* + - 1 none admin user *user2/user2* + - 1 poll of each votecounting type (Normal, pourcentage, Condorcet, Nombre) + some votes on it + - 1 poll with restricted mode + +Scenarii +======== + +Security +-------- + +- authentication avec mauvais login/password (KO) +- authentication avec bon login/password (OK) + +- access aux pages connectés en mode déconnecté (KO) +- access aux pages connectés en mode connecté (OK) + +- access aux pages admin en mode déconnecté (KO) +- access aux pages admin avec un user non admin (KO) +- access aux pages admin avec un user admin (OK) + +- access aux pages d'un sondage avec un mauvais pollId (KO) +- access aux pages d'un sondage avec un bon pollId (OK) + +- access aux pages d'un sondage en mode créateur + - en mode admin (pas de accountId dans l'url) : avec un user non admin (KO) + - en mode admin (pas de accountId dans l'url) : avec un admin (OK) + - en mode créateur (avec mauvais accountId dans l'url) (KO) + - en mode créateur (avec bon accountId dans l'url) (OK) + +- access aux résultats d'un sondage (non restreint) (OK) +- access aux résultats d'un sondage restreint en anonyme (KO) +- access aux résultats d'un sondage restreint en extérieur (mauvais accountId) (KO) +- access aux résultats d'un sondage restreint en extérieur (mauvais utilisateur connecté) (KO) +- access aux résultats d'un sondage restreint avec bon accountId (OK) +- access aux résultats d'un sondage restreint avec bon utilisateur connecté (OK) +- access aux résultats d'un sondage restreint avec accountId de créateur (OK) +- access aux résultats d'un sondage restreint avec un admin connecté (OK) + +Création d'un sondage (free + text) +----------------------------------- + +- creation avec champs obligatoires remplis (OK) +- creation avec Titre non rempli (KO) +- creation avec aucun choix proposé (KO) +- creation avec deux choix identiques (KO) +- creation avec Date de fin < Date de début (KO) +- creation avec Date de fin antérieur à maintenant (KO) (TODO) +- creation avec Ajout de choix Date de fin < Date de début (KO) +- creation avec Ajout de choix Date de fin antérieur à maintenant (KO) +- creation avec Ajout de choix cochez et remplit + decochez (les dates doivent être supprimées) (OK) (TODO) +- creation avec email invalide (KO) +- creation avec heure avant la fin de sondage <=0 (KO) (TODO) +- TODO Mettre un warning si date de fin proche... (new feature) +- creation avec nombre de choix <=0 (KO) (TODO : pffff quand on veut voter on a un message Le nombre de choix maximal est de -5....) +- TODO Par défaut mettre au moins 1 + +- TODO Quand on déchoche alors il faut desactiver les champs concernés (et pas uniquement les cacher) + +Création d'un sondage (free + date) +----------------------------------- + +- creation avec aucun choix proposé (KO) +- creation avec deux choix identiques (KO) +- creation d'un sondage de Date avec mauvais format (KO) + +Création d'un sondage (free + image) +------------------------------------ + +- creation avec aucun choix proposé (KO) +- creation d'un sondage d'Image avec mauvais mimetype (KO) (TODO) +- creation avec deux images au nom identiques (KO) (TODO) +- TODO Mettre une image avec une croix ROUGE!!! quand pas chargée + +Création d'un sondage (restreint + text) +---------------------------------------- + +- création sans participant (KO) +- création avec deux participants ayant le même nom (KO) +- création avec deux participants ayant le même email (KO) +- création avec un participants ayant juste un email et pas de nom (KO) (TODO : pollenTechincalException) +- création avec un participants ayant juste un nom et pas d'email (KO) +- TODO problème d'enregistrement des plusieurs votants, le dernier est conservé et dupliqué. +- TODO L'email envoyé n'est pas le bon (il manque le token d'account) + la sécurité ne va pas car je ne dois pas avoir accès à ce sondage + +Création d'un sondage (group + text) +---------------------------------------- + +- création sans nom de groupe (KO) +- création avec deux participants ayant le même nom (KO) +- création avec deux participants ayant le même email (KO) +- création avec un participants ayant juste un email et pas de nom (KO) (TODO : pollenTechincalException) +- création avec un participants ayant juste un nom et pas d'email (KO) +- TODO problème d'enregistrement des plusieurs votants, le dernier est conservé et dupliqué. +- TODO Revoir l'enregistrement (le groupe 2 est perdu...) + + +Edition d'un sondage +--------------------- + +- edition avec champs titre vidé (OK) +- edition avec modification date de fin antérieure à maintenant (KO) +- edition avec suppression de tous les choix (KO) + +Page de résumé d'un sondage +--------------------------- + +- TODO supprimer les // dans les urls + Property changes on: trunk/doc/tests.rst ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r3445 - trunk
by tchemit＠users.chorem.org 11 Jun '12

11 Jun '12

Author: tchemit Date: 2012-06-11 15:32:27 +0200 (Mon, 11 Jun 2012) New Revision: 3445 Url: http://chorem.org/repositories/revision/pollen/3445 Log: updates to nuiton-utils 2.5 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-11 10:27:02 UTC (rev 3444) +++ trunk/pom.xml 2012-06-11 13:32:27 UTC (rev 3445) @@ -183,7 +183,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> - <nuitonUtilsVersion>2.5-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5</nuitonUtilsVersion> <h2Version>1.3.167</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.4</struts2Version>

1 0

r3444 - in trunk: . src/site/fr/resources src/site/fr/rst src/site/resources src/site/rst
by tchemit＠users.chorem.org 11 Jun '12

11 Jun '12

Author: tchemit Date: 2012-06-11 12:27:02 +0200 (Mon, 11 Jun 2012) New Revision: 3444 Url: http://chorem.org/repositories/revision/pollen/3444 Log: - use last snapshot of nuiton-utils - fix rst warning Removed: trunk/src/site/fr/resources/images/ trunk/src/site/resources/images/ Modified: trunk/pom.xml trunk/src/site/fr/rst/configure.rst trunk/src/site/fr/rst/depouillement.rst trunk/src/site/fr/rst/index.rst trunk/src/site/fr/rst/install.rst.vm trunk/src/site/rst/configure.rst trunk/src/site/rst/index.rst trunk/src/site/rst/methods.rst Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-11 07:05:22 UTC (rev 3443) +++ trunk/pom.xml 2012-06-11 10:27:02 UTC (rev 3444) @@ -183,7 +183,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> - <nuitonUtilsVersion>2.4.9-SNAPSHOT</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5-SNAPSHOT</nuitonUtilsVersion> <h2Version>1.3.167</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.4</struts2Version> Modified: trunk/src/site/fr/rst/configure.rst =================================================================== --- trunk/src/site/fr/rst/configure.rst 2012-06-11 07:05:22 UTC (rev 3443) +++ trunk/src/site/fr/rst/configure.rst 2012-06-11 10:27:02 UTC (rev 3444) @@ -20,6 +20,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Configurer Pollen ~~~~~~~~~~~~~~~~~ Modified: trunk/src/site/fr/rst/depouillement.rst =================================================================== --- trunk/src/site/fr/rst/depouillement.rst 2012-06-11 07:05:22 UTC (rev 3443) +++ trunk/src/site/fr/rst/depouillement.rst 2012-06-11 10:27:02 UTC (rev 3444) @@ -20,6 +20,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Les méthodes de dépouillement de Pollen ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Modified: trunk/src/site/fr/rst/index.rst =================================================================== --- trunk/src/site/fr/rst/index.rst 2012-06-11 07:05:22 UTC (rev 3443) +++ trunk/src/site/fr/rst/index.rst 2012-06-11 10:27:02 UTC (rev 3444) @@ -20,6 +20,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Bienvenue sur le site de Pollen ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Modified: trunk/src/site/fr/rst/install.rst.vm =================================================================== --- trunk/src/site/fr/rst/install.rst.vm 2012-06-11 07:05:22 UTC (rev 3443) +++ trunk/src/site/fr/rst/install.rst.vm 2012-06-11 10:27:02 UTC (rev 3444) @@ -21,6 +21,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Installer Pollen ~~~~~~~~~~~~~~~~ Modified: trunk/src/site/rst/configure.rst =================================================================== --- trunk/src/site/rst/configure.rst 2012-06-11 07:05:22 UTC (rev 3443) +++ trunk/src/site/rst/configure.rst 2012-06-11 10:27:02 UTC (rev 3444) @@ -20,6 +20,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Configure Pollen ~~~~~~~~~~~~~~~~ Modified: trunk/src/site/rst/index.rst =================================================================== --- trunk/src/site/rst/index.rst 2012-06-11 07:05:22 UTC (rev 3443) +++ trunk/src/site/rst/index.rst 2012-06-11 10:27:02 UTC (rev 3444) @@ -20,6 +20,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Welcome to Pollen website ~~~~~~~~~~~~~~~~~~~~~~~~~ Modified: trunk/src/site/rst/methods.rst =================================================================== --- trunk/src/site/rst/methods.rst 2012-06-11 07:05:22 UTC (rev 3443) +++ trunk/src/site/rst/methods.rst 2012-06-11 10:27:02 UTC (rev 3444) @@ -20,6 +20,7 @@ .. * along with this program. If not, see <http://www.gnu.org/licenses/>. .. * #L% .. - + Pollen's votecounting methods ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

1 0

r3443 - trunk
by tchemit＠users.chorem.org 11 Jun '12

11 Jun '12

Author: tchemit Date: 2012-06-11 09:05:22 +0200 (Mon, 11 Jun 2012) New Revision: 3443 Url: http://chorem.org/repositories/revision/pollen/3443 Log: updates to mavenpom 3.3.3 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-11 06:47:02 UTC (rev 3442) +++ trunk/pom.xml 2012-06-11 07:05:22 UTC (rev 3443) @@ -12,7 +12,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.3-SNAPSHOT</version> + <version>3.3.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r3442 - in trunk: pollen-persistence/src/main/java/org/chorem/pollen/business/persistence pollen-services/src/main/java/org/chorem/pollen/entities/migration pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll
by tchemit＠users.chorem.org 11 Jun '12

11 Jun '12

Author: tchemit Date: 2012-06-11 08:47:02 +0200 (Mon, 11 Jun 2012) New Revision: 3442 Url: http://chorem.org/repositories/revision/pollen/3442 Log: fixes #173: [Vote] Montrer les votes dans l'ordre chronologique inverse Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-06-10 22:20:02 UTC (rev 3441) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/business/persistence/VoteDAOImpl.java 2012-06-11 06:47:02 UTC (rev 3442) @@ -37,6 +37,40 @@ /** Logger. */ private static final Log log = LogFactory.getLog(VoteDAOImpl.class); + public List<E> getAllVotes(Poll poll) throws TopiaException { + + Preconditions.checkNotNull(poll); + List<E> results; + + // No need to load votes for an anonymous poll + if (poll.isAnonymous()) { + + results = Lists.newArrayList(); + } else { + + // FIXME-FD20100309 : change model to suppress link from poll to vote + // It's not necessary to have votes when retrieving the poll, this + // method do this job only when it's needed + +// if (log.isDebugEnabled()) { +// log.debug("Load votes for poll with uid = " + poll.getPollId()); +// log.debug("LIMIT : startIndex = " + startIndex + " _ " + +// "endIndex = " + endIndex); +// } + + // FIXME : refactor this to use TopiaQuery from ToPIA 2.3 + // Order the results by creation date (the last vote done will be + // at the end of the list) + TopiaQuery query = createQuery("e"). + addFrom(Poll.class, "p"). + addWhere("p", TopiaQuery.Op.EQ, poll). + addWhere("e in elements (p." + Poll.PROPERTY_VOTE + ")"). + addOrder("e.topiaCreateDate DESC"); + results = findAllByQuery(query); + } + return results; + } + public List<E> getVotesByPoll(Poll poll, TopiaFilterPagerUtil.FilterPagerBean pager) throws TopiaException { @@ -68,7 +102,7 @@ addFrom(Poll.class, "p"). addWhere("p", TopiaQuery.Op.EQ, poll). addWhere("e in elements (p." + Poll.PROPERTY_VOTE + ")"). - addOrder("topiaCreateDate"); + addOrder("e.topiaCreateDate"); TopiaFilterPagerUtil.addPagerToQuery(query, pager); results = findAllByQuery(query); } @@ -83,7 +117,7 @@ addWhere("p", TopiaQuery.Op.EQ, poll). addWhere("e in elements(p." + Poll.PROPERTY_VOTE + ")"). addWhere("e.pollAccount.votingId", TopiaQuery.Op.EQ, votingId). - addOrder("topiaCreateDate"); + addOrder("e.topiaCreateDate"); boolean result = existByQuery(query); return result; } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-06-10 22:20:02 UTC (rev 3441) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-06-11 06:47:02 UTC (rev 3442) @@ -94,8 +94,16 @@ // add unique on Poll.pollId and PollAccount.accountId (http://www.chorem.org/issues/583) addUniqueOnPollIds(queries); + + // Change to type 'timestamp' the topiacreatdate to have nice order (for vote and comment) (http://chorem.org/issues/173) + addTimestampOnTopiaCreateDate(queries); } + private void addTimestampOnTopiaCreateDate(List<String> queries) { + queries.add("alter TABLE vote ALTER COLUMN topiacreatedate type timestamp;"); + queries.add("alter TABLE comment ALTER COLUMN topiacreatedate type timestamp;"); + } + private void addUniqueOnPollIds(List<String> queries) { queries.add("CREATE UNIQUE INDEX idx_Pöll_pollId ON poll(pollId);"); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-06-10 22:20:02 UTC (rev 3441) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/VoteService.java 2012-06-11 06:47:02 UTC (rev 3442) @@ -355,6 +355,17 @@ pollFeedService.onVoteDeleted(poll, entityToDelete, voteAccount, reason); } + public List<Vote> getAllVotes(Poll poll) { + try { + VoteDAO dao = getDAO(Vote.class); + List<Vote> results = dao.getAllVotes(poll); + return results; + + } catch (TopiaException e) { + throw new PollenTechnicalException("Could not obtain votes", e); + } + } + public List<Vote> getVotesByPoll(Poll poll, TopiaFilterPagerUtil.FilterPagerBean pager) { try { Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-10 22:20:02 UTC (rev 3441) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-11 06:47:02 UTC (rev 3442) @@ -43,7 +43,6 @@ import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.chorem.pollen.ui.actions.PageSkin; -import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; @@ -301,11 +300,8 @@ // All votes // TODO no pagination for the moment, need to retrieve the correct page depends on current pollAccount - votes = poll.getVote(); + votes = getVoteService().getAllVotes(poll); - // votes are loaded by topiaCreateDate but we want the reverse order. - Collections.reverse(votes); - voteAllowed = getVoteService().isVoteAllowed(poll, pollAccount); // Current vote

1 0

r3441 - trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll
by tchemit＠users.chorem.org 10 Jun '12

10 Jun '12

Author: tchemit Date: 2012-06-11 00:20:02 +0200 (Mon, 11 Jun 2012) New Revision: 3441 Url: http://chorem.org/repositories/revision/pollen/3441 Log: fixes #173: [Vote] Montrer les votes dans l'ordre chronologique inverse Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-10 22:19:42 UTC (rev 3440) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-10 22:20:02 UTC (rev 3441) @@ -43,6 +43,7 @@ import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.chorem.pollen.ui.actions.PageSkin; +import java.util.Collections; import java.util.Date; import java.util.List; import java.util.Map; @@ -302,6 +303,9 @@ // TODO no pagination for the moment, need to retrieve the correct page depends on current pollAccount votes = poll.getVote(); + // votes are loaded by topiaCreateDate but we want the reverse order. + Collections.reverse(votes); + voteAllowed = getVoteService().isVoteAllowed(poll, pollAccount); // Current vote

1 0