提交 f7c9d289 编写于 作者: C Calvin

徹底fix cases,比如cxf如果想用jackson, cxf 2.7.5只能配jackson 2.1.4,...

徹底fix cases,比如cxf如果想用jackson, cxf 2.7.5只能配jackson 2.1.4, 要2.7.6-snapshot才能配jackson 2.2.2,比如H2的URL要多加一句close
上级 dffc9dbb
language: java
script:
- mvn test
- mvn antrun:run -Prefresh-db
- mvn test -Pfunctional-test -Dselenium.driver=firefox
env: MAVEN_OPTS="-XX:MaxPermSize=128m"
addons:
......
......@@ -18,7 +18,7 @@
<sitemesh.version>2.4.2</sitemesh.version>
<shiro.version>1.2.2</shiro.version>
<hibernate-validator.version>4.3.1.Final</hibernate-validator.version>
<jackson.version>2.2.2</jackson.version>
<jackson.version>2.1.5</jackson.version>
<slf4j.version>1.7.5</slf4j.version>
<logback.version>1.0.13</logback.version>
<commons-lang3.version>3.1</commons-lang3.version>
......
#h2 database settings
jdbc.driver=org.h2.Driver
jdbc.url=jdbc:h2:file:~/.h2/quickstart;AUTO_SERVER=TRUE
jdbc.url=jdbc:h2:file:~/.h2/quickstart;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1
jdbc.username=sa
jdbc.password=
#log4jdbc driver
#jdbc.url=jdbc:log4jdbc:h2:file:~/.h2/quickstart;AUTO_SERVER=TRUE
#jdbc.url=jdbc:log4jdbc:h2:file:~/.h2/quickstart;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1
#oracle database settings
#jdbc.driver=oracle.jdbc.driver.OracleDriver
......
......@@ -7,9 +7,9 @@ selenium.driver=firefox
#(optional)override jdbc url for functional test
db.type=h2
jdbc.driver=org.h2.Driver
jdbc.url=jdbc:h2:file:~/.h2/quickstart-test;AUTO_SERVER=TRUE
jdbc.url=jdbc:h2:file:~/.h2/quickstart-test;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1
jdbc.username=sa
jdbc.password=
#log4jdbc driver
#jdbc.url=jdbc:log4jdbc:h2:file:~/.h2/quickstart-test;AUTO_SERVER=TRUE
#jdbc.url=jdbc:log4jdbc:h2:file:~/.h2/quickstart-test;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1
#h2 database settings
jdbc.driver=org.h2.Driver
jdbc.url=jdbc:h2:file:~/.h2/showcase4;AUTO_SERVER=TRUE
jdbc.url=jdbc:h2:file:~/.h2/showcase4;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1
jdbc.username=sa
jdbc.password=
#log4jdbc driver
#jdbc.url=jdbc:log4jdbc:h2:file:~/.h2/showcase4;AUTO_SERVER=TRUE
#jdbc.url=jdbc:log4jdbc:h2:file:~/.h2/showcase4;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1
quartz.jdbc.driver=org.h2.Driver
quartz.jdbc.url=jdbc:h2:file:~/.h2/showcase-quartz4;AUTO_SERVER=TRUE
quartz.jdbc.url=jdbc:h2:file:~/.h2/showcase-quartz4;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1
quartz.jdbc.username=sa
quartz.jdbc.password=
......
......@@ -11,7 +11,7 @@
<appender name="rollingFile" class="ch.qos.logback.core.rolling.RollingFileAppender">
<file>logs/quickstart.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>logs/quickstart.%d{yyyy-MM-dd}.log</fileNamePattern>
<fileNamePattern>logs/showcase.%d{yyyy-MM-dd}.log</fileNamePattern>
</rollingPolicy>
<encoder>
<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
......
......@@ -26,12 +26,12 @@ public class UserJaxRsFT extends BaseFunctionalTestCase {
@Test
public void getUser() {
UserDTO user = restTemplate.getForObject(resoureUrl + "/{id}.json", UserDTO.class, 1L);
UserDTO user = restTemplate.getForObject(resoureUrl + "/{id}.xml", UserDTO.class, 1L);
assertEquals("admin", user.getLoginName());
assertEquals("管理员", user.getName());
assertEquals(new Long(1), user.getTeamId());
user = restTemplate.getForObject(resoureUrl + "/{id}.xml", UserDTO.class, 1L);
user = restTemplate.getForObject(resoureUrl + "/{id}.json", UserDTO.class, 1L);
assertEquals("admin", user.getLoginName());
assertEquals("管理员", user.getName());
assertEquals(new Long(1), user.getTeamId());
......
......@@ -7,15 +7,15 @@ selenium.driver=firefox
#(optional)override jdbc url for functional test
db.type=h2
jdbc.driver=org.h2.Driver
jdbc.url=jdbc:h2:file:~/.h2/showcase4-test;AUTO_SERVER=TRUE
jdbc.url=jdbc:h2:file:~/.h2/showcase4-test;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1
jdbc.username=sa
jdbc.password=
#log4jdbc driver
#jdbc.url=jdbc:log4jdbc:h2:file:~/.h2/showcase4-test;AUTO_SERVER=TRUE
#jdbc.url=jdbc:log4jdbc:h2:file:~/.h2/showcase4-test;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1
quartz.jdbc.driver=org.h2.Driver
quartz.jdbc.url=jdbc:h2:file:~/.h2/showcase-quartz4-test;AUTO_SERVER=TRUE
quartz.jdbc.url=jdbc:h2:file:~/.h2/showcase-quartz4-test;AUTO_SERVER=TRUE;DB_CLOSE_DELAY=-1
quartz.jdbc.username=sa
quartz.jdbc.password=
......
......@@ -27,7 +27,7 @@
<hystrix.version>1.2.17</hystrix.version>
<hibernate-validator.version>4.3.1.Final</hibernate-validator.version>
<jolokia.version>1.1.2</jolokia.version>
<jackson.version>2.2.2</jackson.version>
<jackson.version>2.1.5</jackson.version>
<slf4j.version>1.7.5</slf4j.version>
<logback.version>1.0.13</logback.version>
<commons-lang3.version>3.1</commons-lang3.version>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册