From ccd130966beb44bf4d4a840a72cf01641aed38fa Mon Sep 17 00:00:00 2001
From: Ichthyostega <prg@ichthyostega.de>
Date: Sun, 30 Oct 2011 02:19:10 +0200
Subject: [PATCH] finish and pass the first round of tests

still missing:
- implementation of a Mock frame
- automatical invocation of the TypeHandler
---
 src/proc/engine/buffer-metadata.hpp           |  2 ++
 .../proc/engine/buffer-metadata-test.cpp      | 20 +++++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/proc/engine/buffer-metadata.hpp b/src/proc/engine/buffer-metadata.hpp
index 21ed1c50a..500d1994b 100644
--- a/src/proc/engine/buffer-metadata.hpp
+++ b/src/proc/engine/buffer-metadata.hpp
@@ -452,7 +452,9 @@ namespace engine {
             __must_not_be_FREE();
             
             if ( (state_ == LOCKED  && newState == EMITTED)
+               ||(state_ == LOCKED  && newState == FREE)
                ||(state_ == EMITTED && newState == BLOCKED)
+               ||(state_ == EMITTED && newState == FREE)
                ||(state_ == BLOCKED && newState == FREE))
               {
                 // allowed transition
diff --git a/tests/components/proc/engine/buffer-metadata-test.cpp b/tests/components/proc/engine/buffer-metadata-test.cpp
index dd55542e2..b32da07ab 100644
--- a/tests/components/proc/engine/buffer-metadata-test.cpp
+++ b/tests/components/proc/engine/buffer-metadata-test.cpp
@@ -91,7 +91,6 @@ namespace test  {
           CHECK (ensure_proper_fixture());
           verifyBasicProperties();
           verifyStandardCase();
-          UNIMPLEMENTED ("cover all metadata properties");
         }
       
       
@@ -219,12 +218,12 @@ namespace test  {
                                                //  a real-world BufferProvider would use some kind of allocator
           
           // track individual buffers by metadata entries
-          metadata::Entry f0 = meta_->markLocked(bufferType1, &frames[0]);
-          metadata::Entry f1 = meta_->markLocked(bufferType1, &frames[1]);
-          metadata::Entry f2 = meta_->markLocked(bufferType1, &frames[2]);
+          metadata::Entry& f0 = meta_->markLocked(bufferType1, &frames[0]);
+          metadata::Entry& f1 = meta_->markLocked(bufferType1, &frames[1]);
+          metadata::Entry& f2 = meta_->markLocked(bufferType1, &frames[2]);
           
-          metadata::Entry r0 = meta_->markLocked(bufferType1, &rawbuf[0]);
-          metadata::Entry r1 = meta_->markLocked(bufferType1, &rawbuf[1]);
+          metadata::Entry& r0 = meta_->markLocked(rawBuffType, &rawbuf[0]);
+          metadata::Entry& r1 = meta_->markLocked(rawBuffType, &rawbuf[1]);
 
           CHECK (LOCKED == f0.state());
           CHECK (LOCKED == f1.state());
@@ -254,6 +253,11 @@ namespace test  {
           
           //////////////////TODO: access the storage through the metadata-key
           //////////////////TODO: to a state transition on the metadata
+          f0.mark(FREE);
+          f1.mark(FREE);
+          f2.mark(FREE);
+          r0.mark(FREE);
+          r1.mark(FREE);
           
           attachTestFrame.destroyAttached (frames+0);   ////////////////////////////////////////TODO: shouldn't this happen automatically??
           attachTestFrame.destroyAttached (frames+1);
@@ -265,6 +269,10 @@ namespace test  {
           meta_->release(handle_r0);
           meta_->release(handle_r1);
           
+          // manual cleanup of test allocations
+          delete[] frames;
+          delete[] rawbuf;
+          
           CHECK (!meta_->isLocked(handle_f0));
           CHECK (!meta_->isLocked(handle_f1));
           CHECK (!meta_->isLocked(handle_f2));