From d43f40afa415fc4a112395f1ee0fea23ee6da06e Mon Sep 17 00:00:00 2001 From: Robin Beer Date: Wed, 16 Aug 2023 11:28:22 +0100 Subject: [PATCH 1/4] refactor(Disable auth for tests): --- pom.xml | 2 +- .../manager/gtfsplus/GtfsPlusValidationTest.java | 3 +++ .../datatools/manager/jobs/ArbitraryTransformJobTest.java | 3 +++ .../datatools/manager/jobs/AutoPublishJobTest.java | 3 +++ .../manager/jobs/DeploymentGisExportJobTest.java | 8 ++++++++ .../manager/jobs/FetchLoadFeedCombinationTest.java | 3 +++ .../conveyal/datatools/manager/jobs/GisExportJobTest.java | 8 ++++++++ .../datatools/manager/jobs/MergeFeedsJobTest.java | 3 +++ .../datatools/manager/models/FeedVersionTest.java | 3 +++ 9 files changed, 35 insertions(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index a265b5442..1566ccefa 100644 --- a/pom.xml +++ b/pom.xml @@ -268,7 +268,7 @@ com.github.conveyal gtfs-lib - f2ceb59 + f2ceb59027 diff --git a/src/test/java/com/conveyal/datatools/manager/gtfsplus/GtfsPlusValidationTest.java b/src/test/java/com/conveyal/datatools/manager/gtfsplus/GtfsPlusValidationTest.java index ac24c29bb..d1fe8924b 100644 --- a/src/test/java/com/conveyal/datatools/manager/gtfsplus/GtfsPlusValidationTest.java +++ b/src/test/java/com/conveyal/datatools/manager/gtfsplus/GtfsPlusValidationTest.java @@ -3,6 +3,7 @@ import com.conveyal.datatools.DatatoolsTest; import com.conveyal.datatools.UnitTest; import com.conveyal.datatools.manager.DataManager; +import com.conveyal.datatools.manager.auth.Auth0Connection; import com.conveyal.datatools.manager.jobs.MergeFeedsJobTest; import com.conveyal.datatools.manager.models.FeedSource; import com.conveyal.datatools.manager.models.FeedVersion; @@ -44,6 +45,7 @@ public class GtfsPlusValidationTest extends UnitTest { public static void setUp() throws IOException { // Start server if it isn't already running. DatatoolsTest.setUp(); + Auth0Connection.setAuthDisabled(true); // Create a project, feed sources, and feed versions to merge. project = new Project(); project.name = String.format("Test %s", new Date()); @@ -65,6 +67,7 @@ public static void setUp() throws IOException { @AfterAll static void tearDown() { + Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled()); project.delete(); } diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/ArbitraryTransformJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/ArbitraryTransformJobTest.java index 3bb40f228..a8924973e 100644 --- a/src/test/java/com/conveyal/datatools/manager/jobs/ArbitraryTransformJobTest.java +++ b/src/test/java/com/conveyal/datatools/manager/jobs/ArbitraryTransformJobTest.java @@ -2,6 +2,7 @@ import com.conveyal.datatools.DatatoolsTest; import com.conveyal.datatools.UnitTest; +import com.conveyal.datatools.manager.auth.Auth0Connection; import com.conveyal.datatools.manager.auth.Auth0UserProfile; import com.conveyal.datatools.manager.models.FeedRetrievalMethod; import com.conveyal.datatools.manager.models.FeedSource; @@ -65,6 +66,7 @@ public class ArbitraryTransformJobTest extends UnitTest { public static void setUp() throws IOException { // start server if it isn't already running DatatoolsTest.setUp(); + Auth0Connection.setAuthDisabled(true); // Create a project, feed sources, and feed versions to merge. project = new Project(); @@ -81,6 +83,7 @@ public static void setUp() throws IOException { */ @AfterAll public static void tearDown() { + Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled()); // Project delete cascades to feed sources. project.delete(); } diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/AutoPublishJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/AutoPublishJobTest.java index 3c21a1599..4b15cbd56 100644 --- a/src/test/java/com/conveyal/datatools/manager/jobs/AutoPublishJobTest.java +++ b/src/test/java/com/conveyal/datatools/manager/jobs/AutoPublishJobTest.java @@ -3,6 +3,7 @@ import com.amazonaws.services.s3.model.S3ObjectSummary; import com.conveyal.datatools.DatatoolsTest; import com.conveyal.datatools.UnitTest; +import com.conveyal.datatools.manager.auth.Auth0Connection; import com.conveyal.datatools.manager.auth.Auth0UserProfile; import com.conveyal.datatools.manager.models.ExternalFeedSourceProperty; import com.conveyal.datatools.manager.models.FeedSource; @@ -52,6 +53,7 @@ public class AutoPublishJobTest extends UnitTest { public static void setUp() throws IOException { // start server if it isn't already running DatatoolsTest.setUp(); + Auth0Connection.setAuthDisabled(true); // Create a project, feed sources, and feed versions to merge. project = new Project(); @@ -76,6 +78,7 @@ public static void setUp() throws IOException { @AfterAll public static void tearDown() { + Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled()); if (project != null) { project.delete(); } diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/DeploymentGisExportJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/DeploymentGisExportJobTest.java index aea3a6f16..133864c31 100644 --- a/src/test/java/com/conveyal/datatools/manager/jobs/DeploymentGisExportJobTest.java +++ b/src/test/java/com/conveyal/datatools/manager/jobs/DeploymentGisExportJobTest.java @@ -1,11 +1,13 @@ package com.conveyal.datatools.manager.jobs; import com.conveyal.datatools.DatatoolsTest; +import com.conveyal.datatools.manager.auth.Auth0Connection; import com.conveyal.datatools.manager.auth.Auth0UserProfile; import com.conveyal.datatools.manager.models.*; import com.conveyal.datatools.manager.persistence.Persistence; import com.google.common.io.Files; +import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.BeforeAll; import org.junit.jupiter.api.Test; import org.slf4j.Logger; @@ -63,6 +65,7 @@ private File[] getFoldersFromZippedShapefile(File zipFile) throws IOException { @BeforeAll public static void setUp() throws IOException { DatatoolsTest.setUp(); + Auth0Connection.setAuthDisabled(true); // Calling GisExportJobTest.setUp() creates project and feeds GisExportJobTest.setUp(); user = Auth0UserProfile.createTestAdminUser(); @@ -72,6 +75,11 @@ public static void setUp() throws IOException { Persistence.deployments.create(deployment); } + @AfterAll + public static void tearDown() { + Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled()); + } + /** * Ensures that shapefiles containing stop features for a deployment can be exported and * contain geometry for each stop. diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/FetchLoadFeedCombinationTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/FetchLoadFeedCombinationTest.java index 56c99d32c..f7dc2a33b 100644 --- a/src/test/java/com/conveyal/datatools/manager/jobs/FetchLoadFeedCombinationTest.java +++ b/src/test/java/com/conveyal/datatools/manager/jobs/FetchLoadFeedCombinationTest.java @@ -3,6 +3,7 @@ import com.conveyal.datatools.DatatoolsTest; import com.conveyal.datatools.UnitTest; import com.conveyal.datatools.common.status.MonitorableJob; +import com.conveyal.datatools.manager.auth.Auth0Connection; import com.conveyal.datatools.manager.auth.Auth0UserProfile; import com.conveyal.datatools.manager.models.FeedSource; import com.conveyal.datatools.manager.models.FeedVersion; @@ -53,6 +54,7 @@ public class FetchLoadFeedCombinationTest extends UnitTest { public static void setUp() throws IOException { // start server if it isn't already running DatatoolsTest.setUp(); + Auth0Connection.setAuthDisabled(true); // Create a project and feed sources. project = new Project(); @@ -70,6 +72,7 @@ public static void setUp() throws IOException { @AfterAll public static void tearDown() { + Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled()); wireMockServer.stop(); if (project != null) { project.delete(); diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/GisExportJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/GisExportJobTest.java index e42976802..6d5fd163d 100644 --- a/src/test/java/com/conveyal/datatools/manager/jobs/GisExportJobTest.java +++ b/src/test/java/com/conveyal/datatools/manager/jobs/GisExportJobTest.java @@ -2,6 +2,7 @@ import com.conveyal.datatools.DatatoolsTest; import com.conveyal.datatools.UnitTest; +import com.conveyal.datatools.manager.auth.Auth0Connection; import com.conveyal.datatools.manager.auth.Auth0UserProfile; import com.conveyal.datatools.manager.models.FeedRetrievalMethod; import com.conveyal.datatools.manager.models.FeedSource; @@ -11,6 +12,7 @@ import com.conveyal.datatools.manager.utils.SqlAssert; import com.google.common.base.Strings; import com.google.common.io.Files; +import org.junit.jupiter.api.AfterAll; import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.MultiLineString; import org.locationtech.jts.geom.Point; @@ -149,6 +151,7 @@ public void validateShapefiles(File[] files, String agencyName, GisExportJob.Exp @BeforeAll public static void setUp() throws IOException { DatatoolsTest.setUp(); + Auth0Connection.setAuthDisabled(true); LOG.info("{} setup", GisExportJobTest.class.getSimpleName()); // Create a project, feed sources, and feed versions to merge. @@ -165,6 +168,11 @@ public static void setUp() throws IOException { hawaiiVersion = createFeedVersionFromGtfsZip(hawaii, "hawaii_fake_no_shapes.zip"); } + @AfterAll + public static void tearDown() { + Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled()); + } + /** * Ensures that a shapefile containing stop features for a feed version can be exported and * contains geometry for each stop. diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/MergeFeedsJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/MergeFeedsJobTest.java index 430adbfcc..50ae60586 100644 --- a/src/test/java/com/conveyal/datatools/manager/jobs/MergeFeedsJobTest.java +++ b/src/test/java/com/conveyal/datatools/manager/jobs/MergeFeedsJobTest.java @@ -2,6 +2,7 @@ import com.conveyal.datatools.DatatoolsTest; import com.conveyal.datatools.UnitTest; +import com.conveyal.datatools.manager.auth.Auth0Connection; import com.conveyal.datatools.manager.auth.Auth0UserProfile; import com.conveyal.datatools.manager.gtfsplus.GtfsPlusValidation; import com.conveyal.datatools.manager.jobs.feedmerge.MergeFeedsType; @@ -86,6 +87,7 @@ public class MergeFeedsJobTest extends UnitTest { public static void setUp() throws IOException { // start server if it isn't already running DatatoolsTest.setUp(); + Auth0Connection.setAuthDisabled(true); // Create a project, feed sources, and feed versions to merge. project = new Project(); @@ -157,6 +159,7 @@ public static void setUp() throws IOException { */ @AfterAll public static void tearDown() { + Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled()); if (project != null) { project.delete(); } diff --git a/src/test/java/com/conveyal/datatools/manager/models/FeedVersionTest.java b/src/test/java/com/conveyal/datatools/manager/models/FeedVersionTest.java index 9bbca2755..13a90b0da 100644 --- a/src/test/java/com/conveyal/datatools/manager/models/FeedVersionTest.java +++ b/src/test/java/com/conveyal/datatools/manager/models/FeedVersionTest.java @@ -2,6 +2,7 @@ import com.conveyal.datatools.DatatoolsTest; import com.conveyal.datatools.UnitTest; +import com.conveyal.datatools.manager.auth.Auth0Connection; import com.conveyal.datatools.manager.persistence.Persistence; import com.conveyal.gtfs.error.NewGTFSError; import com.conveyal.gtfs.error.NewGTFSErrorType; @@ -35,6 +36,7 @@ public class FeedVersionTest extends UnitTest { public static void setUp() throws Exception { // start server if it isn't already running DatatoolsTest.setUp(); + Auth0Connection.setAuthDisabled(true); // set up project project = new Project(); @@ -48,6 +50,7 @@ public static void setUp() throws Exception { @AfterAll public static void tearDown() { + Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled()); if (project != null) { project.delete(); } From ca60d4bfedb370ad0e7fc6b726c7527002c16499 Mon Sep 17 00:00:00 2001 From: Robin Beer Date: Wed, 16 Aug 2023 11:44:37 +0100 Subject: [PATCH 2/4] refactor(NormalizeFieldTransformJobTest): Disabled auth --- .../datatools/manager/jobs/NormalizeFieldTransformJobTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/java/com/conveyal/datatools/manager/jobs/NormalizeFieldTransformJobTest.java b/src/test/java/com/conveyal/datatools/manager/jobs/NormalizeFieldTransformJobTest.java index 8eb99259e..6a35edb56 100644 --- a/src/test/java/com/conveyal/datatools/manager/jobs/NormalizeFieldTransformJobTest.java +++ b/src/test/java/com/conveyal/datatools/manager/jobs/NormalizeFieldTransformJobTest.java @@ -1,6 +1,7 @@ package com.conveyal.datatools.manager.jobs; import com.conveyal.datatools.DatatoolsTest; +import com.conveyal.datatools.manager.auth.Auth0Connection; import com.conveyal.datatools.manager.models.FeedRetrievalMethod; import com.conveyal.datatools.manager.models.FeedSource; import com.conveyal.datatools.manager.models.FeedVersion; @@ -48,6 +49,7 @@ public class NormalizeFieldTransformJobTest extends DatatoolsTest { public static void setUp() throws IOException { // start server if it isn't already running DatatoolsTest.setUp(); + Auth0Connection.setAuthDisabled(true); // Create a project. project = createProject(); @@ -58,6 +60,7 @@ public static void setUp() throws IOException { */ @AfterAll public static void tearDown() { + Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled()); // Project delete cascades to feed sources. project.delete(); } From 89f6f11c0ac44da433ab4689797da71afbb2419c Mon Sep 17 00:00:00 2001 From: Robin Beer Date: Wed, 16 Aug 2023 12:13:07 +0100 Subject: [PATCH 3/4] refactor(Disabled auth): --- .../java/com/conveyal/datatools/HandleCorruptGTFSFileTest.java | 3 +++ .../datatools/manager/extensions/mtc/MtcFeedResourceTest.java | 3 +++ 2 files changed, 6 insertions(+) diff --git a/src/test/java/com/conveyal/datatools/HandleCorruptGTFSFileTest.java b/src/test/java/com/conveyal/datatools/HandleCorruptGTFSFileTest.java index 31aefd4fa..72e536dd4 100644 --- a/src/test/java/com/conveyal/datatools/HandleCorruptGTFSFileTest.java +++ b/src/test/java/com/conveyal/datatools/HandleCorruptGTFSFileTest.java @@ -1,6 +1,7 @@ package com.conveyal.datatools; import com.conveyal.datatools.common.status.MonitorableJob; +import com.conveyal.datatools.manager.auth.Auth0Connection; import com.conveyal.datatools.manager.jobs.LoadFeedJob; import com.conveyal.datatools.manager.jobs.ProcessSingleFeedJob; import com.conveyal.datatools.manager.jobs.ValidateFeedJob; @@ -30,10 +31,12 @@ public class HandleCorruptGTFSFileTest { public static void setUp() throws IOException { // start server if it isn't already running DatatoolsTest.setUp(); + Auth0Connection.setAuthDisabled(true); } @AfterAll public static void tearDown() { + Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled()); mockProject.delete(); } diff --git a/src/test/java/com/conveyal/datatools/manager/extensions/mtc/MtcFeedResourceTest.java b/src/test/java/com/conveyal/datatools/manager/extensions/mtc/MtcFeedResourceTest.java index 741627985..3a6cb6a31 100644 --- a/src/test/java/com/conveyal/datatools/manager/extensions/mtc/MtcFeedResourceTest.java +++ b/src/test/java/com/conveyal/datatools/manager/extensions/mtc/MtcFeedResourceTest.java @@ -2,6 +2,7 @@ import com.conveyal.datatools.DatatoolsTest; import com.conveyal.datatools.UnitTest; +import com.conveyal.datatools.manager.auth.Auth0Connection; import com.conveyal.datatools.manager.models.ExternalFeedSourceProperty; import com.conveyal.datatools.manager.models.FeedSource; import com.conveyal.datatools.manager.models.FeedVersion; @@ -50,6 +51,7 @@ class MtcFeedResourceTest extends UnitTest { static void setUp() throws IOException { // start server if it isn't already running DatatoolsTest.setUp(); + Auth0Connection.setAuthDisabled(true); // Create a project, feed sources. project = new Project(); project.name = String.format("Test %s", new Date()); @@ -69,6 +71,7 @@ static void setUp() throws IOException { @AfterAll static void tearDown() { + Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled()); wireMockServer.stop(); if (project != null) { project.delete(); From 026fa2f70d66d6a42650236cad41dda7718beb8f Mon Sep 17 00:00:00 2001 From: Robin Beer Date: Wed, 16 Aug 2023 13:52:49 +0100 Subject: [PATCH 4/4] refactor(SqlSchemaUpdaterTest): Disabled auth --- .../datatools/manager/utils/sql/SqlSchemaUpdaterTest.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/test/java/com/conveyal/datatools/manager/utils/sql/SqlSchemaUpdaterTest.java b/src/test/java/com/conveyal/datatools/manager/utils/sql/SqlSchemaUpdaterTest.java index d3050493f..c374cc010 100644 --- a/src/test/java/com/conveyal/datatools/manager/utils/sql/SqlSchemaUpdaterTest.java +++ b/src/test/java/com/conveyal/datatools/manager/utils/sql/SqlSchemaUpdaterTest.java @@ -3,6 +3,7 @@ import com.conveyal.datatools.DatatoolsTest; import com.conveyal.datatools.UnitTest; import com.conveyal.datatools.manager.DataManager; +import com.conveyal.datatools.manager.auth.Auth0Connection; import com.conveyal.datatools.manager.models.FeedSource; import com.conveyal.datatools.manager.models.FeedVersion; import com.conveyal.datatools.manager.models.Project; @@ -40,6 +41,7 @@ class SqlSchemaUpdaterTest extends UnitTest { public static void setUp() throws IOException { // start server if it isn't already running. DatatoolsTest.setUp(); + Auth0Connection.setAuthDisabled(true); // Create a project and feed sources. project = new Project(); @@ -60,6 +62,7 @@ public static void setUp() throws IOException { */ @AfterAll public static void tearDown() { + Auth0Connection.setAuthDisabled(Auth0Connection.getDefaultAuthDisabled()); // Project delete cascades to feed sources. project.delete(); }