diff --git a/.travis.yml b/.travis.yml index e77dd3585..bc92e4006 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,3 +14,5 @@ before_script: - cp ./tools/travis-ci/log4j.properties ./test/ notifications: email: false +before_install: + - export TZ=Asia/Shanghai diff --git a/circle.yml b/circle.yml new file mode 100644 index 000000000..ebbfbda98 --- /dev/null +++ b/circle.yml @@ -0,0 +1,18 @@ +machine: + timezone: Asia/Shanghai + java: + version: oraclejdk8 + +general: + branches: + only: + - master + +dependencies: + override: + - cp ./tools/travis-ci/nutz-test.properties ./test/ + - cp ./tools/travis-ci/log4j.properties ./test/ + +database: + override: + - psql -c 'create database nutztest;' -U ubuntu diff --git a/test/org/nutz/mvc/testapp/adaptor/SimpleAdaptorTest.java b/test/org/nutz/mvc/testapp/adaptor/SimpleAdaptorTest.java index a4fc9ee45..412917552 100644 --- a/test/org/nutz/mvc/testapp/adaptor/SimpleAdaptorTest.java +++ b/test/org/nutz/mvc/testapp/adaptor/SimpleAdaptorTest.java @@ -3,6 +3,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import java.util.TimeZone; + import org.junit.Test; import org.nutz.lang.Times; import org.nutz.mvc.testapp.BaseWebappTest; @@ -14,7 +16,7 @@ public void test_issue_543() { get("/adaptor/github/issue/543?d=20120924"); assertEquals(200, resp.getStatus()); - long ms = Times.ams("2012-09-24"); + long ms = Times.ams("2012-09-24", TimeZone.getTimeZone("Asia/Shanghai")); long rems = Long.parseLong(resp.getContent()); assertEquals(ms, rems); }