Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
119 commits
Select commit Hold shift + click to select a range
2e2ea43
MOTECH-2895: Migrate PR jobs to Travis
mkruszynski Sep 7, 2016
6922949
MOTECH-2895: 2nd try
mkruszynski Sep 7, 2016
9e84722
MOTECH-2895: 3rd try
mkruszynski Sep 7, 2016
3d896cb
MOTECH-2895: 4rth try
mkruszynski Sep 7, 2016
7cce2ae
MOTECH-2895: 4rth try
mkruszynski Sep 7, 2016
e419bc2
MOTECH-2895: 5th try
mkruszynski Sep 7, 2016
95ba5df
MOTECH-2895: 6th try
mkruszynski Sep 7, 2016
6a60728
MOTECH-2895: 8th try
mkruszynski Sep 7, 2016
c8bb65e
MOTECH-2895: 9th try
mkruszynski Sep 7, 2016
829a073
MOTECH-2895: 10th try
mkruszynski Sep 7, 2016
a299ad8
MOTECH-2895: 11th try
mkruszynski Sep 7, 2016
ff68025
MOTECH-2895: 12th try
mkruszynski Sep 7, 2016
4815e03
MOTECH-2895: 13th try
mkruszynski Sep 7, 2016
3b01a03
MOTECH-2895: 14th try
mkruszynski Sep 7, 2016
7d83f29
MOTECH-2895: 15th try
mkruszynski Sep 7, 2016
6e7e370
MOTECH-2895: 16th try
mkruszynski Sep 7, 2016
1a1eb59
MOTECH-2895: 17th try
mkruszynski Sep 7, 2016
88d98bf
MOTECH-2895: 18th try
mkruszynski Sep 7, 2016
a24f68c
MOTECH-2895: 19th try
mkruszynski Sep 7, 2016
00ea640
MOTECH-2895: 20th try
mkruszynski Sep 7, 2016
59aef0e
MOTECH-2895: 21th try
mkruszynski Sep 7, 2016
421b504
MOTECH-2895: 23th try
mkruszynski Sep 8, 2016
2e22557
MOTECH-2895: 23th try
mkruszynski Sep 8, 2016
38db810
MOTECH-2895: 24th try
mkruszynski Sep 8, 2016
a97bb24
MOTECH-2895: 25th try
mkruszynski Sep 8, 2016
5d0355a
MOTECH-2895: 26th try
mkruszynski Sep 8, 2016
6a468ae
MOTECH-2895: 27th try
mkruszynski Sep 8, 2016
7a9b5c4
MOTECH-2895: 28th try
mkruszynski Sep 8, 2016
eddc066
MOTECH-2895: 28th try
mkruszynski Sep 8, 2016
40576ce
MOTECH-2895: 29th try
mkruszynski Sep 8, 2016
35c6fa3
MOTECH-2895: 29th try
mkruszynski Sep 8, 2016
5c560e2
MOTECH-2895: 20th try
mkruszynski Sep 8, 2016
3fa9908
MOTECH-2895: 30th try
mkruszynski Sep 8, 2016
e029950
MOTECH-2895: 31th try
mkruszynski Sep 8, 2016
765e175
MOTECH-2895: 32th try
mkruszynski Sep 8, 2016
e0e433f
MOTECH-2895: 33th try
mkruszynski Sep 8, 2016
830fc4a
MOTECH-2895: 34th try
mkruszynski Sep 8, 2016
65e8fc6
MOTECH-2895: 35th try
mkruszynski Sep 8, 2016
f472fe4
MOTECH-2895: 36th try
mkruszynski Sep 8, 2016
013d262
MOTECH-2895: 37th try
mkruszynski Sep 8, 2016
c809506
MOTECH-2895: 38th try
mkruszynski Sep 8, 2016
47910b9
MOTECH-2895: 39th try
mkruszynski Sep 8, 2016
65d7626
MOTECH-2895: 40th try
mkruszynski Sep 8, 2016
cf49bbe
MOTECH-2895: 41th try
mkruszynski Sep 8, 2016
7025d18
MOTECH-2895: 42th try
mkruszynski Sep 8, 2016
9a03d53
MOTECH-2895: 43th try
mkruszynski Sep 8, 2016
ab9c7dc
MOTECH-2895: 44th try
mkruszynski Sep 8, 2016
1277f1a
MOTECH-2895: 45th try
mkruszynski Sep 8, 2016
b270126
MOTECH-2895: 46th try
mkruszynski Sep 8, 2016
4417342
MOTECH-2895: 47th try
mkruszynski Sep 8, 2016
5927f6b
MOTECH-2895: 48th try
mkruszynski Sep 8, 2016
10a7ef3
MOTECH-2895: 49th try
mkruszynski Sep 8, 2016
ed9b6db
MOTECH-2895: 50th try
mkruszynski Sep 8, 2016
8bb7a65
MOTECH-2895: 51th try
mkruszynski Sep 8, 2016
291fe77
MOTECH-2895: 52th try
mkruszynski Sep 8, 2016
00c1ac4
MOTECH-2895: 53th try
mkruszynski Sep 8, 2016
014b888
MOTECH-2895: 54th try
mkruszynski Sep 8, 2016
824f5f0
MOTECH-2895: 55th try
mkruszynski Sep 8, 2016
d8d5f5e
MOTECH-2895: 56th try
mkruszynski Sep 8, 2016
c3f15ab
MOTECH-2895: 57th try
mkruszynski Sep 8, 2016
725dbcc
MOTECH-2895: 58th try
mkruszynski Sep 8, 2016
0794230
MOTECH-2895: 59th try
mkruszynski Sep 8, 2016
e517fbd
MOTECH-2895: 60th try
mkruszynski Sep 8, 2016
c5fae1b
MOTECH-2895: 61th try
mkruszynski Sep 8, 2016
b31b8b4
MOTECH-2895: 62th try
mkruszynski Sep 8, 2016
ef48614
MOTECH-2895: 63th try
mkruszynski Sep 8, 2016
3794110
MOTECH-2895: 64th try
mkruszynski Sep 8, 2016
fc37553
MOTECH-2895: 65th try
mkruszynski Sep 8, 2016
68f8cf6
MOTECH-2895: 66th try
mkruszynski Sep 8, 2016
0762b47
MOTECH-2895: 67th try
mkruszynski Sep 8, 2016
8a9dde4
MOTECH-2895: 68th try
mkruszynski Sep 8, 2016
2bf4ce6
MOTECH-2895: 69th try
mkruszynski Sep 8, 2016
e3ee689
MOTECH-2895: 70th try
mkruszynski Sep 8, 2016
16a5815
MOTECH-2895: 71th try
mkruszynski Sep 8, 2016
2af38a8
MOTECH-2895: 72th try
mkruszynski Sep 9, 2016
8589d2d
MOTECH-2895: 73th try
mkruszynski Sep 9, 2016
f195958
MOTECH-2895: 74th try
mkruszynski Sep 9, 2016
c55bd14
MOTECH-2895: 75th try
mkruszynski Sep 9, 2016
eb2177e
MOTECH-2895: 76th try
mkruszynski Sep 9, 2016
4116581
MOTECH-2895: 77th try
mkruszynski Sep 9, 2016
1e4a9f8
MOTECH-2895: 78th try
mkruszynski Sep 9, 2016
f4ec4ff
MOTECH-2895: 79th try
mkruszynski Sep 9, 2016
50df971
MOTECH-2895: 80th try
mkruszynski Sep 9, 2016
7001ba2
MOTECH-2895: 81th try
mkruszynski Sep 9, 2016
834564d
MOTECH-2895: 82th try
mkruszynski Sep 9, 2016
d43c9c2
MOTECH-2895: 83th try
mkruszynski Sep 9, 2016
48411af
MOTECH-2895: 84th try
mkruszynski Sep 9, 2016
b91af57
MOTECH-2895: 85th try
mkruszynski Sep 9, 2016
5c3cfe4
MOTECH-2895: 86th try
mkruszynski Sep 9, 2016
fb42df3
MOTECH-2895: 87th try
mkruszynski Sep 9, 2016
f89ee1e
MOTECH-2895: 87th try
mkruszynski Sep 9, 2016
36097d3
MOTECH-2895: 88th try
mkruszynski Sep 9, 2016
08f6d18
MOTECH-2895: 89th try
mkruszynski Sep 9, 2016
a140bc4
MOTECH-2895: 90th try
mkruszynski Sep 9, 2016
c6738d7
MOTECH-2895: 91th try
mkruszynski Sep 9, 2016
e82415c
MOTECH-2895: 92th try
mkruszynski Sep 9, 2016
4de8a14
MOTECH-2895: 93th try
mkruszynski Sep 9, 2016
f55c45e
MOTECH-2895: 94th try
mkruszynski Sep 9, 2016
c99c4a7
MOTECH-2895: 95th try
mkruszynski Sep 9, 2016
515a4c4
MOTECH-2895: 96th try
mkruszynski Sep 9, 2016
134dfee
MOTECH-2895: 97th try
mkruszynski Sep 9, 2016
97e528b
MOTECH-2895: 98th try
mkruszynski Sep 9, 2016
3bd4a07
MOTECH-2895: 99th try
mkruszynski Sep 9, 2016
d6b59dc
MOTECH-2895: 100th try
mkruszynski Sep 9, 2016
52c7f4e
MOTECH-2895: 101th try
mkruszynski Sep 9, 2016
b3a6e0c
MOTECH-2895: 102nd try
mkruszynski Sep 9, 2016
97cfe65
MOTECH-2895: 103rd try
mkruszynski Sep 9, 2016
ebfbf83
MOTECH-2895: 104th try
mkruszynski Sep 9, 2016
9fcb534
MOTECH-2895: 105th try
mkruszynski Sep 9, 2016
e8c559a
MOTECH-2895: 106th try
mkruszynski Sep 12, 2016
3f18f50
MOTECH-2895: 107th try
mkruszynski Sep 12, 2016
5b96061
MOTECH-2895: 108th try
mkruszynski Sep 12, 2016
1a9d2f8
MOTECH-2895: 109th try
mkruszynski Sep 12, 2016
1782e2a
MOTECH-2895: 110th try
mkruszynski Sep 12, 2016
fc5951a
MOTECH-2895: 111th try
mkruszynski Sep 12, 2016
73d1ed0
MOTECH-2895: 112th try
mkruszynski Sep 12, 2016
53b3b53
MOTECH-2895: 113th try
mkruszynski Sep 12, 2016
2f85f4f
MOTECH-2895: 114th try
mkruszynski Sep 12, 2016
faa78e0
MOTECH-2895: 115th try
mkruszynski Sep 12, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
language: java
jdk:
- oraclejdk8

