Loading .gitlab-ci.yml +12 −1 Original line number Diff line number Diff line Loading @@ -23,6 +23,12 @@ variables: when: manual - when: never .rules_branch_or_mr: rules: &rules_branch_or_mr - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS' when: never - when: always stages: - build - gitlab_release Loading @@ -39,11 +45,16 @@ cache: build: stage: build rules: *rules_branch_or_mr script: - ./gradlew assemble lint - ./gradlew assembleRelease lintRelease testReleaseUnitTest artifacts: paths: - opentasks/build/outputs/apk/ - opentasks/build/test-results/*/TEST-*.xml - opentasks/build/reports/tests/* reports: junit: opentasks/build/test-results/*/TEST-*.xml init_submodules: stage: gitlab_release Loading opentasks-provider/src/test/java/org/dmfs/provider/tasks/processors/tasks/instancedata/DatedTest.java +3 −1 Original line number Diff line number Diff line Loading @@ -21,6 +21,7 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; import android.content.ContentValues; import java.util.TimeZone; import org.dmfs.jems.optional.elementary.Present; import org.dmfs.provider.tasks.utils.ContentValuesWithLong; import org.dmfs.rfc5545.DateTime; Loading Loading @@ -50,7 +51,8 @@ public class DatedTest { ContentValues instanceData = new Dated(new Present<>(start), "ts", "sorting", ContentValues::new).value(); assertThat(instanceData, new ContentValuesWithLong("ts", start.getTimestamp())); assertThat(instanceData, new ContentValuesWithLong("sorting", start.getInstance())); assertThat(instanceData, new ContentValuesWithLong("sorting", start.shiftTimeZone(TimeZone.getDefault()).getInstance())); assertThat(instanceData.size(), is(2)); } } Loading
.gitlab-ci.yml +12 −1 Original line number Diff line number Diff line Loading @@ -23,6 +23,12 @@ variables: when: manual - when: never .rules_branch_or_mr: rules: &rules_branch_or_mr - if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS' when: never - when: always stages: - build - gitlab_release Loading @@ -39,11 +45,16 @@ cache: build: stage: build rules: *rules_branch_or_mr script: - ./gradlew assemble lint - ./gradlew assembleRelease lintRelease testReleaseUnitTest artifacts: paths: - opentasks/build/outputs/apk/ - opentasks/build/test-results/*/TEST-*.xml - opentasks/build/reports/tests/* reports: junit: opentasks/build/test-results/*/TEST-*.xml init_submodules: stage: gitlab_release Loading
opentasks-provider/src/test/java/org/dmfs/provider/tasks/processors/tasks/instancedata/DatedTest.java +3 −1 Original line number Diff line number Diff line Loading @@ -21,6 +21,7 @@ import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; import android.content.ContentValues; import java.util.TimeZone; import org.dmfs.jems.optional.elementary.Present; import org.dmfs.provider.tasks.utils.ContentValuesWithLong; import org.dmfs.rfc5545.DateTime; Loading Loading @@ -50,7 +51,8 @@ public class DatedTest { ContentValues instanceData = new Dated(new Present<>(start), "ts", "sorting", ContentValues::new).value(); assertThat(instanceData, new ContentValuesWithLong("ts", start.getTimestamp())); assertThat(instanceData, new ContentValuesWithLong("sorting", start.getInstance())); assertThat(instanceData, new ContentValuesWithLong("sorting", start.shiftTimeZone(TimeZone.getDefault()).getInstance())); assertThat(instanceData.size(), is(2)); } }