Skip to content

Commit 1331d7c

Browse files
authored
Update ports and profiles (#222)
* ensure all abstract test classes are indeed abstract * update default port * add profile to script
1 parent b911d5d commit 1331d7c

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

klass-api/src/test/java/no/ssb/klass/api/migration/MigrationTestConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public class MigrationTestConfig {
44

55
public static String getSourceHost() {
66
return System.getProperty("source.service.host",
7-
System.getenv().getOrDefault("SOURCE_SERVICE_HOST", "http://localhost:8081"));
7+
System.getenv().getOrDefault("SOURCE_SERVICE_HOST", "http://localhost:8082"));
88
}
99

1010
public static String getTargetHost() {

klass-api/src/test/java/no/ssb/klass/api/migration/dataintegrity/changes/AbstractKlassApiChanges.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import static no.ssb.klass.api.migration.MigrationTestUtils.formatter;
1212
import static no.ssb.klass.api.migration.MigrationTestUtils.generateRandomDate;
1313

14-
public class AbstractKlassApiChanges extends AbstractKlassApiDataIntegrityTest {
14+
public abstract class AbstractKlassApiChanges extends AbstractKlassApiDataIntegrityTest {
1515
static LocalDate date;
1616

1717
static String dateFrom;

klass-api/src/test/java/no/ssb/klass/api/migration/dataintegrity/corresponds/AbstractKlassApiCorrespondsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import static no.ssb.klass.api.migration.MigrationTestConstants.*;
1212

13-
public class AbstractKlassApiCorrespondsTest extends AbstractKlassApiDataIntegrityTest {
13+
public abstract class AbstractKlassApiCorrespondsTest extends AbstractKlassApiDataIntegrityTest {
1414

1515
String getCorrespondsAtPath(Integer id) {
1616
return CLASSIFICATIONS_PATH + "/"+ id + "/" + CORRESPONDS_AT;

klass-api/src/test/java/no/ssb/klass/api/migration/dataintegrity/families/AbstractKlassApiFamiliesTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import static no.ssb.klass.api.migration.MigrationTestConstants.*;
1212
import static no.ssb.klass.api.migration.MigrationTestUtils.generateRandomId;
1313

14-
public class AbstractKlassApiFamiliesTest extends AbstractKlassApiDataIntegrityTest {
14+
public abstract class AbstractKlassApiFamiliesTest extends AbstractKlassApiDataIntegrityTest {
1515

1616
static Stream<Integer> rangeProviderClassificationFamilyIds() {
1717
return IntStream.rangeClosed(0, 30).boxed();

klass-api/src/test/java/no/ssb/klass/api/migration/dataintegrity/versions/AbstractKlassApiVersions.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import static no.ssb.klass.api.migration.MigrationTestConstants.VERSIONS;
1010
import static no.ssb.klass.api.migration.MigrationTestUtils.generateRandomId;
1111

12-
public class AbstractKlassApiVersions extends AbstractKlassApiDataIntegrityTest {
12+
public abstract class AbstractKlassApiVersions extends AbstractKlassApiDataIntegrityTest {
1313
static Integer randomId;
1414
String getVersionByIdPath(Integer id) {
1515
return "/" + VERSIONS + "/" + id;

klass-shared/init-migration.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ source .env
66
set +a
77

88
# Start containers
9-
docker compose up -d
9+
docker compose --profile migrate-data up -d
1010

1111
echo "Wait for mariadb to be ready"
1212
sleep 10
1313

1414
echo "Load data from file to mariadb database"
15-
docker compose exec -T mariadb mariadb -u root -p"$MARIADB_ROOT_PASSWORD" --host=127.0.0.1 klass < "$MARIADB_LOCAL_FILEPATH"
15+
docker compose --profile migrate-data exec -T mariadb mariadb -u root -p"$MARIADB_ROOT_PASSWORD" --host=127.0.0.1 klass < "$MARIADB_LOCAL_FILEPATH"
1616

1717
echo "Wait for load from file to finish"
1818
sleep 10
@@ -26,7 +26,7 @@ sleep 10
2626
# Run necessary postgresql alteration on type timestamp to remove microseconds
2727
echo "Alter columns of type timestamp"
2828
docker cp alter_timestamp.sql "$(docker compose ps -q postgresql)":/tmp/alter_timestamp.sql
29-
docker compose exec -T postgresql psql -U klass -d klass -f /tmp/alter_timestamp.sql
29+
docker compose --profile migrate-data exec -T postgresql psql -U klass -d klass -f /tmp/alter_timestamp.sql
3030

3131
echo "Dump data from postgres database to file"
3232
pg_dump -U klass -h localhost -p 5432 klass > "$POSTGRES_LOCAL_FILEPATH"/"$POSTGRES_DUMP_FILENAME"

0 commit comments

Comments
 (0)