Clean up, bump some dependencies, fixes tests.

Author: simonbrowndotje

.gitignore

@@ -23,6 +23,7 @@ build
 out
 bin
 **/bin/
+**/target/
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*

structurizr-client/build.gradle

@@ -6,13 +6,4 @@ dependencies {
     api 'org.apache.httpcomponents.client5:httpclient5:5.5.1'
     api 'javax.xml.bind:jaxb-api:2.4.0-b180830.0359'
 
-}
-
-sourceSets {
-    test {
-        java {
-            srcDir 'src/test/java'
-            srcDir 'src/integrationTest/java'
-        }
-    }
 }

…izr/api/BackwardsCompatibilityTests.java …izr/api/BackwardsCompatibilityTests.javastructurizr-client/src/integrationTest/java/com/structurizr/api/BackwardsCompatibilityTests.java renamed to structurizr-client/src/test/java/com/structurizr/api/BackwardsCompatibilityTests.java structurizr-client/src/integrationTest/java/com/structurizr/api/BackwardsCompatibilityTests.java renamed to structurizr-client/src/test/java/com/structurizr/api/BackwardsCompatibilityTests.java

@@ -3,7 +3,6 @@
 import com.structurizr.Workspace;
 import com.structurizr.documentation.Format;
 import com.structurizr.documentation.Section;
-import com.structurizr.model.Location;
 import com.structurizr.util.WorkspaceUtils;
 import org.junit.jupiter.api.Test;
 
@@ -13,7 +12,7 @@
 
 class BackwardsCompatibilityTests {
 
-    private static final File PATH_TO_WORKSPACE_FILES = new File("./src/integrationTest/resources/backwardsCompatibility");
+    private static final File PATH_TO_WORKSPACE_FILES = new File("./src/test/resources/backwardsCompatibility");
 
     @Test
     void test() throws Exception {

…/WorkspaceApiClientIntegrationTests.java …/WorkspaceApiClientIntegrationTests.javastructurizr-client/src/integrationTest/java/com/structurizr/api/WorkspaceApiClientIntegrationTests.java renamed to structurizr-client/src/test/java/com/structurizr/api/WorkspaceApiClientIntegrationTests.java structurizr-client/src/integrationTest/java/com/structurizr/api/WorkspaceApiClientIntegrationTests.java renamed to structurizr-client/src/test/java/com/structurizr/api/WorkspaceApiClientIntegrationTests.java

@@ -10,7 +10,7 @@
 
 public class WorkspaceRulesValidationTests {
 
-    private static final File PATH_TO_WORKSPACE_FILES = new File("./src/integrationTest/resources/workspaceValidation");
+    private static final File PATH_TO_WORKSPACE_FILES = new File("./src/test/resources/workspaceValidation");
 
     @Test
     void exceptionThrown_WhenViewKeysAreNotUnique() throws Exception {

…r/api/WorkspaceRulesValidationTests.java …r/api/WorkspaceRulesValidationTests.javastructurizr-client/src/integrationTest/java/com/structurizr/api/WorkspaceRulesValidationTests.java renamed to structurizr-client/src/test/java/com/structurizr/api/WorkspaceRulesValidationTests.java structurizr-client/src/integrationTest/java/com/structurizr/api/WorkspaceRulesValidationTests.java renamed to structurizr-client/src/test/java/com/structurizr/api/WorkspaceRulesValidationTests.java

@@ -1,6 +1,7 @@
 package com.structurizr.view;
 
 import com.structurizr.Workspace;
+import com.structurizr.http.HttpClient;
 import com.structurizr.model.Relationship;
 import com.structurizr.model.SoftwareSystem;
 import com.structurizr.model.Tags;
@@ -31,7 +32,9 @@ void loadThemes_LoadsThemesWhenThemesAreDefined() throws Exception {
         softwareSystem.addTags("Amazon Web Services - Alexa For Business");
         workspace.getViews().getConfiguration().setThemes("https://static.structurizr.com/themes/amazon-web-services-2020.04.30/theme.json");
 
-        ThemeUtils.loadThemes(workspace);
+        HttpClient httpClient = new HttpClient();
+        httpClient.allow(".*");
+        ThemeUtils.loadThemes(workspace, httpClient);
 
         // there should still be zero styles in the workspace
         assertEquals(0, workspace.getViews().getConfiguration().getStyles().getElements().size());
@@ -146,7 +149,9 @@ void loadThemes_ReplacesRelativeIconReferences() throws Exception {
         softwareSystem.addTags("Amazon Web Services - Alexa For Business");
         workspace.getViews().getConfiguration().setThemes("https://static.structurizr.com/themes/amazon-web-services-2020.04.30/theme.json");
 
-        ThemeUtils.loadThemes(workspace);
+        HttpClient httpClient = new HttpClient();
+        httpClient.allow(".*");
+        ThemeUtils.loadThemes(workspace, httpClient);
 
         // there should still be zero styles in the workspace
         assertEquals(0, workspace.getViews().getConfiguration().getStyles().getElements().size());