diff --git a/pom.xml b/pom.xml
index 2f771dd..21fc7b7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -168,8 +168,7 @@
io.swagger
swagger-annotations
1.5.12
-
-
+
io.swagger
swagger-jaxrs
diff --git a/src/main/java/br/gov/ans/dao/DAO.java b/src/main/java/br/gov/ans/dao/DAO.java
index 8941f53..e404445 100644
--- a/src/main/java/br/gov/ans/dao/DAO.java
+++ b/src/main/java/br/gov/ans/dao/DAO.java
@@ -79,8 +79,7 @@ public class DAO implements Serializable{
return query;
}
-
-
+
@Transactional
@SuppressWarnings("unchecked")
public List getPaginatedResultList(int first, int pageSize) {
diff --git a/src/test/java/br/gov/ans/templates/teste/BaseTest.java b/src/test/java/br/gov/ans/templates/teste/BaseTest.java
new file mode 100644
index 0000000..67f0c44
--- /dev/null
+++ b/src/test/java/br/gov/ans/templates/teste/BaseTest.java
@@ -0,0 +1,22 @@
+package br.gov.ans.templates.teste;
+
+
+import org.junit.BeforeClass;
+
+import com.jayway.restassured.RestAssured;
+
+public class BaseTest {
+
+ protected static final String USUARIO = "teste-rest-assured";
+ protected static final String SENHA = "assured-testes";
+ protected static final String HOST = "http://ansdsjboss01";
+ protected static final int PORTA = 80;
+
+ @BeforeClass
+ public static void setup() {
+ RestAssured.baseURI = HOST;
+ RestAssured.port = PORTA;
+ RestAssured.basePath = "/templates-broker/service/";
+ }
+
+}
diff --git a/src/test/java/br/gov/ans/templates/teste/FunctionalTest.java b/src/test/java/br/gov/ans/templates/teste/FunctionalTest.java
deleted file mode 100644
index 4865639..0000000
--- a/src/test/java/br/gov/ans/templates/teste/FunctionalTest.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package br.gov.ans.templates.teste;
-
-
-import org.junit.BeforeClass;
-
-import com.jayway.restassured.RestAssured;
-
-public class FunctionalTest {
-
- protected final String USUARIO = "andre.guimaraes";
- protected final String SENHA = "1qaz2wsx";
- protected static final Boolean DESENVOLVIMENTO = true;
-
- @BeforeClass
- public static void setup() {
- if(DESENVOLVIMENTO){
- String port = System.getProperty("server.port");
- if (port == null) {
- RestAssured.port = Integer.valueOf(8080);
- } else {
- RestAssured.port = Integer.valueOf(port);
- }
- }
-
- String basePath = System.getProperty("server.base");
- if(basePath==null){
- basePath = "/templates-broker/service/";
- }
- RestAssured.basePath = basePath;
-
- String baseHost = System.getProperty("server.host");
- if(baseHost==null){
- if(DESENVOLVIMENTO){
- baseHost = "http://localhost";
- }else{
-// baseHost = "http://ansprwww02.ans.gov.br";
- }
- }
- RestAssured.baseURI = baseHost;
-
- }
-}
diff --git a/src/test/java/br/gov/ans/templates/teste/TemplateTest.java b/src/test/java/br/gov/ans/templates/teste/TemplateTest.java
new file mode 100644
index 0000000..c1348d9
--- /dev/null
+++ b/src/test/java/br/gov/ans/templates/teste/TemplateTest.java
@@ -0,0 +1,116 @@
+package br.gov.ans.templates.teste;
+
+
+import static com.jayway.restassured.RestAssured.given;
+
+import java.time.LocalDateTime;
+
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+import br.gov.ans.templates.to.Template;
+
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TemplateTest extends BaseTest{
+
+ private static final String nomeTemplate = "teste-auto-" + LocalDateTime.now();
+
+ @Test
+ public void A_deveIncluirTemplate(){
+ Template template = new Template();
+
+ template.setNome(nomeTemplate);
+ template.setDescricao("Teste automatizado realizado pelo REST Assured.");
+ template.setResponsavel("teste-rest-assured");
+ template.setExemplo("Não há");
+ template.setCorpo("TESTE AUTOMATIZADO!
");
+
+ given()
+ .auth()
+ .basic(USUARIO, SENHA)
+ .contentType("application/json")
+ .body(template)
+ .expect()
+ .statusCode(201)
+ .when()
+ .post("/templates");
+ }
+
+ @Test
+ public void B_deveListarTemplates(){
+ given()
+ .auth()
+ .basic(USUARIO, SENHA)
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/templates");
+ }
+
+ @Test
+ public void C_deveConsultarTemplate(){
+ given()
+ .auth()
+ .basic(USUARIO, SENHA)
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/templates/" + nomeTemplate);
+ }
+
+ @Test
+ public void D_deveRetornarCorpoTemplate(){
+ given()
+ .auth()
+ .basic(USUARIO, SENHA)
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/templates/" + nomeTemplate + "/corpo");
+ }
+
+ @Test
+ public void E_deveAtualizarTemplate(){
+ Template template = new Template();
+
+ template.setNome(nomeTemplate);
+ template.setDescricao("Teste automatizado de edição realizado pelo REST Assured.");
+ template.setResponsavel("teste-rest-assured");
+ template.setExemplo("Não há");
+ template.setCorpo("TESTE AUTOMATIZADO DE EDIÇÃO!
");
+
+ given()
+ .auth()
+ .basic(USUARIO, SENHA)
+ .contentType("application/json")
+ .body(template)
+ .expect()
+ .statusCode(200)
+ .when()
+ .put("/templates/" + nomeTemplate);
+ }
+
+ @Test
+ public void F_deveListarVersoesTemplate(){
+ given()
+ .auth()
+ .basic(USUARIO, SENHA)
+ .expect()
+ .statusCode(200)
+ .when()
+ .get("/templates/" + nomeTemplate + "/versoes");
+ }
+
+ @Test
+ public void G_deveExcluirTemplate(){
+ given()
+ .auth()
+ .basic(USUARIO, SENHA)
+ .expect()
+ .statusCode(200)
+ .when()
+ .delete("/templates/" + nomeTemplate);
+ }
+
+ }
diff --git a/src/test/java/br/gov/ans/templates/teste/TemplatesTest.java b/src/test/java/br/gov/ans/templates/teste/TemplatesTest.java
deleted file mode 100644
index b58fcb5..0000000
--- a/src/test/java/br/gov/ans/templates/teste/TemplatesTest.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package br.gov.ans.templates.teste;
-
-
-import static com.jayway.restassured.RestAssured.given;
-
-import java.io.File;
-import java.io.FileInputStream;
-
-import org.junit.FixMethodOrder;
-import org.junit.Test;
-import org.junit.runners.MethodSorters;
-
-import br.gov.ans.templates.to.Template;
-
-import com.jayway.restassured.response.Response;
-
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
-public class TemplatesTest extends FunctionalTest{
-
-// @Test
- public void AA_incluirTemplateTest(){
- Response response = given()
- .auth()
- .basic(USUARIO, SENHA)
- .contentType("application/json")
- .body(buildTemplate("gear-nota-gefap-deferimento.mustache"))
- .when().post("/templates");
-
-// processoCriado = response.getBody().as(RetornoGeracaoProcedimento.class).getProcedimentoFormatado().replaceAll("[^0-9+]", "");
-
- response.then().statusCode(201);
- }
-
- public Template buildTemplate(String arquivo){
- Template template = new Template();
-
- template.setNome("gear-nota-gefap-deferimento");
- template.setDescricao("Notas Técnicas de Deferimento antes e depois do Reajuste do sistema GEAR.");
- template.setResponsavel("cristiano.rocha");
- template.setExemplo("Não informado");
- template.setCorpo(new String(readFile(arquivo)));
-
- return template;
- }
-
- public byte[] readFile(String nome){
- ClassLoader classLoader = getClass().getClassLoader();
-
- File file = new File(classLoader.getResource(nome).getFile());
-
- byte[] bytes = new byte[(int) file.length()];
-
- try {
- FileInputStream fileInputStream = new FileInputStream(file);
- fileInputStream.read(bytes);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return bytes;
- }
- }
--
libgit2 0.21.2