[Bf-blender-cvs] [75339525600] temp-alembic-exporter-T73363-ms2: Cleanup: USD test, renamed `created_writers` to `writing_writers`

Sybren A. Stüvel noreply at git.blender.org
Fri Mar 20 12:36:46 CET 2020


Commit: 753395256005b94a0ef50c5cc769020c3942f5cf
Author: Sybren A. Stüvel
Date:   Fri Mar 20 11:41:40 2020 +0100
Branches: temp-alembic-exporter-T73363-ms2
https://developer.blender.org/rB753395256005b94a0ef50c5cc769020c3942f5cf

Cleanup: USD test, renamed `created_writers` to `writing_writers`

The map contains those writes whose `write()` method has been called, and
thus the old name `created_writers` was incorrect.

No functional changes.

===================================================================

M	tests/gtests/usd/abstract_hierarchy_iterator_test.cc

===================================================================

diff --git a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
index e87ef547052..375d59863d7 100644
--- a/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
+++ b/tests/gtests/usd/abstract_hierarchy_iterator_test.cc
@@ -29,30 +29,31 @@ extern "C" {
 #include <set>
 
 /* Mapping from ID.name to set of export hierarchy path. Duplicated objects can be exported
- * multiple times, hence the set. */
-typedef std::map<std::string, std::set<std::string>> created_writers;
+ * multiple times, hence the set.
+ * Will contain those writers whose write() method was actually called. */
+typedef std::map<std::string, std::set<std::string>> writing_writers;
 
 using namespace USD;
 
 class TestHierarchyWriter : public AbstractHierarchyWriter {
  public:
-  created_writers &writers_map;
+  writing_writers &writers_map;
 
-  TestHierarchyWriter(created_writers &writers_map) : writers_map(writers_map)
+  TestHierarchyWriter(writing_writers &writers_map) : writers_map(writers_map)
   {
   }
 
   void write(HierarchyContext &context) override
   {
     const char *id_name = context.object->id.name;
-    created_writers::mapped_type &writers = writers_map[id_name];
+    writing_writers::mapped_type &writers = writers_map[id_name];
 
     BLI_assert(writers.find(context.export_path) == writers.end());
     writers.insert(context.export_path);
   }
 };
 
-void debug_print_writers(const char *label, const created_writers &writers_map)
+void debug_print_writers(const char *label, const writing_writers &writers_map)
 {
   printf("%s:\n", label);
   for (auto idname_writers : writers_map) {
@@ -65,10 +66,10 @@ void debug_print_writers(const char *label, const created_writers &writers_map)
 
 class TestingHierarchyIterator : public AbstractHierarchyIterator {
  public: /* Public so that the test cases can directly inspect the created writers. */
-  created_writers transform_writers;
-  created_writers data_writers;
-  created_writers hair_writers;
-  created_writers particle_writers;
+  writing_writers transform_writers;
+  writing_writers data_writers;
+  writing_writers hair_writers;
+  writing_writers particle_writers;
 
  public:
   explicit TestingHierarchyIterator(Depsgraph *depsgraph) : AbstractHierarchyIterator(depsgraph)
@@ -146,7 +147,7 @@ TEST_F(USDHierarchyIteratorTest, ExportHierarchyTest)
   iterator->iterate_and_write();
 
   // Mapping from object name to set of export paths.
-  created_writers expected_transforms = {
+  writing_writers expected_transforms = {
       {"OBCamera", {"/Camera"}},
       {"OBDupli1", {"/Dupli1"}},
       {"OBDupli2", {"/ParentOfDupli2/Dupli2"}},
@@ -172,7 +173,7 @@ TEST_F(USDHierarchyIteratorTest, ExportHierarchyTest)
       {"OBParentOfDupli2", {"/ParentOfDupli2"}}};
   EXPECT_EQ(expected_transforms, iterator->transform_writers);
 
-  created_writers expected_data = {
+  writing_writers expected_data = {
       {"OBCamera", {"/Camera/Camera"}},
       {"OBGEO_Ear_L",
        {"/Dupli1/GEO_Head-0/GEO_Ear_L-1/Ear",



More information about the Bf-blender-cvs mailing list