Changeset 10403 for code/branches/core7/src

Timestamp:

Apr 26, 2015, 4:16:49 PM (10 years ago)

Author:

landauf

Message:

added function to destroy the class hierarchy (i.e. reset all information about parents and children in Identifiers).
tests now use a fixture to create and destroy class hierarchy. this makes them independent of the order of execution (and also fixes the three *_NoFixture tests)

Location:

code/branches/core7/src/libraries/core/class

Files:

• Identifier.cc (modified) (1 diff)
• Identifier.h (modified) (1 diff)
• IdentifierManager.cc (modified) (2 diffs)
• IdentifierManager.h (modified) (2 diffs)

code/branches/core7/src/libraries/core/class/Identifier.cc

@@ -221 +221 @@
 
     /**
+     * Resets all information about the class hierarchy. The identifier is considered uninitialized afterwards.
+     */
+    void Identifier::reset()
+    {
+        if (this->factory_ != NULL) // TODO: should reset ALL identifiers, but currently the calls to inheritsFrom<>() are not reproducible
+            this->directParents_.clear();
+        this->parents_.clear();
+        this->directChildren_.clear();
+        this->children_.clear();
+        this->bInitialized_ = false;
+    }
+
+    /**
      * Verifies if the recorded trace of parent identifiers matches the expected trace according to the class hierarchy. If it doesn't match, the class
      * hierarchy is likely wrong, e.g. due to wrong inheritsFrom<>() definitions in abstract classes.

code/branches/core7/src/libraries/core/class/Identifier.h

@@ -151 +151 @@
             void initializeParents(const std::list<const Identifier*>& initializationTrace);
             void finishInitialization();
+            void reset();
 
             bool isA(const Identifier* identifier) const;

code/branches/core7/src/libraries/core/class/IdentifierManager.cc

@@ -172 +172 @@
 
     /**
-        @brief Destroys all Identifiers. Called when exiting the program.
-    */
-    void IdentifierManager::destroyAllIdentifiers()
-    {
-        for (std::set<Identifier*>::iterator it = this->identifiers_.begin(); it != this->identifiers_.end(); ++it)
-            delete (*it);
-
-        this->identifiers_.clear();
-        this->identifierByString_.clear();
-        this->identifierByLowercaseString_.clear();
-        this->identifierByNetworkId_.clear();
+     * @brief Resets all Identifiers.
+     */
+    void IdentifierManager::destroyClassHierarchy()
+    {
+        orxout(internal_status) << "Destroy class-hierarchy" << endl;
+        for (std::set<Identifier*>::const_iterator it = this->identifiers_.begin(); it != this->identifiers_.end(); ++it)
+            (*it)->reset();
     }
 
@@ -270 +266 @@
         this->identifierByNetworkId_.clear();
     }
+
+    /**
+        @brief Destroys all Identifiers. Called when exiting the program.
+    */
+    void IdentifierManager::destroyAllIdentifiers()
+    {
+        for (std::set<Identifier*>::iterator it = this->identifiers_.begin(); it != this->identifiers_.end(); ++it)
+            delete (*it);
+
+        this->identifiers_.clear();
+        this->identifierByString_.clear();
+        this->identifierByLowercaseString_.clear();
+        this->identifierByNetworkId_.clear();
+    }
 }

code/branches/core7/src/libraries/core/class/IdentifierManager.h

@@ -60 +60 @@
             void createClassHierarchy();
             void verifyClassHierarchy();
-            void destroyAllIdentifiers();
+            void destroyClassHierarchy();
 
             void createdObject(Identifiable* identifiable);
@@ -88 +88 @@
             inline const std::map<uint32_t, Identifier*>& getIdentifierByNetworkIdMap()
                 { return this->identifierByNetworkId_; }
+
+            void destroyAllIdentifiers();
 
         private: