Fix test

project-chip · Sep 17, 2021 · 03d1f60 · 03d1f60
1 parent 8832118
commit 03d1f60
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/src/lib/core/GroupId.h b/src/lib/core/GroupId.h
@@ -25,13 +25,27 @@ namespace chip {
 // methods.
 using GroupId = uint16_t;
 
-constexpr GroupId kUndefinedGroupId = 0ULL;
+constexpr GroupId kUndefinedGroupId = 0;
 
-constexpr GroupId kMaxOperationalGroupId = 0xFFFFULL;
+constexpr GroupId kMinUniversalGroupId = 0x8000;
+constexpr GroupId kMaxUniversalGroupId = 0xFFFF;
+
+constexpr GroupId kMinFabricGroupId = 0x0001;
+constexpr GroupId kMaxFabricGroupId = 0x7FFF;
 
 constexpr bool IsOperationalGroupId(GroupId aGroupId)
 {
-    return (aGroupId != kUndefinedGroupId) && (aGroupId <= kMaxOperationalGroupId);
+    return (aGroupId != kUndefinedGroupId);
+}
+
+constexpr bool IsFabricGroupId(GroupId aGroupId)
+{
+    return (aGroupId <= kMaxFabricGroupId) && (aGroupId >= kMinFabricGroupId);
+}
+
+constexpr bool IsUniversalGroupId(GroupId aGroupId)
+{
+    return (aGroupId <= kMaxUniversalGroupId) && (aGroupId >= kMinUniversalGroupId);
 }
 
 } // namespace chip
diff --git a/src/transport/raw/tests/TestMessageHeader.cpp b/src/transport/raw/tests/TestMessageHeader.cpp
@@ -151,7 +151,7 @@ void TestPacketHeaderEncodeDecode(nlTestSuite * inSuite, void * inContext)
     header.SetMessageCounter(222).SetSourceNodeId(1).SetDestinationGroupId(2);
     NL_TEST_ASSERT(inSuite, header.Decode(buffer, &decodeLen) == CHIP_NO_ERROR);
     NL_TEST_ASSERT(inSuite, header.GetMessageCounter() == 234);
-    NL_TEST_ASSERT(inSuite, header.GetDestinationGroupId() == Optional<uint16_t>::Value(45ull));
+    NL_TEST_ASSERT(inSuite, header.GetDestinationGroupId() == Optional<uint16_t>::Value((uint16_t)45));
     NL_TEST_ASSERT(inSuite, header.GetSourceNodeId() == Optional<uint64_t>::Value(77ull));