fix tests

adlarkin · adlarkin · commit 72a9eec0e199 · 2022-04-14T13:58:09.000-06:00
Signed-off-by: Ashton Larkin &lt;42042756+adlarkin@users.noreply.github.com&gt;
diff --git a/usd/src/usd_parser/USDStage_TEST.cc b/usd/src/usd_parser/USDStage_TEST.cc
@@ -39,7 +39,7 @@ TEST(USDStage, Constructor)
 
     EXPECT_EQ("Z", stage.UpAxis());
     EXPECT_DOUBLE_EQ(0.01, stage.MetersPerUnit());
-    EXPECT_EQ(25u, stage.USDPaths().size());
+    EXPECT_EQ(26u, stage.USDPaths().size());
   }
 
   // Check up Axis equal to Y and metersPerUnit
diff --git a/usd/src/usd_parser/USDWorld.cc b/usd/src/usd_parser/USDWorld.cc
@@ -23,6 +23,7 @@
 #include <utility>
 #include <vector>
 
+#include <ignition/common/Filesystem.hh>
 #include <ignition/common/Util.hh>
 
 #pragma push_macro ("__DEPRECATED")
@@ -196,10 +197,18 @@ namespace usd
         {
           light->SetName(primName);
 
+          // assume this light belongs to the world unless the corresponding
+          // model/link for this light are found
           bool worldLight = true;
-          if (modelPtr)
+
+          // if the light prim we are parsing has no parent (or if its parent
+          // is the root prim), this means the light belongs to the world
+          const bool noModelAncestor = !prim.GetParent() ||
+            (prim.GetParent().GetName().GetString() == "/");
+          if (!noModelAncestor && modelPtr)
           {
-            if (auto link = modelPtr->LinkByName(linkName))
+            if (auto link =
+                modelPtr->LinkByName(ignition::common::basename(linkName)))
             {
               link->AddLight(light.value());
               worldLight = false;

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ TEST(USDStage, Constructor)`
`39`	`39`
`40`	`40`	`EXPECT_EQ("Z", stage.UpAxis());`
`41`	`41`	`EXPECT_DOUBLE_EQ(0.01, stage.MetersPerUnit());`
`42`		`- EXPECT_EQ(25u, stage.USDPaths().size());`
	`42`	`+ EXPECT_EQ(26u, stage.USDPaths().size());`
`43`	`43`	`}`
`44`	`44`
`45`	`45`	`// Check up Axis equal to Y and metersPerUnit`