upgrade to TasProperties

This commit is contained in:
Paul Brodner
2016-08-04 23:25:37 +03:00
parent 57458b28ae
commit 72b44f18cb
4 changed files with 19 additions and 6 deletions

View File

@@ -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();

View File

@@ -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");

View File

@@ -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");