From d341d02aeeeccb79a6697a3f675cc1b82a4fe81b Mon Sep 17 00:00:00 2001
From: Valentin Popa <valentin-iulian.popa@ness.com>
Date: Fri, 2 Sep 2016 10:47:16 +0300
Subject: [PATCH] TAS-387 Add support for JSON schema validation

---
 .../java/org/alfresco/rest/RestDemoTest.java     |  4 ++--
 .../org/alfresco/rest/SampleCommentsTest.java    |  4 ++--
 .../java/org/alfresco/rest/SamplePeopleTest.java |  6 ++----
 .../java/org/alfresco/rest/SampleSitesTest.java  | 16 ++++++++--------
 4 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/e2e-test/java/org/alfresco/rest/RestDemoTest.java b/e2e-test/java/org/alfresco/rest/RestDemoTest.java
index 8849d8f14..bc45af0be 100644
--- a/e2e-test/java/org/alfresco/rest/RestDemoTest.java
+++ b/e2e-test/java/org/alfresco/rest/RestDemoTest.java
@@ -65,7 +65,7 @@ public class RestDemoTest extends RestTest
      * @throws JsonToModelConversionException
      */
     @Test
-    public void commentsTest() throws JsonToModelConversionException
+    public void commentsTest() throws JsonToModelConversionException, Exception
     {
         Document document = dataContent.usingPath("Shared")
         			       .usingUser(userModel)
@@ -97,7 +97,7 @@ public class RestDemoTest extends RestTest
      * @throws JsonToModelConversionException
      */
     @Test
-    public void siteMembersTest() throws DataPreparationException, JsonToModelConversionException
+    public void siteMembersTest() throws DataPreparationException, JsonToModelConversionException, Exception
     {
         UserModel newUser = dataUser.createRandomTestUser();
         SiteMember siteMember = new SiteMember(Role.SiteConsumer.toString(), newUser.getUsername());
diff --git a/e2e-test/java/org/alfresco/rest/SampleCommentsTest.java b/e2e-test/java/org/alfresco/rest/SampleCommentsTest.java
index ba09905e9..ad3f01989 100644
--- a/e2e-test/java/org/alfresco/rest/SampleCommentsTest.java
+++ b/e2e-test/java/org/alfresco/rest/SampleCommentsTest.java
@@ -36,7 +36,7 @@ public class SampleCommentsTest extends RestTest
     }
 
     @Test
-    public void addComments() throws JsonToModelConversionException
+    public void addComments() throws JsonToModelConversionException, Exception
     {
         commentsAPI.addComment(document.getId(), "This is a new comment");
         commentsAPI.usingRestWrapper()
@@ -52,7 +52,7 @@ public class SampleCommentsTest extends RestTest
     }
 
     @Test
-    public void updateComment() throws JsonToModelConversionException
+    public void updateComment() throws JsonToModelConversionException, Exception
     {
         // add initial comment
         String commentId = commentsAPI.addComment(document.getId(), "This is a new comment").getId();
diff --git a/e2e-test/java/org/alfresco/rest/SamplePeopleTest.java b/e2e-test/java/org/alfresco/rest/SamplePeopleTest.java
index d4247b267..2b2c67c40 100644
--- a/e2e-test/java/org/alfresco/rest/SamplePeopleTest.java
+++ b/e2e-test/java/org/alfresco/rest/SamplePeopleTest.java
@@ -1,7 +1,5 @@
 package org.alfresco.rest;
 
-import org.alfresco.rest.RestPeopleApi;
-import org.alfresco.rest.exception.JsonToModelConversionException;
 import org.alfresco.utility.data.DataUser;
 import org.alfresco.utility.exception.DataPreparationException;
 import org.alfresco.utility.model.UserModel;
@@ -30,7 +28,7 @@ public class SamplePeopleTest extends RestTest
     }
 
     @Test
-    public void getPersonCheckResponseAndStatus() throws JsonToModelConversionException
+    public void getPersonCheckResponseAndStatus() throws Exception
     {
         peopleAPI.getPerson(userModel.getUsername())
                     .assertResponseIsNotEmpty();        
@@ -40,7 +38,7 @@ public class SamplePeopleTest extends RestTest
     }
 
     @Test
-    public void getPersonCheckStatusCode1() throws JsonToModelConversionException
+    public void getPersonCheckStatusCode1() throws Exception
     {
         peopleAPI.getPerson(userModel.getUsername())
                     .assertPersonHasName(userModel.getUsername());
diff --git a/e2e-test/java/org/alfresco/rest/SampleSitesTest.java b/e2e-test/java/org/alfresco/rest/SampleSitesTest.java
index 8637f7db6..27768ba27 100644
--- a/e2e-test/java/org/alfresco/rest/SampleSitesTest.java
+++ b/e2e-test/java/org/alfresco/rest/SampleSitesTest.java
@@ -37,13 +37,13 @@ public class SampleSitesTest extends RestTest
     }
 
     @Test
-    public void getSiteResponseNotNull() throws JsonToModelConversionException
+    public void getSiteResponseNotNull() throws JsonToModelConversionException, Exception
     {
         siteAPI.getSite(siteModel.getId()).assertResponseIsNotEmpty();
     }
 
     @Test
-    public void getSiteCheckStatusCode() throws JsonToModelConversionException
+    public void getSiteCheckStatusCode() throws JsonToModelConversionException, Exception
     {
         siteAPI.getSite(siteModel.getId());
         siteAPI.usingRestWrapper()
@@ -51,14 +51,14 @@ public class SampleSitesTest extends RestTest
     }
 
     @Test
-    public void getSitesResponseNotEmpty() throws JsonToModelConversionException
+    public void getSitesResponseNotEmpty() throws JsonToModelConversionException, Exception
     {
         siteAPI.getSites()
                 .assertThatResponseIsNotEmpty();
     }
 
     @Test
-    public void getSitesCheckStatusCode() throws JsonToModelConversionException
+    public void getSitesCheckStatusCode() throws JsonToModelConversionException, Exception
     {
         siteAPI.getSites();
         siteAPI.usingRestWrapper()
@@ -66,13 +66,13 @@ public class SampleSitesTest extends RestTest
     }
 
     @Test
-    public void sitesCollectionHasPagination() throws JsonToModelConversionException
+    public void sitesCollectionHasPagination() throws JsonToModelConversionException, Exception
     {
         siteAPI.getSites().assertResponseHasPagination();
     }
 
     @Test
-    public void addMemberToSiteCheckStatusCode() throws JsonToModelConversionException, DataPreparationException
+    public void addMemberToSiteCheckStatusCode() throws JsonToModelConversionException, DataPreparationException, Exception
     {
         UserModel newMember = dataUser.createRandomTestUser();
         SiteMember siteMember = new SiteMember(Role.SiteCollaborator.toString(), 
@@ -84,14 +84,14 @@ public class SampleSitesTest extends RestTest
     }
 
     @Test
-    public void isSiteReturned() throws JsonToModelConversionException
+    public void isSiteReturned() throws JsonToModelConversionException, Exception
     {
         siteAPI.getAllSites()
                 .assertThatResponseHasSite(siteModel.getId());
     }
 
     @Test
-    public void checkSiteDetails() throws JsonToModelConversionException
+    public void checkSiteDetails() throws JsonToModelConversionException, Exception
     {
         siteAPI.getSite(siteModel.getId())
                 .assertResponseIsNotEmpty()