Merge branch 'master' into install-instructions

teiler · May 23, 2017 · f36f08c · f36f08c
2 parents 354eb7f + 15cc438
commit f36f08c
Show file tree

Hide file tree

Showing 4 changed files with 80 additions and 10 deletions.
diff --git a/src/test/java/io/teiler/server/endpoints/EndpointControllerTestSuite.java b/src/test/java/io/teiler/server/endpoints/EndpointControllerTestSuite.java
@@ -8,7 +8,7 @@
 @RunWith(Suite.class)
 @SuiteClasses({
     GroupEndpointControllerTest.class,
-    PeopleEndpointControllerTest.class
+    PersonEndpointControllerTest.class
 })
 public class EndpointControllerTestSuite {
 

diff --git a/src/test/java/io/teiler/server/endpoints/GroupEndpointControllerTest.java b/src/test/java/io/teiler/server/endpoints/GroupEndpointControllerTest.java
@@ -16,14 +16,16 @@
 public class GroupEndpointControllerTest extends BaseEndpointControllerTest {
 
     private static final String GROUP_URL = URL_VERSION + "groups";
-    
+
     private static final String POST_GROUP_NAME = "Manamana";
     private static final String GET_GROUP_ID = "gettgrup";
     private static final String GET_GROUP_NAME = "GetGroup";
     private static final String PUT_GROUP_ID = "puttgrup";
     private static final String PUT_GROUP_NAME = "PutGroupABC";
     private static final String DELETE_GROUP_ID = "deltgrup";
-
+    private static final String INVALID_CURRENCY_GROUP_NAME = "InvalidCurrency";
+    private static final String INVALID_CURRENCY = "XYZ";
+
     private static final String PARAM_NAME = "name";
     private static final String PARAM_ID = "id";
     private static final String PARAM_CURRENCY = "currency";
@@ -82,7 +84,7 @@ public void testPutGroup() {
                 .body(PARAM_UPDATE_TIME, is(notNullValue()))
                 .body(PARAM_CREATE_TIME, is(notNullValue()));
     }
-    
+
     @Test
     public void testDeleteGroup() {
         given()
@@ -92,4 +94,19 @@ public void testDeleteGroup() {
                 .statusCode(200);
     }
 
+    @Test
+    public void testInvalidCurrency() {
+        Map<String, String> requestBody = new HashMap<>();
+        requestBody.put(PARAM_NAME, INVALID_CURRENCY_GROUP_NAME);
+        requestBody.put(PARAM_CURRENCY, INVALID_CURRENCY);
+
+        given()
+            .contentType(ContentType.JSON)
+            .body(requestBody)
+            .when()
+                .put(GROUP_URL + "/" + PUT_GROUP_ID)
+            .then()
+                .statusCode(416);
+    }
+
 }
diff --git a/...dpoints/PeopleEndpointControllerTest.java → ...dpoints/PersonEndpointControllerTest.java b/...dpoints/PeopleEndpointControllerTest.java → ...dpoints/PersonEndpointControllerTest.java
@@ -13,23 +13,35 @@
 
 import io.restassured.http.ContentType;
 
-public class PeopleEndpointControllerTest extends BaseEndpointControllerTest {
+public class PersonEndpointControllerTest extends BaseEndpointControllerTest {
+
+    private static final String GROUP_URL_PATH = "groups";
+    private static final String PEOPLE_URL_PATH = "people";
 
     private static final String GROUP_ID = "persgrup";
-    private static final String PERSON_URL = URL_VERSION + "groups/" + GROUP_ID + "/people";
-    
+    private static final String PERSON_URL = URL_VERSION + GROUP_URL_PATH + "/" + GROUP_ID + "/" + PEOPLE_URL_PATH;
+
     private static final String POST_PERSON_NAME = "Richi";
     private static final int PUT_PERSON_ID = 2;
     private static final String PUT_PERSON_NAME = "PutPersonABC";
     private static final int DELETE_PERSON_ID = 3;
-    
+
     private static final String PEOPLE_GROUP_ID = "piplgrup";
-    private static final String PERSON_PEOPLE_URL = URL_VERSION + "groups/" + PEOPLE_GROUP_ID + "/people";
+    private static final String PERSON_PEOPLE_URL = URL_VERSION + GROUP_URL_PATH + "/" + PEOPLE_GROUP_ID + "/" + PEOPLE_URL_PATH;
     private static final int GET_PERSON_1_ID = 7;
     private static final String GET_PERSON_1_NAME = "PeoplePerson1";
     private static final int GET_PERSON_2_ID = 8;
     private static final String GET_PERSON_2_NAME = "PeoplePerson2";
 
+    private static final int PERSON_NOT_FOUND_ID = 666;
+
+    private static final String PEOPLE_NAME_CONFLICT_GROUP_ID = "spargrup";
+    private static final String PEOPLE_NAME_CONFLICT_URL = URL_VERSION + GROUP_URL_PATH + "/" + PEOPLE_NAME_CONFLICT_GROUP_ID + "/" + PEOPLE_URL_PATH;    
+    private static final String PEOPLE_NAME_CONFLICT_PERSON_NAME = "Spartacus";
+
+    private static final int INACTIVE_PERSON_ID = 4;
+    private static final String INACTIVE_PERSON_NAME = "InactivePerson";
+
     private static final String PARAM_NAME = "name";
     private static final String PARAM_ID = "id";
     private static final String PARAM_ACTIVE = "active";
@@ -87,7 +99,7 @@ public void testPutPerson() {
                 .body(PARAM_UPDATE_TIME, is(notNullValue()))
                 .body(PARAM_CREATE_TIME, is(notNullValue()));
     }
-    
+
     @Test
     public void testDeletePerson() {
         given()
@@ -96,5 +108,42 @@ public void testDeletePerson() {
             .then()
                 .statusCode(200);
     }
+
+    @Test
+    public void testPersonNotFound() {
+        given()
+            .when()
+                .get(PERSON_URL + "/" + PERSON_NOT_FOUND_ID)
+            .then()
+                .statusCode(404);
+    }
+
+    @Test
+    public void testPeopleNameConflict() {
+        Map<String, String> requestBody = new HashMap<>();
+        requestBody.put(PARAM_NAME, PEOPLE_NAME_CONFLICT_PERSON_NAME);
+
+        given()
+            .contentType(ContentType.JSON)
+            .body(requestBody)
+            .when()
+                .post(PEOPLE_NAME_CONFLICT_URL)
+            .then()
+                .statusCode(409);
+    }
+
+    @Test
+    public void testPersonInactive() {
+        Map<String, String> requestBody = new HashMap<>();
+        requestBody.put(PARAM_NAME, INACTIVE_PERSON_NAME + "ABC");
+
+        given()
+            .contentType(ContentType.JSON)
+            .body(requestBody)
+            .when()
+                .put(PERSON_URL + "/" + INACTIVE_PERSON_ID)
+            .then()
+                .statusCode(410);
+    }
 
 }
diff --git a/src/test/resources/insert_test_data.sql b/src/test/resources/insert_test_data.sql
@@ -8,9 +8,13 @@ INSERT INTO "group" VALUES ('persgrup', 'PersonGroup', 'CHF', NOW(), NOW());
 INSERT INTO person VALUES (1, 'GetPerson', 'persgrup', TRUE, NOW(), NOW());
 INSERT INTO person VALUES (2, 'PutPerson', 'persgrup', TRUE, NOW(), NOW());
 INSERT INTO person VALUES (3, 'DeletePerson', 'persgrup', TRUE, NOW(), NOW());
+INSERT INTO person VALUES (4, 'InactivePerson', 'persgrup', FALSE, NOW(), NOW());
 
 INSERT INTO "group" VALUES ('piplgrup', 'PeopleGroup', 'CHF', NOW(), NOW());
 INSERT INTO person VALUES (7, 'PeoplePerson1', 'piplgrup', TRUE, NOW(), NOW());
 INSERT INTO person VALUES (8, 'PeoplePerson2', 'piplgrup', TRUE, NOW(), NOW());
 
+INSERT INTO "group" VALUES ('spargrup', 'Spartacus', 'CHF', NOW(), NOW());
+INSERT INTO person VALUES (9, 'Spartacus', 'spargrup', TRUE, NOW(), NOW());
+
 SELECT SETVAL('person_id_seq', (SELECT MAX(id) FROM "person")); -- DO NOT REMOVE, ELSE: TRAVIS => BUMM