[incubator-trafficcontrol] 31/36: Fix broken unit test and error message

[elsloo]

This is an automated email from the ASF dual-hosted git repository.

elsloo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-trafficcontrol.git

commit f22d2ec561a6af978403b10217d5d8e1be5ae82d
Author: Rawlin Peters <rawlin_pet...@comcast.com>
AuthorDate: Mon Nov 13 12:49:08 2017 -0700

    Fix broken unit test and error message
---
 .../cdn/traffic_control/traffic_router/core/ds/DeliveryService.java     | 2 +-
 .../core/router/DeliveryServiceHTTPRoutingMissesTest.java               | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java
 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java
index 6305e12..4aadd70 100644
--- 
a/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java
+++ 
b/traffic_router/core/src/main/java/com/comcast/cdn/traffic_control/traffic_router/core/ds/DeliveryService.java
@@ -155,7 +155,7 @@ public class DeliveryService {
                try {
                        dct = DeepCachingType.valueOf(dctString);
                } catch (IllegalArgumentException e) {
-                       LOGGER.error("DeliveryService '" + id + "' has an 
unrecognized deepCachingType: '" + dct + "'. Defaulting to 'NEVER' instead");
+                       LOGGER.error("DeliveryService '" + id + "' has an 
unrecognized deepCachingType: '" + dctString + "'. Defaulting to 'NEVER' 
instead");
                } finally {
                        this.deepCache = dct;
                }
diff --git 
a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java
 
b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java
index 01d9815..1714dc8 100644
--- 
a/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java
+++ 
b/traffic_router/core/src/test/java/com/comcast/cdn/traffic_control/traffic_router/core/router/DeliveryServiceHTTPRoutingMissesTest.java
@@ -47,6 +47,8 @@ public class DeliveryServiceHTTPRoutingMissesTest {
         
when(unusedByTest.get("routingName")).thenReturn(mapper.readTree("\"edge\""));
         when(unusedByTest.has("coverageZoneOnly")).thenReturn(true);
         
when(unusedByTest.get("coverageZoneOnly")).thenReturn(mapper.readTree("true"));
+        when(unusedByTest.has("deepCachingType")).thenReturn(true);
+        
when(unusedByTest.get("deepCachingType")).thenReturn(mapper.readTree("\"NEVER\""));
         deliveryService = new DeliveryService("ignoredbytest", unusedByTest);
         httpRequest = mock(HTTPRequest.class);
         track = StatTracker.getTrack();

-- 
To stop receiving notification emails like this one, please contact
els...@apache.org.