Adds missing tests, fixes typo in message.

Author: simonbrowndotje

structurizr-dsl/src/main/java/com/structurizr/dsl/AbstractParser.java

@@ -4,24 +4,12 @@
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpResponse;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
-import org.apache.hc.core5.http.ContentType;
-import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.io.entity.EntityUtils;
 
-import java.util.regex.Pattern;
-
 abstract class AbstractParser {
 
     private static final int HTTP_OK_STATUS = 200;
 
-    private static final Pattern VIEW_KEY_PATTERN = Pattern.compile("[\\w-]+");
-
-    void validateViewKey(String key) {
-        if (!VIEW_KEY_PATTERN.matcher(key).matches()) {
-            throw new RuntimeException("View keys can only contain the following characters: a-zA-0-9_-");
-        }
-    }
-
     String removeNonWordCharacters(String name) {
         return name.replaceAll("\\W", "");
     }

structurizr-dsl/src/main/java/com/structurizr/dsl/AbstractViewParser.java

@@ -1,4 +1,16 @@
 package com.structurizr.dsl;
 
+import java.util.regex.Pattern;
+
 abstract class AbstractViewParser extends AbstractParser {
+
+    private static final String PERMITTED_CHARACTERS_IN_VIEW_KEY = "a-zA-Z0-9_-";
+    private static final Pattern VIEW_KEY_PATTERN = Pattern.compile("[" + PERMITTED_CHARACTERS_IN_VIEW_KEY + "]+");
+
+    void validateViewKey(String key) {
+        if (!VIEW_KEY_PATTERN.matcher(key).matches()) {
+            throw new RuntimeException("View keys can only contain the following characters: a-zA-Z0-9_-");
+        }
+    }
+
 }

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

@@ -0,0 +1,34 @@
+package com.structurizr.dsl;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.fail;
+
+class AbstractViewParserTests {
+
+    private final AbstractViewParser parser = new SystemLandscapeViewParser();
+
+    @Test
+    void test_validateViewKey() {
+        parser.validateViewKey("key");
+        parser.validateViewKey("key123");
+        parser.validateViewKey("Key123");
+        parser.validateViewKey("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_-");
+
+        try {
+            parser.validateViewKey("abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789");
+            fail();
+        } catch (Exception e) {
+            assertEquals("View keys can only contain the following characters: a-zA-Z0-9_-", e.getMessage());
+        }
+
+        try {
+            parser.validateViewKey("abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789");
+            fail();
+        } catch (Exception e) {
+            assertEquals("View keys can only contain the following characters: a-zA-Z0-9_-", e.getMessage());
+        }
+    }
+
+}