env:
- DB=mysql
- DB=psql

services:
- mysql
- postgresql

before_install:
- sudo chmod +x ./config_services.sh
- ./config_services.sh

install: true

script:
- sudo chmod +x ./run_build.sh
- ./run_build.sh

cache:
directories:
- $HOME/.m2
9 changes: 9 additions & 0 deletions config_services.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/usr/bin/env bash

sudo apt-get update -qq

#Installation and configuration of ActiveMQ
sudo apt-get install -y activemq -qq
sudo ln -s /etc/activemq/instances-available/main /etc/activemq/instances-enabled/main
sudo sed -e 's/<broker /<broker schedulerSupport="true" /' -i /etc/activemq/instances-enabled/main/activemq.xml
sudo service activemq restart
12 changes: 12 additions & 0 deletions run_build.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
#!/usr/bin/env bash

if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
mkdir ~/.motech
cp ./testdata/config-locations.properties ~/.motech
if [ "$DB" = "mysql" ]; then
echo "USE mysql;\nUPDATE user SET password=PASSWORD('password') WHERE user='root';\nFLUSH PRIVILEGES\n" | mysql -u root
mvn clean install -PIT -U
elif [ "$DB" = "psql" ]; then
mvn -Dmotech.sql.password=password -Dmotech.sql.user=postgres -Dmaven.test.failure.ignore=false -Dmotech.sql.driver=org.postgresql.Driver -Dmotech.sql.dbtype=psql -Dmotech.sql.url=jdbc:postgresql://localhost:5432/ clean install -PIT -U
fi
fi
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import org.springframework.web.context.WebApplicationContext;

