Improve test coverage

Author: alextwoods

codegen/src/main/java/software/amazon/awssdk/codegen/customization/processors/EventStreamSharedEventProcessor.java

@@ -68,15 +68,15 @@ public void preprocess(ServiceModel serviceModel) {
 
                 if (eventMemberShape == null || !eventMemberShape.isEvent()) {
                     throw new IllegalStateException(
-                        String.format("Error: %s must be an Event shape when processing "
+                        String.format("Error: [%s] must be an Event shape when processing "
                                       + "customization config duplicateAndRenameSharedEvents.%s",
                                       eventEntry.getKey(), eventStreamName));
                 }
 
                 String newShapeName = eventEntry.getValue();
                 if (serviceModel.getShapes().containsKey(newShapeName)) {
                     throw new IllegalStateException(
-                        String.format("Error: %s is already in the model when processing "
+                        String.format("Error: [%s] is already in the model when processing "
                                       + "customization config duplicateAndRenameSharedEvents.%s",
                                       newShapeName, eventStreamName));
                 }
@@ -96,7 +96,7 @@ private static void validateIsEventStream(Shape shape, String name) {
         }
         if (!shape.isEventstream()) {
             throw new IllegalStateException(
-                String.format("Error: %s must be an EventStream when processing "
+                String.format("Error: [%s] must be an EventStream when processing "
                               + "customization config duplicateAndRenameSharedEvents.%s", name, name));
         }
     }
@@ -115,7 +115,7 @@ public void postprocess(IntermediateModel intermediateModel) {
                         if (seenEvents.containsKey(memberShape.getShapeName())
                             && !seenEvents.get(memberShape.getShapeName()).equals(shapeModel.getShapeName())) {
                             throw new IllegalStateException(
-                                String.format("Event %s is shared between multiple EventStreams. Apply the "
+                                String.format("Event shape `%s` is shared between multiple EventStreams. Apply the "
                                               + "duplicateAndRenameSharedEvents customization to resolve the issue.",
                                               memberShape.getShapeName()));
                         }

codegen/src/test/java/software/amazon/awssdk/codegen/customization/processors/EventStreamSharedEventProcessorTest.java

@@ -20,24 +20,33 @@
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 
 import java.io.File;
-import org.junit.jupiter.api.Test;
+import java.util.Map;
+import org.junit.Before;
+import org.junit.Test;
 import software.amazon.awssdk.codegen.C2jModels;
 import software.amazon.awssdk.codegen.IntermediateModelBuilder;
 import software.amazon.awssdk.codegen.model.config.customization.CustomizationConfig;
 import software.amazon.awssdk.codegen.model.service.ServiceModel;
 import software.amazon.awssdk.codegen.model.service.Shape;
 import software.amazon.awssdk.codegen.utils.ModelLoaderUtils;
+import software.amazon.awssdk.utils.ImmutableMap;
 
 public class EventStreamSharedEventProcessorTest {
     private static final String RESOURCE_ROOT = "/software/amazon/awssdk/codegen/customization/processors"
                                                 + "/eventstreamsharedeventprocessor/";
 
-    @Test
-    public void duplicatesAndRenamesSharedEvent() {
+    private ServiceModel serviceModel;
+
+    @Before
+    public void setUp() {
         File serviceModelFile =
             new File(EventStreamSharedEventProcessorTest.class.getResource(RESOURCE_ROOT + "service-2.json").getFile());
-        ServiceModel serviceModel = ModelLoaderUtils.loadModel(ServiceModel.class, serviceModelFile);
-        File customizationConfigFile =
+        serviceModel = ModelLoaderUtils.loadModel(ServiceModel.class, serviceModelFile);
+    }
+
+    @Test
+    public void duplicatesAndRenamesSharedEvent() {
+       File customizationConfigFile =
             new File(EventStreamSharedEventProcessorTest.class.getResource(RESOURCE_ROOT + "customization.config").getFile());
         CustomizationConfig config = ModelLoaderUtils.loadModel(CustomizationConfig.class, customizationConfigFile);
 
@@ -55,10 +64,6 @@ public void duplicatesAndRenamesSharedEvent() {
 
     @Test
     public void modelWithSharedEvents_raises() {
-        File serviceModelFile =
-            new File(EventStreamSharedEventProcessorTest.class.getResource(RESOURCE_ROOT + "service-2.json").getFile());
-        ServiceModel serviceModel = ModelLoaderUtils.loadModel(ServiceModel.class, serviceModelFile);
-
         CustomizationConfig emptyConfig = CustomizationConfig.create();
 
         assertThatThrownBy(() -> new IntermediateModelBuilder(
@@ -67,6 +72,52 @@ public void modelWithSharedEvents_raises() {
                      .customizationConfig(emptyConfig)
                      .build()).build())
             .isInstanceOf(IllegalStateException.class)
-            .hasMessageContaining("Event Payload is shared between multiple EventStreams");
+            .hasMessageContaining("Event shape `Payload` is shared between multiple EventStreams");
+    }
+
+    @Test
+    public void invalidCustomization_missingShape() {
+        Map<String, Map<String, String>> duplicateAndRenameSharedEvents = ImmutableMap.of("MissingShape", null);
+
+        EventStreamSharedEventProcessor processor =
+            new EventStreamSharedEventProcessor(duplicateAndRenameSharedEvents);
+        assertThatThrownBy(() -> processor.preprocess(serviceModel))
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining("Cannot find eventstream shape [MissingShape]");
+    }
+
+    @Test
+    public void invalidCustomization_notEventStream() {
+        Map<String, Map<String, String>> duplicateAndRenameSharedEvents = ImmutableMap.of("Payload", null);
+
+        EventStreamSharedEventProcessor processor =
+            new EventStreamSharedEventProcessor(duplicateAndRenameSharedEvents);
+        assertThatThrownBy(() -> processor.preprocess(serviceModel))
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining("Error: [Payload] must be an EventStream");
+    }
+
+    @Test
+    public void invalidCustomization_invalidMember() {
+        Map<String, Map<String, String>> duplicateAndRenameSharedEvents = ImmutableMap.of(
+            "StreamB", ImmutableMap.of("InvalidMember", "Payload"));
+
+        EventStreamSharedEventProcessor processor =
+            new EventStreamSharedEventProcessor(duplicateAndRenameSharedEvents);
+        assertThatThrownBy(() -> processor.preprocess(serviceModel))
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining("Cannot find event member [InvalidMember] in the eventstream [StreamB]");
+    }
+
+    @Test
+    public void invalidCustomization_shapeAlreadyExists() {
+        Map<String, Map<String, String>> duplicateAndRenameSharedEvents = ImmutableMap.of(
+            "StreamB", ImmutableMap.of("Payload", "Payload"));
+
+        EventStreamSharedEventProcessor processor =
+            new EventStreamSharedEventProcessor(duplicateAndRenameSharedEvents);
+        assertThatThrownBy(() -> processor.preprocess(serviceModel))
+            .isInstanceOf(IllegalStateException.class)
+            .hasMessageContaining("Error: [Payload] is already in the model");
     }
 }