Test headless generator when strange names used and multiple generated names.

Author: msavy

src/main/java/io/apiman/cli/gatewayapi/command/ListOrgCommand.java

@@ -56,4 +56,7 @@ public void setGatewayApiFactory(GatewayApiFactory apiFactory) {
         this.apiFactory = apiFactory;
     }
 
+    protected boolean permitNoArgs() {
+        return true;
+    }
 }

src/test/java/io/apiman/cli/gatewayapi/command/generate/GenerateHeadlessTest.java

@@ -92,7 +92,7 @@ public void testGenerateConfig_writeToDirectory() throws Exception {
     }
 
     @Test
-    public void testGenerateConfig_withOutputFile() throws Exception {
+    public void testGenerateConfig_withExplicitOutputFilename() throws Exception {
         command.setJsonWriter(mJsonWriter);
 
         command.setDeclarationFile(getResourceAsPath("/gateway/generateHeadless/plugin-and-builtin-policies.yml"));
@@ -107,7 +107,21 @@ public void testGenerateConfig_withOutputFile() throws Exception {
     }
 
     @Test
-    public void testGenerateConfig_withMultipleGatewayConfigs() throws Exception {
+    public void testGenerateConfig_withTransformedName() throws Exception {
+        command.setJsonWriter(mJsonWriter);
+
+        command.setDeclarationFile(getResourceAsPath("/gateway/generateHeadless/transform-name.yml"));
+        command.outputFiles.add(Paths.get("/tmp"));
+        // Run
+        command.applyDeclaration();
+        // Verify
+        HeadlessConfigBean expected = expectJson("/gateway/generateHeadless/transform-name.json", HeadlessConfigBean.class);
+        // Space-type characters and forward slashes should be substituted with -
+        verify(mJsonWriter).write(eq(Paths.get("/tmp/gateway-with-various-spaces-in-original-᠎-name-and-forward-slash--.json")), refEq(expected));
+    }
+
+    @Test
+    public void testGenerateConfig_withMultipleGatewayConfigs_ExplicitName() throws Exception {
         command.setJsonWriter(mJsonWriter);
 
         command.setDeclarationFile(getResourceAsPath("/gateway/generateHeadless/plugin-and-builtin-policies_multiple-gateways.yml"));
@@ -116,11 +130,26 @@ public void testGenerateConfig_withMultipleGatewayConfigs() throws Exception {
         // Run
         command.applyDeclaration();
         // Verify it matches our reference configs.
-        HeadlessConfigBean expectedApi = expectJson("/gateway/generateHeadless/expected-multiple-gateways.json", HeadlessConfigBean.class);
-        HeadlessConfigBean expectedApi2 = expectJson("/gateway/generateHeadless/expected-multiple-gateways-2.json", HeadlessConfigBean.class);
+        HeadlessConfigBean expectedConfig1 = expectJson("/gateway/generateHeadless/expected-multiple-gateways.json", HeadlessConfigBean.class);
+        HeadlessConfigBean expectedConfig2 = expectJson("/gateway/generateHeadless/expected-multiple-gateways-2.json", HeadlessConfigBean.class);
 
-        verify(mJsonWriter).write(eq(Paths.get("/tmp/someOutputFile.json")), refEq(expectedApi));
-        verify(mJsonWriter).write(eq(Paths.get("/tmp/someOutputFile2.json")), refEq(expectedApi2));
+        verify(mJsonWriter).write(eq(Paths.get("/tmp/someOutputFile.json")), refEq(expectedConfig1));
+        verify(mJsonWriter).write(eq(Paths.get("/tmp/someOutputFile2.json")), refEq(expectedConfig2));
     }
 
+    @Test
+    public void testGenerateConfig_withMultipleGatewayConfigs_GeneratedName() throws Exception {
+        command.setJsonWriter(mJsonWriter);
+
+        command.setDeclarationFile(getResourceAsPath("/gateway/generateHeadless/plugin-and-builtin-policies_multiple-gateways.yml"));
+        command.outputFiles.add(Paths.get("/tmp")); // Directory.
+        // Run
+        command.applyDeclaration();
+        // Verify it matches our reference configs.
+        HeadlessConfigBean expectedConfig1 = expectJson("/gateway/generateHeadless/expected-multiple-gateways.json", HeadlessConfigBean.class);
+        HeadlessConfigBean expectedConfig2 = expectJson("/gateway/generateHeadless/expected-multiple-gateways-2.json", HeadlessConfigBean.class);
+
+        verify(mJsonWriter).write(eq(Paths.get("/tmp/test-gw-2.json")), refEq(expectedConfig1)); // Notice generated filenames
+        verify(mJsonWriter).write(eq(Paths.get("/tmp/test-gw.json")), refEq(expectedConfig2));
+    }
 }

src/test/resources/gateway/generateHeadless/transform-name.json

@@ -0,0 +1,22 @@
+{
+  "apis" : [ {
+    "publicAPI" : true,
+    "organizationId" : "test",
+    "apiId" : "example",
+    "version" : "1.0",
+    "endpoint" : "http://localhost:8080/services/echo",
+    "endpointType" : "rest",
+    "endpointContentType" : null,
+    "endpointProperties" : { },
+    "parsePayload" : false,
+    "apiPolicies" : [ {
+      "policyJsonConfig" : "{\n  \"ttl\" : 60\n}",
+      "policyImpl" : "class:io.apiman.gateway.engine.policies.CachingPolicy"
+    }, {
+      "policyJsonConfig" : "{\n  \"foo\" : 123\n}",
+      "policyImpl" : "plugin:io.apiman.plugins:apiman-plugins-test-policy:1.3.1.Final:war/io.apiman.plugins.test_policy.TestPolicy"
+    } ],
+    "maxPayloadBufferSize" : 0
+  } ],
+  "clients" : [ ]
+}

src/test/resources/gateway/generateHeadless/transform-name.yml

@@ -0,0 +1,28 @@
+# Simple apiman gateway declaration
+---
+  system:
+    gateways:
+      - name: "gateway with various spaces in original ᠎ name and forward slash /"
+        type: "REST"
+    plugins:
+      - name: TestPolicy
+        groupId: "io.apiman.plugins"
+        artifactId: "apiman-plugins-test-policy"
+        version: "1.3.1.Final"
+  org:
+    name: "test"
+    apis:
+      - name: "example"
+        version: "1.0"
+        config:
+          endpoint: "http://localhost:8080/services/echo"
+          endpointType: "rest"
+          public: true
+          gateway: "gateway with various spaces in original ᠎ name and forward slash /"
+        policies:
+          - name: "CachingPolicy"
+            config:
+              ttl: 60
+          - plugin: TestPolicy
+            config:
+              foo: 123