upgrade to TasProperties

e2e-test/java/org/alfresco/rest/BaseRestTest.java

@@ -1,5 +1,7 @@
 package org.alfresco.rest;
 
+import org.alfresco.tester.ServerHealth;
+import org.alfresco.tester.TasProperties;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.testng.AbstractTestNGSpringContextTests;
@@ -13,9 +15,17 @@ public class BaseRestTest extends AbstractTestNGSpringContextTests
     @Autowired
     protected RestProperties restProperties;
 
+    @Autowired
+    protected TasProperties properties;
+
+    @Autowired
+    protected ServerHealth serverHealth;
+
     @BeforeClass
-    public void setup()
+    public void setup() throws Exception
     {
+        serverHealth.assertIfServerOnline();
+
         RestAssured.baseURI = restProperties.envProperty().getTestServerUrl();
         RestAssured.port = restProperties.envProperty().getPort();
         RestAssured.basePath = restProperties.getRestBasePath();

e2e-test/java/org/alfresco/rest/SampleATest.java

@@ -12,14 +12,14 @@ public class SampleATest extends BaseRestTest
     @Autowired
     RestSites onSites;
 
-    @Test
+    @Test(groups = {"rest-api-v1", "sanity"})
     public void sampleATestMethod1()
     {
         UserModel admin = new UserModel("admin", "admin");
         Assert.assertFalse(onSites.withAuthUser(admin).getSites().getEntries().isEmpty(), "We have sites");
     }
 
-    @Test
+    @Test(groups = {"rest-api-v1", "sanity"})
     public void sampleATestMethod2()
     {
         UserModel admin = new UserModel("admin", "a");

e2e-test/java/org/alfresco/rest/SampleBTest.java

@@ -12,14 +12,14 @@ public class SampleBTest extends BaseRestTest
     @Autowired
     RestSites onSites;
 
-    @Test
+    @Test(groups = {"rest-api-v1", "sanity"})
     public void sampleBTestMethod1()
     {
         UserModel admin = new UserModel("admin", "admin");
         Assert.assertFalse(onSites.withAuthUser(admin).getSites().getEntries().isEmpty(), "We have sites");
     }
 
-    @Test
+    @Test(groups = {"rest-api-v1", "sanity"})
     public void sampleBTestMethod2()
     {
         UserModel admin = new UserModel("admin", "a");
@@ -29,7 +29,7 @@ public class SampleBTest extends BaseRestTest
     }
     
     
-    @Test
+    @Test(groups = {"rest-api-v1"})
     public void getSite()
     {
         UserModel admin = new UserModel("admin", "admin"); 

e2e-test/resources/smoke-rest.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
 <suite name="Suite" parallel="classes">
+	<listeners>
+		<listener class-name="org.alfresco.tester.report.ReportListenerAdapter"></listener>
+	</listeners>
 	<test name="Test">
 		<classes>
 			<class name="org.alfresco.rest.SampleATest"></class>