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