Skip to content

Commit

Permalink
Se cambia declaraciones a inglés.
Browse files Browse the repository at this point in the history
  • Loading branch information
JuanGamezSW committed Dec 13, 2018
1 parent 713335d commit 88e7eec
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 24 deletions.
2 changes: 1 addition & 1 deletion src/main/java/Services/Csd/SWCsdService.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public SWCsdService(String token, String URI) {
super(token, URI);
}

public IResponse CargarCsd(String b64Cer, String b64Key, String passwordCsd, String certificateType, boolean isActive) throws AuthException, GeneralException, IOException {
public IResponse UploadMyCsd(String b64Cer, String b64Key, String passwordCsd, String certificateType, boolean isActive) throws AuthException, GeneralException, IOException {
CsdOptionsRequest settings = new CsdOptionsRequest(getToken(), getURI(), b64Cer, b64Key, passwordCsd, certificateType, isActive);
CsdRequest req = new CsdRequest();
return req.sendRequest(settings);
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/Utils/Requests/Csd/CsdRequest.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
import Utils.Requests.IRequestor;
import Utils.Requests.Csd.CsdOptionsRequest;
import Utils.Responses.IResponse;
import Utils.Responses.Csd.CargaCsdResponse;
import Utils.Responses.Csd.UploadCsdResponse;;

public class CsdRequest implements IRequestor {
public IResponse sendRequest(IRequest request) throws GeneralException, AuthException, IOException {
Expand Down Expand Up @@ -56,17 +56,17 @@ public IResponse sendRequest(IRequest request) throws GeneralException, AuthExce
JSONObject body = new JSONObject(responseString);
if (status == 200) {
String data = body.getString("data");
return new CargaCsdResponse(status, body.getString("status"),data, "OK", "OK");
return new UploadCsdResponse(status, body.getString("status"),data, "OK", "OK");

} else {
String messageDetail = "";
if (!body.isNull("messageDetail")) {
messageDetail = body.getString("messageDetail");
}
return new CargaCsdResponse(status, body.getString("status"), body.getString("message"), messageDetail);
return new UploadCsdResponse(status, body.getString("status"), body.getString("message"), messageDetail);
}
} else {
return new CargaCsdResponse(status, "error", responseB.getStatusLine().getReasonPhrase(), responseB.getStatusLine().getReasonPhrase());
return new UploadCsdResponse(status, "error", responseB.getStatusLine().getReasonPhrase(), responseB.getStatusLine().getReasonPhrase());
}
} catch (JSONException e) {
throw new GeneralException(500, e.getMessage());
Expand Down
16 changes: 0 additions & 16 deletions src/main/java/Utils/Responses/Csd/CargaCsdResponse.java

This file was deleted.

16 changes: 16 additions & 0 deletions src/main/java/Utils/Responses/Csd/UploadCsdResponse.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package Utils.Responses.Csd;

import Utils.Responses.IResponse;

public class UploadCsdResponse extends IResponse {

public String data;

public UploadCsdResponse(int httpStatusCode, String status, String data, String msg, String msgDetail) {
super(httpStatusCode, status, msg, msgDetail);
this.data = data;
}
public UploadCsdResponse(int httpStatusCode, String status, String msg, String msgDetail) {
super(httpStatusCode, status, msg, msgDetail);
}
}
6 changes: 3 additions & 3 deletions src/test/java/Tests/Csd/SWCsdServiceTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import Services.Csd.SWCsdService;
import Tests.Utils;
import Utils.Responses.Csd.CargaCsdResponse;
import Utils.Responses.Csd.UploadCsdResponse;
import junit.framework.TestCase;

public class SWCsdServiceTest extends TestCase {
Expand All @@ -15,8 +15,8 @@ public class SWCsdServiceTest extends TestCase {
public String token = "T2lYQ0t4L0RHVkR4dHZ5Nkk1VHNEakZ3Y0J4Nk9GODZuRyt4cE1wVm5tbXB3YVZxTHdOdHAwVXY2NTdJb1hkREtXTzE3dk9pMmdMdkFDR2xFWFVPUXpTUm9mTG1ySXdZbFNja3FRa0RlYURqbzdzdlI2UUx1WGJiKzViUWY2dnZGbFloUDJ6RjhFTGF4M1BySnJ4cHF0YjUvbmRyWWpjTkVLN3ppd3RxL0dJPQ.T2lYQ0t4L0RHVkR4dHZ5Nkk1VHNEakZ3Y0J4Nk9GODZuRyt4cE1wVm5tbFlVcU92YUJTZWlHU3pER1kySnlXRTF4alNUS0ZWcUlVS0NhelhqaXdnWTRncklVSWVvZlFZMWNyUjVxYUFxMWFxcStUL1IzdGpHRTJqdS9Zakw2UGRiMTFPRlV3a2kyOWI5WUZHWk85ODJtU0M2UlJEUkFTVXhYTDNKZVdhOXIySE1tUVlFdm1jN3kvRStBQlpLRi9NeWJrd0R3clhpYWJrVUMwV0Mwd3FhUXdpUFF5NW5PN3J5cklMb0FETHlxVFRtRW16UW5ZVjAwUjdCa2g0Yk1iTExCeXJkVDRhMGMxOUZ1YWlIUWRRVC8yalFTNUczZXdvWlF0cSt2UW0waFZKY2gyaW5jeElydXN3clNPUDNvU1J2dm9weHBTSlZYNU9aaGsvalpQMUxrUndzK0dHS2dpTittY1JmR3o2M3NqNkh4MW9KVXMvUHhZYzVLQS9UK2E1SVhEZFJKYWx4ZmlEWDFuSXlqc2ZRYXlUQk1ldlZkU2tEdU10NFVMdHZKUURLblBxakw0SDl5bUxabDFLNmNPbEp6b3Jtd2Q1V2htRHlTdDZ6eTFRdUNnYnVvK2tuVUdhMmwrVWRCZi9rQkU9.7k2gVCGSZKLzJK5Ky3Nr5tKxvGSJhL13Q8W-YhT0uIo";
public void testCargaCsd_authUser() throws Exception {
SWCsdService app = new SWCsdService("demo", "123456789", Utils.url_pruebas);
CargaCsdResponse response = null;
response = (CargaCsdResponse) app.CargarCsd(b64Cer, b64Key, password_csd, "stamp", true);
UploadCsdResponse response = null;
response = (UploadCsdResponse) app.UploadMyCsd(b64Cer, b64Key, password_csd, "stamp", true);
System.out.println(response.HttpStatusCode);
System.out.println(response.data);
System.out.println(response.Status);
Expand Down

0 comments on commit 88e7eec

Please sign in to comment.