diff --git a/.classpath b/.classpath
index 2905cda..ab57a43 100644
--- a/.classpath
+++ b/.classpath
@@ -21,7 +21,6 @@
-
@@ -34,7 +33,5 @@
-
-
diff --git a/pom.xml b/pom.xml
index e6ad3da..47fc364 100644
--- a/pom.xml
+++ b/pom.xml
@@ -171,11 +171,12 @@
- org.apache.axis
- axis
- 1.4
+ org.apache.axis
+ com.springsource.org.apache.axis
+ 1.4.0
+
wsdl4j
wsdl4j
diff --git a/src/main/java/br/gov/ans/integracao/sei/rest/ProcessoResource.java b/src/main/java/br/gov/ans/integracao/sei/rest/ProcessoResource.java
index d4ee235..d090b08 100644
--- a/src/main/java/br/gov/ans/integracao/sei/rest/ProcessoResource.java
+++ b/src/main/java/br/gov/ans/integracao/sei/rest/ProcessoResource.java
@@ -13,7 +13,6 @@ import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-import java.util.Set;
import javax.inject.Inject;
import javax.persistence.NoResultException;
diff --git a/src/main/java/br/gov/ans/integracao/sei/utils/Constantes.java b/src/main/java/br/gov/ans/integracao/sei/utils/Constantes.java
index 109a46e..d8350b3 100644
--- a/src/main/java/br/gov/ans/integracao/sei/utils/Constantes.java
+++ b/src/main/java/br/gov/ans/integracao/sei/utils/Constantes.java
@@ -3,6 +3,9 @@ package br.gov.ans.integracao.sei.utils;
import javax.enterprise.context.ApplicationScoped;
import javax.inject.Named;
+import org.apache.commons.lang3.time.FastDateFormat;
+import org.codehaus.jackson.map.ObjectMapper;
+
@Named
@ApplicationScoped
public class Constantes {
@@ -28,10 +31,15 @@ public class Constantes {
public static final String SEI_BROKER = "SEI-Broker";
public static final String SEI_RESPONDEU_COM_SUCESSO = "SEI respondeu com sucesso.";
public static String SIM = "S";
+ public static final String SQL_AND = "AND ";
+ public static final String SQL_WHERE = "WHERE ";
public static final int TAMANHO_MAXIMO_ARQUIVO = 16777216;
public static final int TAMANHO_MAXIMO_DOCUMENTO = 22020096;
public static final Integer TAMANHO_PAGINA_PADRAO = 50;
public static final String TEMPLATE_DIR = "sei";
public static final String TEMPLATES_HOME = JBOSS_HOME + "/ans/templates/";
public static final String UTF8 = "UTF-8";
+
+ public static final FastDateFormat DATE_FORMATTER = FastDateFormat.getInstance(DATE_PATTERN);
+ public static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
}
diff --git a/src/main/java/br/gov/ans/integracao/sei/utils/ContatoHelper.java b/src/main/java/br/gov/ans/integracao/sei/utils/ContatoHelper.java
index 36929a9..ba4f749 100644
--- a/src/main/java/br/gov/ans/integracao/sei/utils/ContatoHelper.java
+++ b/src/main/java/br/gov/ans/integracao/sei/utils/ContatoHelper.java
@@ -1,5 +1,8 @@
package br.gov.ans.integracao.sei.utils;
+import static br.gov.ans.integracao.sei.utils.Constantes.DATE_FORMATTER;
+import static br.gov.ans.integracao.sei.utils.Constantes.NAO;
+import static br.gov.ans.integracao.sei.utils.Constantes.SIM;
import static br.gov.ans.integracao.sei.utils.Util.getSOuN;
import java.rmi.RemoteException;
@@ -7,7 +10,6 @@ import java.rmi.RemoteException;
import javax.inject.Inject;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.FastDateFormat;
import br.gov.ans.exceptions.BusinessException;
import br.gov.ans.integracao.sei.client.Contato;
@@ -21,9 +23,7 @@ import br.gov.ans.integracao.sei.modelo.PessoaJuridica;
import br.gov.ans.integracao.sei.modelo.enums.TipoPessoa;
public class ContatoHelper {
-
- private static final FastDateFormat formatter = FastDateFormat.getInstance(Constantes.DATE_PATTERN);
-
+
@Inject
private ContatoDAO contatoDAO;
@@ -54,7 +54,7 @@ public class ContatoHelper {
contato.setOrgaoExpedidor(pessoa.getOrgaoEmissor());
if(pessoa.getDataNascimento() != null){
- contato.setDataNascimento(formatter.format(pessoa.getDataNascimento()));
+ contato.setDataNascimento(DATE_FORMATTER.format(pessoa.getDataNascimento()));
}
contato.setMatricula(pessoa.getMatricula());
@@ -110,9 +110,9 @@ public class ContatoHelper {
private void preencherDadosAssociado(Pessoa pessoa, Contato contato) throws RemoteException, BusinessException, Exception{
if(pessoa.getAssociado() == null){
- contato.setSinEnderecoAssociado(Constantes.NAO);
+ contato.setSinEnderecoAssociado(NAO);
}else{
- contato.setSinEnderecoAssociado(Constantes.SIM);
+ contato.setSinEnderecoAssociado(SIM);
contato.setIdContatoAssociado(getIdContato(pessoa.getAssociado().getSigla())+"");
contato.setNomeContatoAssociado(pessoa.getAssociado().getNome());
diff --git a/src/main/java/br/gov/ans/integracao/sei/utils/PessoaHelper.java b/src/main/java/br/gov/ans/integracao/sei/utils/PessoaHelper.java
index a0198f9..4e0e55e 100644
--- a/src/main/java/br/gov/ans/integracao/sei/utils/PessoaHelper.java
+++ b/src/main/java/br/gov/ans/integracao/sei/utils/PessoaHelper.java
@@ -1,5 +1,7 @@
package br.gov.ans.integracao.sei.utils;
+import static br.gov.ans.integracao.sei.utils.Constantes.DATE_FORMATTER;
+
import java.lang.reflect.Field;
import java.text.ParseException;
import java.util.ArrayList;
@@ -10,7 +12,6 @@ import javax.inject.Inject;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
-import org.apache.commons.lang3.time.FastDateFormat;
import org.jboss.logging.Logger;
import br.gov.ans.exceptions.BusinessException;
@@ -39,9 +40,7 @@ public class PessoaHelper {
@Inject
private MessageUtils messages;
-
- private static final FastDateFormat formatter = FastDateFormat.getInstance(Constantes.DATE_PATTERN);
-
+
public List buildPessoa(Contato[] contatos) throws ParseException, BusinessException, IllegalAccessException, ResourceNotFoundException{
if(ArrayUtils.isNotEmpty(contatos)){
ArrayList pessoas = new ArrayList();
@@ -81,7 +80,7 @@ public class PessoaHelper {
}
if(StringUtils.isNotBlank(contato.getDataNascimento())){
- pessoa.setDataNascimento(formatter.parse(contato.getDataNascimento()));
+ pessoa.setDataNascimento(DATE_FORMATTER.parse(contato.getDataNascimento()));
}
pessoa.setCpf(contato.getCpf());
diff --git a/src/main/java/br/gov/ans/integracao/sei/utils/Util.java b/src/main/java/br/gov/ans/integracao/sei/utils/Util.java
index 9dad780..816e3a3 100644
--- a/src/main/java/br/gov/ans/integracao/sei/utils/Util.java
+++ b/src/main/java/br/gov/ans/integracao/sei/utils/Util.java
@@ -1,5 +1,14 @@
package br.gov.ans.integracao.sei.utils;
+import static br.gov.ans.integracao.sei.utils.Constantes.DATE_FORMATTER;
+import static br.gov.ans.integracao.sei.utils.Constantes.MASCARA_PROCESSO_17;
+import static br.gov.ans.integracao.sei.utils.Constantes.MASCARA_PROCESSO_21;
+import static br.gov.ans.integracao.sei.utils.Constantes.OBJECT_MAPPER;
+import static br.gov.ans.integracao.sei.utils.Constantes.REGEX_SOMENTE_NUMEROS;
+import static br.gov.ans.integracao.sei.utils.Constantes.SQL_AND;
+import static br.gov.ans.integracao.sei.utils.Constantes.SQL_WHERE;
+import static br.gov.ans.integracao.sei.utils.Constantes.TAMANHO_PAGINA_PADRAO;
+
import java.io.IOException;
import java.text.ParseException;
import java.util.Date;
@@ -11,18 +20,13 @@ import javax.swing.text.MaskFormatter;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.time.FastDateFormat;
import org.codehaus.jackson.JsonParseException;
import org.codehaus.jackson.map.JsonMappingException;
-import org.codehaus.jackson.map.ObjectMapper;
import org.codehaus.jackson.type.TypeReference;
import br.gov.ans.exceptions.BusinessException;
public class Util {
- private static final FastDateFormat dateFormater = FastDateFormat.getInstance(Constantes.DATE_PATTERN);
-
- private static final ObjectMapper mapper = new ObjectMapper();
public static String getSOuN(String valor){
if("S".equals(valor) || "s".equals(valor)){
@@ -42,7 +46,7 @@ public class Util {
public static String formatarData(Date data){
if(data != null){
- return dateFormater.format(data);
+ return DATE_FORMATTER.format(data);
}
return null;
@@ -66,9 +70,9 @@ public class Util {
try {
switch (numero.length()){
case 17:
- return formatarString(numero, Constantes.MASCARA_PROCESSO_17);
+ return formatarString(numero, MASCARA_PROCESSO_17);
case 21:
- return formatarString(numero, Constantes.MASCARA_PROCESSO_21);
+ return formatarString(numero, MASCARA_PROCESSO_21);
default:
throw new BusinessException("Número de processo inválido.");
}
@@ -112,14 +116,14 @@ public class Util {
public static Map jsonToMap(String json) throws JsonParseException,JsonMappingException, IOException {
Map out = new HashMap();
- out = mapper.readValue(json, new TypeReference>(){});
+ out = OBJECT_MAPPER.readValue(json, new TypeReference>(){});
return out;
}
public static String decodeBase64(String base64){
- return new String(Base64.decodeBase64(base64));
+ return new String(Base64.decodeBase64(base64.getBytes()));
}
public static String encodeBase64(String texto){
@@ -143,7 +147,7 @@ public class Util {
public static void setPaginacaoQuery(Query query, Integer pagina, Integer qtdRegistros){
if(qtdRegistros == null){
- qtdRegistros = Constantes.TAMANHO_PAGINA_PADRAO;
+ qtdRegistros = TAMANHO_PAGINA_PADRAO;
}
if(pagina == null){
@@ -156,14 +160,14 @@ public class Util {
}
public static String andOrWhere(StringBuilder sql){
- if(sql.toString().contains("WHERE ")){
- return "AND ";
+ if(sql.toString().contains(SQL_WHERE)){
+ return SQL_AND;
}
- return "WHERE ";
+ return SQL_WHERE;
}
public static String getOnlyNumbers(String string) throws Exception{
- return string.replaceAll(Constantes.REGEX_SOMENTE_NUMEROS,"");
+ return string.replaceAll(REGEX_SOMENTE_NUMEROS,"");
}
}
diff --git a/src/test/java/br/gov/ans/integracao/sei/testes/Base64Decoder.java b/src/test/java/br/gov/ans/integracao/sei/testes/Base64Decoder.java
index 3b3f990..b04f1bc 100644
--- a/src/test/java/br/gov/ans/integracao/sei/testes/Base64Decoder.java
+++ b/src/test/java/br/gov/ans/integracao/sei/testes/Base64Decoder.java
@@ -6,7 +6,7 @@ import org.apache.commons.codec.binary.Base64;
public class Base64Decoder {
public static void main(String[] args) {
String base64 = "PGh0bWw+PGhlYWQ+PC9oZWFkPjxib2R5PlRFU1RFVEVTVEU8L2JvZHk+PC9odG1sPg==";
-
- System.out.println(new String(Base64.decodeBase64(base64)));
+
+ System.out.println(new String(Base64.decodeBase64(base64.getBytes())));
}
}
diff --git a/src/test/java/br/gov/ans/integracao/sei/testes/Base64Encoder.java b/src/test/java/br/gov/ans/integracao/sei/testes/Base64Encoder.java
index e6cbe35..fac5bbe 100644
--- a/src/test/java/br/gov/ans/integracao/sei/testes/Base64Encoder.java
+++ b/src/test/java/br/gov/ans/integracao/sei/testes/Base64Encoder.java
@@ -5,20 +5,21 @@ import java.io.FileInputStream;
import java.io.IOException;
import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.IOUtils;
public class Base64Encoder {
public static void main(String[] args) throws IOException {
String string = "{\"content\":\"tentativa 1
tentativa 2
tentativa 3 \\r tentativa 4 \\n fim!
teste da tag \"}";
-
-// System.out.println(string);
-
-// System.out.println(Base64.encodeBase64String(string.getBytes()));
+
Base64Encoder encoder = new Base64Encoder();
System.out.println(encoder.getBase64("0693609.pdf"));
System.out.println(encoder.getMD5("0693609.pdf"));
- System.out.println(Base64.encodeBase64String("{\"regAns\":\"363022\",\"razaoSocial\":\"BRADESCO SAUDE E ASSISTENCIA S.A\",\"emailCadop\":\"teste@teste.com\",\"nuCnpj\":\"0000000000\",\"noCargoRepr\":\"Diretor\",\"noRepresentante\":\"André Guimarães\",\"anoInicio\":\"2016\",\"anoFinal\":\"2017\",\"numeroDocumento\":\"00000000\"}".getBytes()));
+ System.out.println(
+ new String(Base64.encodeBase64(
+ "{\"regAns\":\"363022\",\"razaoSocial\":\"BRADESCO SAUDE E ASSISTENCIA S.A\",\"emailCadop\":\"teste@teste.com\",\"nuCnpj\":\"0000000000\",\"noCargoRepr\":\"Diretor\",\"noRepresentante\":\"André Guimarães\",\"anoInicio\":\"2016\",\"anoFinal\":\"2017\",\"numeroDocumento\":\"00000000\"}"
+ .getBytes())));
}
public String getBase64(String arquivo){
@@ -34,14 +35,15 @@ public class Base64Encoder {
} catch (Exception e) {
e.printStackTrace();
}
-
- return Base64.encodeBase64String(bytes);
+
+ return new String(Base64.encodeBase64(bytes));
}
public String getMD5(String arquivo) throws IOException{
ClassLoader classLoader = getClass().getClassLoader();
FileInputStream fis = new FileInputStream(new File(classLoader.getResource(arquivo).getFile()));
- String md5 = org.apache.commons.codec.digest.DigestUtils.md5Hex(fis);
+
+ String md5 = org.apache.commons.codec.digest.DigestUtils.md5Hex(IOUtils.toByteArray(fis));
fis.close();
return md5;
diff --git a/src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java b/src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java
index 2162106..8bb602b 100644
--- a/src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java
+++ b/src/test/java/br/gov/ans/integracao/sei/testes/FunctionalTest.java
@@ -8,7 +8,9 @@ public class FunctionalTest {
protected final String USUARIO = "desenv_integracao_sei";
protected final String SENHA = "integra_sei_2016";
- protected static final Boolean DESENVOLVIMENTO = false;
+ protected static final Boolean DESENVOLVIMENTO = true;
+
+ protected static final String BASIC = "Basic ZGVzZW52X2ludGVncmFjYW9fc2VpOmludGVncmFfc2VpXzIwMTY=";
@BeforeClass
public static void setup() {
diff --git a/src/test/java/br/gov/ans/integracao/sei/testes/SeiBrokerTest.java b/src/test/java/br/gov/ans/integracao/sei/testes/SeiBrokerTest.java
index 90a9556..65dc616 100644
--- a/src/test/java/br/gov/ans/integracao/sei/testes/SeiBrokerTest.java
+++ b/src/test/java/br/gov/ans/integracao/sei/testes/SeiBrokerTest.java
@@ -9,6 +9,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.io.IOUtils;
import org.junit.FixMethodOrder;
import org.junit.Test;
import org.junit.runners.MethodSorters;
@@ -47,8 +48,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void AA_incluirProcessoTest(){
Response response = given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(buildNovoProcesso())
@@ -61,14 +61,13 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void AB_consultarProcessoTest(){
- given().auth().basic(USUARIO, SENHA).accept("application/json").when().get("/cosap/processos/"+processoCriado).then().statusCode(200);
+ given().header("Authorization",BASIC).accept("application/json").when().get("/cosap/processos/"+processoCriado).then().statusCode(200);
}
@Test
public void AC_incluirDocumentoTest() {
Response response = given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(buildDocumento())
@@ -82,8 +81,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void AD_incluirDocumentoInternoTest() {
Response response = given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(buildDocumentoInterno())
@@ -96,59 +94,58 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void AE_consultarDocumentoTest() {
- given().auth().basic(USUARIO, SENHA).accept("application/json").when().get("/cosap/documentos/"+documentoCriado).then().statusCode(200);
+ given().header("Authorization",BASIC).accept("application/json").when().get("/cosap/documentos/"+documentoCriado).then().statusCode(200);
}
@Test
public void AF_consultarDocumentosEnviadosBrokerTest(){
- given().auth().basic(USUARIO, SENHA).accept("application/json").when().get("/cosap/documentos/enviados-broker").then().statusCode(200);
+ given().header("Authorization",BASIC).accept("application/json").when().get("/cosap/documentos/enviados-broker").then().statusCode(200);
}
@Test
public void AG_consultarDocumentosPorInteressadosTest(){
- given().auth().basic(USUARIO, SENHA).accept("application/json").when().get("/interessados/363022/documentos").then().statusCode(200);
+ given().header("Authorization",BASIC).accept("application/json").when().get("/interessados/363022/documentos").then().statusCode(200);
}
@Test
public void AH_consultarProcessos(){
- given().auth().basic(USUARIO, SENHA).accept("application/json").when().get("/processos").then().statusCode(200);
+ given().header("Authorization",BASIC).accept("application/json").when().get("/processos").then().statusCode(200);
}
@Test
public void AI_exportarDocumentoTest(){
- given().auth().basic(USUARIO, SENHA).when().get("/cosap/documentos/"+documentoCriado+"/pdf").then().statusCode(200);
+ given().header("Authorization",BASIC).when().get("/cosap/documentos/"+documentoCriado+"/pdf").then().statusCode(200);
}
@Test
public void AJ_listarUnidadesTest(){
- given().auth().basic(USUARIO, SENHA).accept("application/json").when().get("/unidades").then().statusCode(200);
+ given().header("Authorization",BASIC).accept("application/json").when().get("/unidades").then().statusCode(200);
}
@Test
public void AL_listarSeriesTest(){
- given().auth().basic(USUARIO, SENHA).accept("application/json").when().get("/cosit/series").then().statusCode(200);
+ given().header("Authorization",BASIC).accept("application/json").when().get("/cosit/series").then().statusCode(200);
}
@Test
public void AM_listarTiposDeProcessoTest(){
- given().auth().basic(USUARIO, SENHA).accept("application/json").when().get("/cosit/processos/tipos").then().statusCode(200);
+ given().header("Authorization",BASIC).accept("application/json").when().get("/cosit/processos/tipos").then().statusCode(200);
}
@Test
public void AN_listarExtensoesTest(){
- given().auth().basic(USUARIO, SENHA).accept("application/json").when().get("/cosit/extensoes").then().statusCode(200);
+ given().header("Authorization",BASIC).accept("application/json").when().get("/cosit/extensoes").then().statusCode(200);
}
@Test
public void AO_consultarCodigoUnidadeTest(){
- given().auth().basic(USUARIO, SENHA).accept("application/json").when().get("/unidades/cotec/codigo").then().statusCode(200);
+ given().header("Authorization",BASIC).accept("application/json").when().get("/unidades/cotec/codigo").then().statusCode(200);
}
// @Test
public void AP_cancelarDocumentoTest(){
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(buildCancelamentoDocumento())
@@ -158,8 +155,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void AQ_concluirProcessoTest(){
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(processoCriado)
@@ -168,14 +164,13 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void AR_reabrirProcessoTest(){
- given().auth().basic(USUARIO, SENHA).accept("application/json").when().delete("/cosap/processos/concluidos/"+processoCriado).then().statusCode(200);
+ given().header("Authorization",BASIC).accept("application/json").when().delete("/cosap/processos/concluidos/"+processoCriado).then().statusCode(200);
}
@Test
public void AS_gerarBlocoReuniaoTest(){
Response response = given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(buildNovoBloco(TipoBloco.REUNIAO))
@@ -189,8 +184,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void AT_incluirProcessoNoBlocoTest(){
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.body(processoCriado)
.when().post("/cosap/blocos/"+blocoCriado+"/processos").then().statusCode(200);
@@ -199,8 +193,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void AU_removerProcessoBlocoTest(){
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.body(processoCriado)
.when().delete("/cosap/blocos/"+blocoCriado+"/processos/"+processoCriado).then().statusCode(200);
}
@@ -208,8 +201,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void AV_gerarBlocoAssinaturaTest(){
Response response = given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.body(buildNovoBloco(TipoBloco.ASSINATURA))
.when().post("/cosap/blocos");
@@ -222,8 +214,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void AX_incluirDocumentoNoBlocoTest(){
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.body(documentoInternoCriado)
.when().post("/cosap/blocos/"+blocoCriado+"/documentos").then().statusCode(200);
@@ -232,8 +223,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void AZ_disponibilizarBlocoTest(){
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.body(blocoCriado)
.when().post("/cosap/blocos/disponibilizados").then().statusCode(200);
@@ -242,8 +232,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void BA_indisponibilizarBlocoTest(){
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.when().delete("/cosap/blocos/disponibilizados/"+blocoCriado).then().statusCode(200);
}
@@ -251,8 +240,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void BB_consultarBlocoTest(){
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.accept("application/json")
.when().get("/cosap/blocos/"+blocoCriado).then().statusCode(200);
@@ -261,24 +249,21 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void BC_removerDocumentoBlocoTest(){
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.when().delete("/cosap/blocos/"+blocoCriado+"/documentos/"+documentoInternoCriado).then().statusCode(200);
}
@Test
public void BD_excluirBlocoTest(){
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.when().delete("/cosap/blocos/"+blocoCriado).then().statusCode(200);
}
@Test
public void BE_enviarProcessoTest(){
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(buildEnvioDeProcesso())
@@ -294,8 +279,7 @@ public class SeiBrokerTest extends FunctionalTest{
// String nomeArquivo = "OF-599-2016-DIDES-33902438169201608-16513178000176-ABI.pdf";
Response response = given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(buildArquivo(nomeArquivo))
@@ -309,8 +293,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void BG_incluirDocumentoPorArquivoTest() {
Response response = given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(buildDocumentoPorArquivo())
@@ -326,8 +309,7 @@ public class SeiBrokerTest extends FunctionalTest{
String template = "gear-reajuste";
Response response = given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(buildDocumentoComTemplate())
@@ -347,8 +329,7 @@ public class SeiBrokerTest extends FunctionalTest{
arquivo.setConteudo(partesArquivo.get(0));
Response response = given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(arquivo)
@@ -371,8 +352,7 @@ public class SeiBrokerTest extends FunctionalTest{
parte.setConteudo(partesArquivo.get(i));
response = given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(parte)
@@ -385,8 +365,7 @@ public class SeiBrokerTest extends FunctionalTest{
//// @Test
public void BK_incluirDocumentoPorArquivoTest() {
Response response = given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(buildDocumentoPorArquivo())
@@ -400,8 +379,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void BL_abrirProcessoTest(){
Response response = given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(buildNovoProcessoUmaUnidade())
@@ -419,8 +397,7 @@ public class SeiBrokerTest extends FunctionalTest{
s.setMotivo("Teste automatizado de sobrestamento.");
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.body(s)
@@ -430,8 +407,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void BN_removerSobrestamentoProcessoTest(){
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.when().delete("/cosap/processos/sobrestados/"+processoCriado).then().statusCode(200);
@@ -440,8 +416,7 @@ public class SeiBrokerTest extends FunctionalTest{
@Test
public void BO_listarContatos(){
given()
- .auth()
- .basic(USUARIO, SENHA)
+ .header("Authorization",BASIC)
.contentType("application/json")
.accept("application/json")
.when().get("cosap/contatos/operadoras?qtdRegistros=20").then().statusCode(200);
@@ -619,7 +594,10 @@ public class SeiBrokerTest extends FunctionalTest{
d.setSigla("alexander.mesquita");
documento.setDestinatarios(new Destinatario[]{d});
- documento.setConteudo(Base64.encodeBase64String("{\"regAns\":\"363022\",\"razaoSocial\":\"BRADESCO SAUDE E ASSISTENCIA S.A\",\"emailCadop\":\"teste@teste.com\",\"nuCnpj\":\"0000000000\",\"noCargoRepr\":\"Diretor\",\"noRepresentante\":\"André Guimarães\",\"anoInicio\":\"2016\",\"anoFinal\":\"2017\",\"numeroDocumento\":\"00000000\"}".getBytes()));
+ documento.setConteudo(
+ new String(Base64.encodeBase64(
+ "{\"regAns\":\"363022\",\"razaoSocial\":\"BRADESCO SAUDE E ASSISTENCIA S.A\",\"emailCadop\":\"teste@teste.com\",\"nuCnpj\":\"0000000000\",\"noCargoRepr\":\"Diretor\",\"noRepresentante\":\"André Guimarães\",\"anoInicio\":\"2016\",\"anoFinal\":\"2017\",\"numeroDocumento\":\"00000000\"}"
+ .getBytes())));
return documento;
}
@@ -658,7 +636,7 @@ public class SeiBrokerTest extends FunctionalTest{
public String getMD5(String arquivo) throws IOException{
ClassLoader classLoader = getClass().getClassLoader();
FileInputStream fis = new FileInputStream(new File(classLoader.getResource(arquivo).getFile()));
- String md5 = org.apache.commons.codec.digest.DigestUtils.md5Hex(fis);
+ String md5 = org.apache.commons.codec.digest.DigestUtils.md5Hex(IOUtils.toByteArray(fis));
fis.close();
return md5;
@@ -679,7 +657,7 @@ public class SeiBrokerTest extends FunctionalTest{
e.printStackTrace();
}
- return Base64.encodeBase64String(bytes);
+ return new String(Base64.encodeBase64(bytes));
}
public String getProcessoCriado(){
--
libgit2 0.21.2