From 018801895bf10b9e9fbf1a1fb7f55223f5044648 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Mon, 18 Jan 2010 08:51:26 +0100
Subject: [PATCH] Add some test-dummy MObjects *temporarily* to core tree 
 (Ticket #532)

---
 .../session/placement-index-query-resolver.cpp     | 14 ++++++++++++++
 .../proc/mobject/test-dummy-mobject.hpp            |  2 ++
 .../mobject/session/placement-index-query-test.cpp |  4 +++-
 .../proc/mobject/session/scope-query-test.cpp      |  4 ++--
 4 files changed, 21 insertions(+), 3 deletions(-)
 rename {tests/components => src}/proc/mobject/test-dummy-mobject.hpp (97%)

diff --git a/src/proc/mobject/session/placement-index-query-resolver.cpp b/src/proc/mobject/session/placement-index-query-resolver.cpp
index eb7b2731c..86b2245d7 100644
--- a/src/proc/mobject/session/placement-index-query-resolver.cpp
+++ b/src/proc/mobject/session/placement-index-query-resolver.cpp
@@ -28,6 +28,8 @@
 #include "proc/mobject/session/clip.hpp"
 #include "proc/mobject/session/effect.hpp"
 
+#include "proc/mobject/test-dummy-mobject.hpp"  /////////////////////////////////////TICKET #532
+
 #include <boost/scoped_ptr.hpp>
 #include <stack>
 
@@ -285,6 +287,12 @@ namespace session {
       defineHandling<Clip>();
       defineHandling<Effect>();
                        /////////////////////////////////////////////////////////////////TICKET #414
+      
+      defineHandling<mobject::test::DummyMO    >();
+      defineHandling<mobject::test::TestSubMO1 >();
+      defineHandling<mobject::test::TestSubMO2 >();
+      defineHandling<mobject::test::TestSubMO21>();
+                       /////////////////////////////////////////////////////////////////TICKET #532
     }
   
   bool
@@ -295,6 +303,12 @@ namespace session {
          ||qID.type == getResultTypeID<Placement<Clip> >()
          ||qID.type == getResultTypeID<Placement<Effect> >()
                        /////////////////////////////////////////////////////////////////TICKET #414
+         
+         ||qID.type == getResultTypeID<Placement<mobject::test::DummyMO    > >()
+         ||qID.type == getResultTypeID<Placement<mobject::test::TestSubMO1 > >()
+         ||qID.type == getResultTypeID<Placement<mobject::test::TestSubMO2 > >()
+         ||qID.type == getResultTypeID<Placement<mobject::test::TestSubMO21> >()
+                       /////////////////////////////////////////////////////////////////TICKET #532
          );
   }
   
diff --git a/tests/components/proc/mobject/test-dummy-mobject.hpp b/src/proc/mobject/test-dummy-mobject.hpp
similarity index 97%
rename from tests/components/proc/mobject/test-dummy-mobject.hpp
rename to src/proc/mobject/test-dummy-mobject.hpp
index d301fbd81..9f18cc7e8 100644
--- a/tests/components/proc/mobject/test-dummy-mobject.hpp
+++ b/src/proc/mobject/test-dummy-mobject.hpp
@@ -28,6 +28,8 @@
  ** check the basic MObject properties and behaviour, this can be an obstacle. 
  ** Thus we create a separate branch in the MObject hierarchy with relaxed
  ** requirements and some dummy/test API functions.
+ ** 
+ ** @todo needed to move this temporarily into the core session tree. ////////////TICKET #532
  **
  ** @see mobject::session::BuilderTool_test
  ** @see mobject::session::PlacementHierarchy_test
diff --git a/tests/components/proc/mobject/session/placement-index-query-test.cpp b/tests/components/proc/mobject/session/placement-index-query-test.cpp
index a0728fff2..ff39ffe3c 100644
--- a/tests/components/proc/mobject/session/placement-index-query-test.cpp
+++ b/tests/components/proc/mobject/session/placement-index-query-test.cpp
@@ -50,6 +50,8 @@ namespace test    {
    * @test accessing the PlacementIndex through the generic query interface,
    *       for discovering scope contents and containing scope.
    *       
+   * @todo change that to use a more realistic test session, based on the actual model types   //////////////// TICKET #532
+   * 
    * @see  mobject::session::PlacementIndex
    * @see  mobject::session::QueryResolver
    * @see  mobject::session::ContentsQuery
@@ -92,7 +94,7 @@ namespace test    {
           
           discover (ContentsQuery<MObject> (resolver,root));
           
-          PlacementMO& elm = *ContentsQuery<TestSubMO1>(resolver,root);
+          PlacementMO& elm = *ContentsQuery<TestSubMO1>(resolver,root);                  ////////////////////// TICKET #532
           
           discover (PathQuery<MObject> (resolver,elm));
         }
diff --git a/tests/components/proc/mobject/session/scope-query-test.cpp b/tests/components/proc/mobject/session/scope-query-test.cpp
index e139b6452..99e47b64d 100644
--- a/tests/components/proc/mobject/session/scope-query-test.cpp
+++ b/tests/components/proc/mobject/session/scope-query-test.cpp
@@ -48,7 +48,7 @@ namespace test    {
    *       a given scope or finding the enclosing scopes. The discovered
    *       elements will be filtered by a runtime type check.
    *       
-   * @todo cover using an additional dynamic filter on the results
+   * @todo change that to use a more realistic test session, based on the actual model types   //////////////// TICKET #532
    *       
    * @see  mobject::session::PlacementIndex
    * @see  mobject::session::QueryResolver
@@ -67,7 +67,7 @@ namespace test    {
           PlacementMO   const& scope    = SessionServiceExploreScope::getScopeRoot();
           
           discover (ScopeQuery<MObject>    (resolver,scope, CONTENTS));
-          discover (ScopeQuery<DummyMO>    (resolver,scope, CONTENTS));
+          discover (ScopeQuery<DummyMO>    (resolver,scope, CONTENTS));                  ////////////////////// TICKET #532
           discover (ScopeQuery<TestSubMO1> (resolver,scope, CONTENTS));
           discover (ScopeQuery<TestSubMO2> (resolver,scope, CONTENTS));