From a10e381cfaffa7d3181d5c120be21e08d4ad2025 Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Fri, 22 Apr 2011 03:29:12 +0200
Subject: [PATCH] fix error in test logic

need to adjust the checksum on copy :)
---
 tests/40components.tests             |  5 +++
 tests/lib/polymorphic-value-test.cpp | 58 ++++++++++++++++++++++++----
 2 files changed, 55 insertions(+), 8 deletions(-)

diff --git a/tests/40components.tests b/tests/40components.tests
index 7b3bdd31d..51b9c54bc 100644
--- a/tests/40components.tests
+++ b/tests/40components.tests
@@ -505,6 +505,11 @@ out: can_IterForEach<CustomForwardIter>	 : Yes
 END
 
 
+TEST "Polymorphic value objects" PolymorphicValue_test  <<END
+return: 0
+END
+
+
 PLANNED "RefArray_test" RefArray_test  <<END
 return: 0
 END
diff --git a/tests/lib/polymorphic-value-test.cpp b/tests/lib/polymorphic-value-test.cpp
index 755cbe3a9..7674b677e 100644
--- a/tests/lib/polymorphic-value-test.cpp
+++ b/tests/lib/polymorphic-value-test.cpp
@@ -84,26 +84,42 @@ namespace test{
       {
         long localData_[ii];
         
+       ~Imp()
+          {
+            mark (-1 * localSum());
+            CHECK (0 == localSum());
+          }
+        
         Imp()
           {
             REQUIRE (0 < ii);
             localSum() = 0;
-            note(ii);
+            mark(ii);
             ++ _created;
           }
         
-       ~Imp()
+        Imp (Imp const& o)
           {
-            note (-1 * localSum());
-            CHECK (0 == localSum());
+            ++ _created;
+            copyData (o);
+            _checkSum  += localSum();
+          }// adjust, because we've gotten two identical instances
+        
+        Imp&
+        operator= (Imp const& o)
+          {
+            _checkSum  -= localSum();
+            copyData (o);
+            _checkSum  += localSum();
+            return *this;
           }
         
-        
-        long
+      private:
+        virtual long
         apiFunc()
           {
             long rr = ii * (rand() % MAX_RAND);
-            note (rr);
+            mark (rr);
             _callSum += rr;
             return rr;
           }
@@ -115,11 +131,18 @@ namespace test{
           }
         
         void
-        note (long markerValue)
+        mark (long markerValue)
           {
             localSum() += markerValue;
             _checkSum  += markerValue;
           }
+        
+        void
+        copyData (Imp const& o)
+          {
+            for (uint i=0; i<ii; ++i)
+              localData_[i] = o.localData_[i];
+          }
       };
     
     
@@ -153,6 +176,8 @@ namespace test{
           _created  = 0;
           
           {
+            verifyBasics();
+            
             TestList objs = createOpaqueValues ();
             for_each (objs, operate);
           }
@@ -195,6 +220,23 @@ namespace test{
         }
       
       
+      void
+      verifyBasics()
+        {
+          long prevSum = _checkSum;
+          uint prevCnt = _created;
+          
+          PolyVal val = PolyVal::build<Imp<111> >();
+          CHECK (prevSum+111 == _checkSum);            // We got one primary ctor call
+          CHECK (prevCnt+1   <= _created);             // Note: usually, the compiler optimises
+          CHECK (prevCnt+2   >= _created);             //       and skips the spurious copy-operation
+          CHECK (sizeof(PolyVal) > sizeof(Imp<111>));
+          Interface& embedded = val;
+          CHECK (isSameObject(embedded,val));
+          CHECK (INSTANCEOF(Imp<111>, &embedded));
+        }
+      
+      
       void
       verifyOverrunProtection()
         {