From 317d704435dd0d8647977ac296dd13515f2c2395 Mon Sep 17 00:00:00 2001
From: Michael Carroll <mjcarroll@intrinsic.ai>
Date: Mon, 1 Apr 2024 22:55:57 +0000
Subject: [PATCH] Differentiate message names

Signed-off-by: Michael Carroll <mjcarroll@intrinsic.ai>
---
 test/desc/testing.proto         |  2 +-
 test/desc/testing.proto.bin     | 24 ++++++++++++------------
 test/desc/testing/bytes.proto   |  2 +-
 test/integration/descriptors.cc |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/desc/testing.proto b/test/desc/testing.proto
index b2524164..d6927372 100644
--- a/test/desc/testing.proto
+++ b/test/desc/testing.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package testing;
 
-message Bytes
+message BarBytes
 {
   bytes data    = 1;
 }
diff --git a/test/desc/testing.proto.bin b/test/desc/testing.proto.bin
index ea7cbe8c..20422275 100644
--- a/test/desc/testing.proto.bin
+++ b/test/desc/testing.proto.bin
@@ -1,16 +1,16 @@
 
-C
-testing/bytes.prototesting"
-Bytes
-data
 
(Rdatabproto3
-ˆ

-testing/message.prototesting"
+´

+testing/message.prototesting" 
 
-FooMessage
-foo
 
(	Rfoo"
+FooMessage
+data
 
(	Rdata"3
 
-BarMessage
-foo
 
(	Rfoo"
+BarMessage%
+foo
 
(2.testing.FooMessageRfoo"3
 
-BazMessage
-foo
 
(	Rfoobproto3
\ No newline at end of file
+BazMessage%
+bar
 
(2.testing.BarMessageRbarbproto3
+F
+testing/bytes.prototesting"
+FooBytes
+data
 
(Rdatabproto3
\ No newline at end of file
diff --git a/test/desc/testing/bytes.proto b/test/desc/testing/bytes.proto
index b2524164..83eb9da8 100644
--- a/test/desc/testing/bytes.proto
+++ b/test/desc/testing/bytes.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
 
 package testing;
 
-message Bytes
+message FooBytes
 {
   bytes data    = 1;
 }
diff --git a/test/integration/descriptors.cc b/test/integration/descriptors.cc
index 2d7ee0d5..4cc62291 100644
--- a/test/integration/descriptors.cc
+++ b/test/integration/descriptors.cc
@@ -62,7 +62,7 @@ TEST(FactoryTest, DynamicFactory)
     gz::msgs::Factory::LoadDescriptors(paths);
   }
   EXPECT_EQ(nullptr, gz::msgs::Factory::New("example.msgs.StringMsg"));
-  EXPECT_EQ(nullptr, gz::msgs::Factory::New("testing.Bytes"));
+  EXPECT_EQ(nullptr, gz::msgs::Factory::New("testing.BarBytes"));
   EXPECT_EQ(nullptr, gz::msgs::Factory::New("testing.FooMessage"));
   EXPECT_EQ(nullptr, gz::msgs::Factory::New("testing.BarMessage"));
   EXPECT_EQ(nullptr, gz::msgs::Factory::New("testing.BazMessage"));
@@ -88,7 +88,7 @@ TEST(FactoryTest, DynamicFactory)
   }
 
   EXPECT_NE(nullptr, gz::msgs::Factory::New("example.msgs.StringMsg"));
-  EXPECT_NE(nullptr, gz::msgs::Factory::New("testing.Bytes"));
+  EXPECT_NE(nullptr, gz::msgs::Factory::New("testing.FooBytes"));
   EXPECT_NE(nullptr, gz::msgs::Factory::New("testing.FooMessage"));
   EXPECT_NE(nullptr, gz::msgs::Factory::New("testing.BarMessage"));
   EXPECT_NE(nullptr, gz::msgs::Factory::New("testing.BazMessage"));