Fixing unit tests

faucetsdn · Jan 14, 2025 · 94a05e8 · 94a05e8
1 parent dad6276
commit 94a05e8
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/common/src/main/java/com/google/udmi/util/Common.java b/common/src/main/java/com/google/udmi/util/Common.java
@@ -59,7 +59,7 @@ public abstract class Common {
   public static final Joiner DETAIL_JOINER = Joiner.on(DETAIL_SEPARATOR);
   public static final String CATEGORY_PROPERTY_KEY = "category";
   public static final Pattern DEVICE_ID_ALLOWABLE = Pattern.compile("^[-._a-zA-Z0-9]+$");
-  public static final Pattern POINT_NAME_ALLOWABLE = DEVICE_ID_ALLOWABLE;
+  public static final Pattern POINT_NAME_ALLOWABLE = Pattern.compile("^[-_a-zA-Z0-9]+$");
   public static final int SEC_TO_MS = 1000;
   public static final String SOURCE_SEPARATOR = "+";
   public static final String SOURCE_SEPARATOR_REGEX = "\\" + SOURCE_SEPARATOR;

diff --git a/schema/model_cloud.json b/schema/model_cloud.json
@@ -47,7 +47,7 @@
     },
     "gateway": {
       "$ref": "file:model_gateway.json#"
-    },      
+    },
     "config": {
       "$ref": "file:model_cloud_config.json#"
     },

diff --git a/validator/src/test/java/com/google/daq/mqtt/registrar/RegistrarTest.java b/validator/src/test/java/com/google/daq/mqtt/registrar/RegistrarTest.java
@@ -47,7 +47,7 @@ public class RegistrarTest {
   private static final Set<String> ALLOWED_DEVICE_IDS = ImmutableSet.of("bacnet_29314",
       "bacnet-29138", "AHU-0001");
   private static final Set<String> ILLEGAL_DEVICE_IDS = ImmutableSet.of("bacnet/293124",
-      "BACnet.213214");
+      "BACnet@213214");
   private static final Set<String> ALLOWED_POINT_NAMES = ImmutableSet.of("kWh", "Current",
       "analogValue_13", "analogValue-13", "AV_-13", "Electric_L_OrchesTra");
   private static final Set<String> ILLEGAL_POINT_NAMES = ImmutableSet.of("av/13", "av%13", "23,11",