From 2bbdda3dcefff8d166c404d5b39e34513824340e Mon Sep 17 00:00:00 2001
From: Jonathan Cobb <jonathan@kyuss.org>
Date: Tue, 21 Jan 2020 19:16:11 -0500
Subject: [PATCH] fix traffic analytics test

---
 .../java/bubble/service/cloud/DeviceIdService.java   | 12 +++++++++++-
 .../models/tests/filter/traffic_analytics.json       |  6 +++---
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/bubble-server/src/main/java/bubble/service/cloud/DeviceIdService.java b/bubble-server/src/main/java/bubble/service/cloud/DeviceIdService.java
index 8ef3eef2..9777e0e4 100644
--- a/bubble-server/src/main/java/bubble/service/cloud/DeviceIdService.java
+++ b/bubble-server/src/main/java/bubble/service/cloud/DeviceIdService.java
@@ -1,7 +1,9 @@
 package bubble.service.cloud;
 
+import bubble.dao.account.AccountDAO;
 import bubble.dao.device.DeviceDAO;
 import bubble.model.device.Device;
+import bubble.server.BubbleConfiguration;
 import lombok.extern.slf4j.Slf4j;
 import org.cobbzilla.util.collection.ExpirationMap;
 import org.cobbzilla.util.io.FileUtil;
@@ -34,12 +36,20 @@ public class DeviceIdService {
     public static final FilenamePrefixFilter DEVICE_FILE_FILTER = new FilenamePrefixFilter(DEVICE_FILE_PREFIX);
 
     @Autowired private DeviceDAO deviceDAO;
+    @Autowired private BubbleConfiguration configuration;
+    @Autowired private AccountDAO accountDAO;
 
     private Map<String, Device> deviceCache = new ExpirationMap<>(MINUTES.toMillis(10));
 
     public Device findDeviceByIp (String ipAddr) {
 
-        if (!WG_DEVICES_DIR.exists()) throw invalidEx("err.deviceDir.notFound");
+        if (!WG_DEVICES_DIR.exists()) {
+            if (configuration.testMode() && ipAddr.equals("127.0.0.1")) {
+                // this is a test
+                return new Device().setAccount(accountDAO.getFirstAdmin().getUuid());
+            }
+            throw invalidEx("err.deviceDir.notFound");
+        }
 
         return deviceCache.computeIfAbsent(ipAddr, ip -> {
             try {
diff --git a/bubble-server/src/test/resources/models/tests/filter/traffic_analytics.json b/bubble-server/src/test/resources/models/tests/filter/traffic_analytics.json
index 9aa2ebf2..de241af3 100644
--- a/bubble-server/src/test/resources/models/tests/filter/traffic_analytics.json
+++ b/bubble-server/src/test/resources/models/tests/filter/traffic_analytics.json
@@ -5,7 +5,7 @@
     "params": {
       "fqdn": "foo.example.com",
       "uri": "/bar",
-      "jsCheck": "json.length == 0"
+      "jsCheck": "json.getMatchers().length == 0"
     }
   },
 
@@ -15,7 +15,7 @@
     "params": {
       "fqdn": "foo.example.com",
       "uri": "/baz",
-      "jsCheck": "json.length == 0"
+      "jsCheck": "json.getMatchers().length == 0"
     }
   },
 
@@ -25,7 +25,7 @@
     "params": {
       "fqdn": "bar.example.com",
       "uri": "/qux",
-      "jsCheck": "json.length == 0"
+      "jsCheck": "json.getMatchers().length == 0"
     }
   },