Gradle test target now works offline by excluding tests tagged "IntegrationTest".

Author: simonbrowndotje

build.gradle

@@ -20,7 +20,16 @@ subprojects { proj ->
     }
 
     test {
-        useJUnitPlatform()
+        useJUnitPlatform {
+            excludeTags "IntegrationTest"
+        }
+    }
+
+    tasks.register("integrationTest", Test) {
+        useJUnitPlatform {
+            includeTags "IntegrationTest"
+        }
+        mustRunAfter check
     }
 
     compileJava.options.encoding = 'UTF-8'

structurizr-client/src/integrationTest/java/com/structurizr/api/WorkspaceApiClientIntegrationTests.java

@@ -10,6 +10,7 @@
 import com.structurizr.view.SystemContextView;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -51,6 +52,7 @@ private File getArchivedWorkspace() {
     }
 
     @Test
+    @Tag("IntegrationTest")
     void putAndGetWorkspace_WithoutEncryption() throws Exception {
         Workspace workspace = new Workspace("Structurizr client library tests - without encryption", "A test workspace for the Structurizr client library");
         SoftwareSystem softwareSystem = workspace.getModel().addSoftwareSystem("Software System", "Description");
@@ -77,6 +79,7 @@ void putAndGetWorkspace_WithoutEncryption() throws Exception {
     }
 
     @Test
+    @Tag("IntegrationTest")
     void putAndGetWorkspace_WithEncryption() throws Exception {
         client.setEncryptionStrategy(new AesEncryptionStrategy("password"));
         Workspace workspace = new Workspace("Structurizr client library tests - with encryption", "A test workspace for the Structurizr client library");
@@ -104,13 +107,15 @@ void putAndGetWorkspace_WithEncryption() throws Exception {
     }
 
     @Test
+    @Tag("IntegrationTest")
     void lockWorkspace() throws Exception {
         client.unlockWorkspace(20081);
         assertTrue(client.lockWorkspace(20081));
     }
 
 
     @Test
+    @Tag("IntegrationTest")
     void unlockWorkspace() throws Exception {
         client.lockWorkspace(20081);
         assertTrue(client.unlockWorkspace(20081));

structurizr-client/src/test/java/com/structurizr/view/ThemeUtilsTests.java

@@ -4,6 +4,7 @@
 import com.structurizr.model.Relationship;
 import com.structurizr.model.SoftwareSystem;
 import com.structurizr.model.Tags;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import java.util.ArrayList;
@@ -23,6 +24,7 @@ void loadThemes_DoesNothingWhenNoThemesAreDefined() throws Exception {
     }
 
     @Test
+    @Tag("IntegrationTest")
     void loadThemes_LoadsThemesWhenThemesAreDefined() throws Exception {
         Workspace workspace = new Workspace("Name", "Description");
         SoftwareSystem softwareSystem = workspace.getModel().addSoftwareSystem("Name");
@@ -137,6 +139,7 @@ void findRelationshipStyle_WithThemes() {
     }
 
     @Test
+    @Tag("IntegrationTest")
     void loadThemes_ReplacesRelativeIconReferences() throws Exception {
         Workspace workspace = new Workspace("Name", "Description");
         SoftwareSystem softwareSystem = workspace.getModel().addSoftwareSystem("Name");

structurizr-dsl/src/test/java/com/structurizr/dsl/DslTests.java

@@ -5,6 +5,7 @@
 import com.structurizr.model.*;
 import com.structurizr.util.StringUtils;
 import com.structurizr.view.*;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.ValueSource;
@@ -396,6 +397,7 @@ void test_includeLocalDirectory_WhenThereAreHiddenFiles() throws Exception {
     }
 
     @Test
+    @Tag("IntegrationTest")
     void test_includeUrl() throws Exception {
         StructurizrDslParser parser = new StructurizrDslParser();
         parser.parse(new File("src/test/resources/dsl/include-url.dsl"));
@@ -434,6 +436,7 @@ void test_includeLocalFile_ThrowsAnException_WhenRunningInRestrictedMode() {
     }
 
     @ParameterizedTest
+    @Tag("IntegrationTest")
     @ValueSource(strings = { "src/test/resources/dsl/extend/extend-workspace-from-json-file.dsl", "src/test/resources/dsl/extend/extend-workspace-from-json-url.dsl" })
     void test_extendWorkspaceFromJson(String dslFile) throws Exception {
         StructurizrDslParser parser = new StructurizrDslParser();
@@ -472,6 +475,7 @@ void test_extendWorkspaceFromJsonFile_WhenRunningInRestrictedMode() throws Excep
     }
 
     @ParameterizedTest
+    @Tag("IntegrationTest")
     @ValueSource(strings = { "src/test/resources/dsl/extend/extend-workspace-from-dsl-file.dsl", "src/test/resources/dsl/extend/extend-workspace-from-dsl-url.dsl" })
     void test_extendWorkspaceFromDsl(String dslFile) throws Exception {
         StructurizrDslParser parser = new StructurizrDslParser();
@@ -1091,6 +1095,7 @@ void test_imageViews_ViaFiles() throws Exception {
     }
 
     @Test
+    @Tag("IntegrationTest")
     void test_imageViews_ViaUrls() throws Exception {
         StructurizrDslParser parser = new StructurizrDslParser();
         parser.parse(new File("src/test/resources/dsl/image-views/workspace-via-url.dsl"));

structurizr-export/src/test/java/com/structurizr/export/dot/DOTDiagramExporterTests.java

@@ -6,6 +6,7 @@
 import com.structurizr.model.*;
 import com.structurizr.util.WorkspaceUtils;
 import com.structurizr.view.*;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -53,6 +54,7 @@ public void test_BigBankPlcExample() throws Exception {
     }
 
     @Test
+    @Tag("IntegrationTest")
     public void test_AmazonWebServicesExample() throws Exception {
         Workspace workspace = WorkspaceUtils.loadWorkspaceFromJson(new File("./src/test/resources/structurizr-54915-workspace.json"));
         ThemeUtils.loadThemes(workspace);

structurizr-export/src/test/java/com/structurizr/export/ilograph/IlographExporterTests.java

@@ -7,6 +7,7 @@
 import com.structurizr.model.Model;
 import com.structurizr.util.WorkspaceUtils;
 import com.structurizr.view.ThemeUtils;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -26,6 +27,7 @@ public void test_BigBankPlcExample() throws Exception {
     }
 
     @Test
+    @Tag("IntegrationTest")
     void test_AmazonWebServicesExample() throws Exception {
         Workspace workspace = WorkspaceUtils.loadWorkspaceFromJson(new File("./src/test/resources/structurizr-54915-workspace.json"));
         workspace.getViews().getConfiguration().getStyles().addElementStyle("Amazon Web Services - Route 53").addProperty(IlographExporter.ILOGRAPH_ICON, "AWS/Networking/Route-53.svg");

structurizr-export/src/test/java/com/structurizr/export/mermaid/MermaidDiagramExporterTests.java

@@ -6,6 +6,7 @@
 import com.structurizr.model.*;
 import com.structurizr.util.WorkspaceUtils;
 import com.structurizr.view.*;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -60,6 +61,7 @@ public void test_BigBankPlcExample() throws Exception {
     }
 
     @Test
+    @Tag("IntegrationTest")
     public void test_AmazonWebServicesExample() throws Exception {
         Workspace workspace = WorkspaceUtils.loadWorkspaceFromJson(new File("./src/test/resources/structurizr-54915-workspace.json"));
         ThemeUtils.loadThemes(workspace);

structurizr-export/src/test/java/com/structurizr/export/plantuml/C4PlantUMLDiagramExporterTests.java

@@ -6,6 +6,7 @@
 import com.structurizr.model.*;
 import com.structurizr.util.WorkspaceUtils;
 import com.structurizr.view.*;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -61,6 +62,7 @@ public void test_BigBankPlcExample() throws Exception {
     }
 
     @Test
+    @Tag("IntegrationTest")
     public void test_AmazonWebServicesExampleWithoutTags() throws Exception {
         Workspace workspace = WorkspaceUtils.loadWorkspaceFromJson(new File("./src/test/resources/structurizr-54915-workspace.json"));
         ThemeUtils.loadThemes(workspace);
@@ -77,6 +79,7 @@ public void test_AmazonWebServicesExampleWithoutTags() throws Exception {
     }
 
     @Test
+    @Tag("IntegrationTest")
     public void test_AmazonWebServicesExampleWithTags() throws Exception {
         Workspace workspace = WorkspaceUtils.loadWorkspaceFromJson(new File("./src/test/resources/structurizr-54915-workspace.json"));
         ThemeUtils.loadThemes(workspace);

structurizr-export/src/test/java/com/structurizr/export/plantuml/StructurizrPlantUMLDiagramExporterTests.java

@@ -6,6 +6,7 @@
 import com.structurizr.model.*;
 import com.structurizr.util.WorkspaceUtils;
 import com.structurizr.view.*;
+import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
 import java.io.File;
@@ -71,6 +72,7 @@ public void test_BigBankPlcExample() throws Exception {
     }
 
     @Test
+    @Tag("IntegrationTest")
     public void test_AmazonWebServicesExample() throws Exception {
         Workspace workspace = WorkspaceUtils.loadWorkspaceFromJson(new File("./src/test/resources/structurizr-54915-workspace.json"));
         ThemeUtils.loadThemes(workspace);

structurizr-import/build.gradle

@@ -4,17 +4,4 @@ dependencies {
 
 }
 
-description = 'Utilities to import diagrams and documentation into a Structurizr workspace'
-
-test {
-    useJUnitPlatform {
-        excludeTags "IntegrationTest"
-    }
-}
-
-tasks.register("integrationTest", Test) {
-    useJUnitPlatform {
-        includeTags "IntegrationTest"
-    }
-    mustRunAfter check
-}
+description = 'Utilities to import diagrams and documentation into a Structurizr workspace'