supdev 26OUm5kk - Add CVV to logging post test; Remove unnesasary 'if…

…' clause; Add exception message to error logging test;
KeepItSimpleStupid · Feb 26, 2016 · 2c7fdcb · 2c7fdcb
1 parent e566477
commit 2c7fdcb
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/src/main/java/com/braintreegateway/util/Http.java b/src/main/java/com/braintreegateway/util/Http.java
@@ -88,7 +88,7 @@ private NodeWrapper httpRequest(RequestMethod requestMethod, String url, String
             connection = buildConnection(requestMethod, url);
 
             Logger logger = configuration.getLogger();
-            if (logger.getLevel().intValue() <= Level.FINE.intValue() && postBody != null) {
+            if (postBody != null) {
                 logger.log(Level.FINE, formatSanitizeBodyForLog(postBody));
             }
 
@@ -126,7 +126,7 @@ private NodeWrapper httpRequest(RequestMethod requestMethod, String url, String
                 logger.log(Level.INFO, "[Braintree] [{0}]] {1} {2}", new Object[] { getCurrentTime(), requestMethod.toString(), url });
                 logger.log(Level.FINE, "[Braintree] [{0}] {1} {2} {3}", new Object[] { getCurrentTime(), requestMethod.toString(), url, connection.getResponseCode() });
 
-                if (logger.getLevel().intValue() <= Level.FINE.intValue() && xml != null) {
+                if (xml != null) {
                     logger.log(Level.FINE, formatSanitizeBodyForLog(xml));
                 }
 

diff --git a/src/test/java/com/braintreegateway/integrationtest/HttpTestIT.java b/src/test/java/com/braintreegateway/integrationtest/HttpTestIT.java
@@ -118,6 +118,7 @@ public void smokeTestLogsFullRequestInDebugMode() {
         assertTrue(capturedLog.contains("POST /merchants/integration_merchant_id/payment_methods"));
         assertTrue(capturedLog.contains("<cardholder-name>John Doe</cardholder-name>"));
         assertTrue(capturedLog.contains("<number>510510******5100</number>"));
+        assertTrue(capturedLog.contains("<cvv>***</cvv>"));
     }
 
     @Test
@@ -143,7 +144,7 @@ public void smokeTestLogsErrors() {
         } catch (UnexpectedException e) {
         } finally {
             capturedLog = getTestCapturedLog();
-            assertTrue(capturedLog.contains("SEVERE: SSL Verification failed. Error message:"));
+            assertTrue(capturedLog.contains("SEVERE: SSL Verification failed. Error message: Missing input stream"));
         }
     }
 

diff --git a/src/test/java/com/braintreegateway/integrationtest/MerchantIT.java b/src/test/java/com/braintreegateway/integrationtest/MerchantIT.java
@@ -18,8 +18,8 @@ public class MerchantIT extends IntegrationTest {
     @Before
     public void createGateway() {
         this.gateway = new BraintreeGateway(
-                "client_id$development$integration_client_id",
-                "client_secret$development$integration_client_secret"
+            "client_id$development$integration_client_id",
+            "client_secret$development$integration_client_secret"
         );
     }
 

diff --git a/src/test/java/com/braintreegateway/integrationtest/WebhookNotificationIT.java b/src/test/java/com/braintreegateway/integrationtest/WebhookNotificationIT.java
@@ -19,7 +19,7 @@
 
 import static org.junit.Assert.*;
 
-public class WebhookNotificationIT extends IntegrationTest{
+public class WebhookNotificationIT extends IntegrationTest {
 
     @Test
     public void createNotificationWithUnrecognizedKind() {