Merge pull request #78 from marcschumacher/master

Test for List<EnumType>

Author: Jan-M

database/test/21_shard1/21_schema1/03_types/30_example_enum_domain_object.sql

@@ -0,0 +1,4 @@
+CREATE TYPE example_enum_domain_object AS (
+  id INT,
+  enum_array ztest_schema1.example_enum[]
+);

database/test/21_shard1/21_schema1/04_tables/40_enum_example_table.sql

@@ -0,0 +1,10 @@
+CREATE TABLE enum_table (
+    et_id           serial primary key,
+    et_enum_array   ztest_schema1.example_enum[]
+);
+
+INSERT INTO enum_table ( et_id, et_enum_array )
+VALUES (1, '{}'),
+       (2, NULL),
+       (3, '{ENUM_CONST_2}'),
+       (4, '{ENUM_CONST_1, ENUM_CONST_2}');

database/test/21_shard1/21_schema1/05_stored_procedures/20_get_example_enum.sql

@@ -0,0 +1,13 @@
+CREATE OR REPLACE FUNCTION get_example_enum_domain_object(IN param_id INT)
+    RETURNS example_enum_domain_object AS
+$BODY$
+
+SELECT et_id,
+       et_enum_array
+FROM enum_table
+WHERE et_id = $1;
+
+$BODY$
+    LANGUAGE 'sql' VOLATILE
+                   SECURITY DEFINER
+                   COST 100;

database/test/21_shard1/21_schema1/05_stored_procedures/20_list_example_enum_domain_objects.sql

@@ -0,0 +1,12 @@
+CREATE OR REPLACE FUNCTION list_example_enum_domain_objects()
+    RETURNS SETOF example_enum_domain_object AS
+$BODY$
+
+SELECT et_id,
+       et_enum_array
+FROM enum_table;
+
+$BODY$
+    LANGUAGE 'sql' VOLATILE
+                   SECURITY DEFINER
+                   COST 100;

src/test/java/org/zalando/sprocwrapper/SimpleIT.java

@@ -55,6 +55,7 @@
 import org.zalando.sprocwrapper.example.ExampleDomainObjectWithSimpleTransformer;
 import org.zalando.sprocwrapper.example.ExampleDomainObjectWithValidation;
 import org.zalando.sprocwrapper.example.ExampleEnum;
+import org.zalando.sprocwrapper.example.ExampleEnumDomainObject;
 import org.zalando.sprocwrapper.example.ExampleNamespacedSProcService;
 import org.zalando.sprocwrapper.example.ExampleSProcService;
 import org.zalando.sprocwrapper.example.ExampleValidationSProcService;
@@ -1089,4 +1090,34 @@ public void testNullComplexParam() throws Exception {
     public void testNullEnumParam() {
         exampleSProcService.useEnumParam(null);
     }
+
+    @Test
+    public void testEnumListNoEntry() {
+        ExampleEnumDomainObject result = exampleSProcService.getExampleEnumDomainObject(1);
+        assertEquals(Lists.newArrayList(), result.getEnumArray());
+    }
+
+    @Test
+    public void testEnumListNullEntry() {
+        ExampleEnumDomainObject result = exampleSProcService.getExampleEnumDomainObject(2);
+        assertNull(result.getEnumArray());
+    }
+
+    @Test
+    public void testEnumListOneEntry() {
+        ExampleEnumDomainObject result = exampleSProcService.getExampleEnumDomainObject(3);
+        assertEquals(Lists.newArrayList(ExampleEnum.ENUM_CONST_2), result.getEnumArray());
+    }
+
+    @Test
+    public void testEnumListTwoEntries() {
+        ExampleEnumDomainObject result = exampleSProcService.getExampleEnumDomainObject(4);
+        assertEquals(Lists.newArrayList(ExampleEnum.ENUM_CONST_1, ExampleEnum.ENUM_CONST_2), result.getEnumArray());
+    }
+
+    @Test
+    public void testEnumListSet() {
+        List<ExampleEnumDomainObject> result = exampleSProcService.listExampleEnumDomainObjects();
+        System.out.println(result);
+    }
 }

src/test/java/org/zalando/sprocwrapper/example/ExampleEnumDomainObject.java

@@ -0,0 +1,35 @@
+package org.zalando.sprocwrapper.example;
+
+import java.util.List;
+
+import org.zalando.typemapper.annotations.DatabaseField;
+import org.zalando.typemapper.annotations.DatabaseType;
+
+/**
+ * @author mschumacher
+ */
+@DatabaseType
+public class ExampleEnumDomainObject {
+
+    @DatabaseField
+    private Integer id;
+
+    @DatabaseField
+    private List<ExampleEnum> enumArray;
+
+    public Integer getId() {
+        return id;
+    }
+
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    public List<ExampleEnum> getEnumArray() {
+        return enumArray;
+    }
+
+    public void setEnumArray(List<ExampleEnum> enumArray) {
+        this.enumArray = enumArray;
+    }
+}

src/test/java/org/zalando/sprocwrapper/example/ExampleSProcService.java

@@ -286,4 +286,10 @@ int createOrder(@SProcParam String orderNumber, @SProcParam OrderMonetaryAmount
     @SProcCall
     PartialObject getPartialObject(@SProcParam NotPartialObject partialObject);
 
+    @SProcCall
+    ExampleEnumDomainObject getExampleEnumDomainObject(@SProcParam Integer id);
+
+    @SProcCall
+    List<ExampleEnumDomainObject> listExampleEnumDomainObjects();
+
 }

src/test/java/org/zalando/sprocwrapper/example/ExampleSProcServiceImpl.java

@@ -454,4 +454,14 @@ public PartialObject getPartialObject(final PartialObject partialObject) {
     public PartialObject getPartialObject(final NotPartialObject notPartialObject) {
         return sproc.getPartialObject(notPartialObject);
     }
+
+    @Override
+    public ExampleEnumDomainObject getExampleEnumDomainObject(Integer id) {
+        return sproc.getExampleEnumDomainObject(id);
+    }
+
+    @Override
+    public List<ExampleEnumDomainObject> listExampleEnumDomainObjects() {
+        return sproc.listExampleEnumDomainObjects();
+    }
 }