import javax.inject.Inject;
import java.util.Collections;
import java.util.List;
import java.util.Map;

Expand Down Expand Up @@ -234,8 +235,11 @@ public void shouldReturnEnrollmentsThatWereCompletedDuringTheGivenTimeRange() {
DateTime start = newDateTime(today.minusWeeks(1), new Time(0, 0));
DateTime end = newDateTime(today, new Time(0, 0));
List<Enrollment> filteredEnrollments = allEnrollments.completedDuring(start, end);
List<String> extractedEnrollments = Lambda.extract(filteredEnrollments, on(Enrollment.class).getExternalId());
Collections.sort(extractedEnrollments);

assertNotNull(filteredEnrollments.get(0).getSchedule());
assertEquals(asList(new String[] { "entity_2", "entity_3" }), Lambda.extract(filteredEnrollments, on(Enrollment.class).getExternalId()));
assertEquals(asList(new String[] { "entity_2", "entity_3" }), extractedEnrollments);
}

private Enrollment createEnrollment(final String externalId, final String scheduleName, final String currentMilestoneName, final DateTime referenceDateTime, final DateTime enrollmentDateTime, final Time preferredAlertTime, final EnrollmentStatus enrollmentStatus, final Map<String,String> metadata) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,7 @@
import org.springframework.web.context.WebApplicationContext;

import javax.inject.Inject;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

import static ch.lambdaj.Lambda.extract;
import static ch.lambdaj.Lambda.on;
Expand Down Expand Up @@ -172,7 +169,10 @@ public void shouldFindEnrollmentsByMetadataProperties() {
metadata.put("fuu", "qux");
createEnrollment("entity5", "Delivery", "milestone1", newDateTime(2010, 1, 1, 0, 0, 0), newDateTime(2010, 1, 1, 0, 0, 0), new Time(0, 0), EnrollmentStatus.ACTIVE, metadata);

assertEquals(asList(new String[]{ "entity1", "entity3" }), extract(allEnrollments.findByMetadataProperty("foo", "bar"), on(Enrollment.class).getExternalId()));
List<String> extractedEnrollments = extract(allEnrollments.findByMetadataProperty("foo", "bar"), on(Enrollment.class).getExternalId());
Collections.sort(extractedEnrollments);

assertEquals(asList(new String[]{ "entity1", "entity3" }), extractedEnrollments);
assertEquals(asList(new String[] { "entity4" }), extract(allEnrollments.findByMetadataProperty("fuu", "boz"), on(Enrollment.class).getExternalId()));
}

Expand Down