Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04536004 authored by Jonathan Klee's avatar Jonathan Klee
Browse files

Merge branch '0000-a16-execute-unit-tests-on-ci' into 'master'

ci: execute unit tests on MR

See merge request !38
parents 6fd3f561 2925d1e7
Loading
Loading
Loading
Loading
Loading
+12 −1
Original line number Diff line number Diff line
@@ -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
@@ -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
+3 −1
Original line number Diff line number Diff line
@@ -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;
@@ -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));
    }
}