From c5107f715b6523deab537ae037f98444ee1765f8 Mon Sep 17 00:00:00 2001
From: maroy <maroy@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Wed, 1 Dec 2004 21:14:11 +0000
Subject: [PATCH] separated troublesome helix problems into separate test cases

---
 .../playlistExecutor/src/HelixPlayerTest.cxx  | 32 +++++++++++++++++--
 .../playlistExecutor/src/HelixPlayerTest.h    | 22 +++++++++++--
 2 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/livesupport/modules/playlistExecutor/src/HelixPlayerTest.cxx b/livesupport/modules/playlistExecutor/src/HelixPlayerTest.cxx
index 19deb89f6..a77d64127 100644
--- a/livesupport/modules/playlistExecutor/src/HelixPlayerTest.cxx
+++ b/livesupport/modules/playlistExecutor/src/HelixPlayerTest.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.3 $
+    Version  : $Revision: 1.4 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/src/Attic/HelixPlayerTest.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -209,10 +209,24 @@ HelixPlayerTest :: smilTest(void)
         TimeConversion::sleep(sleepT);
     }
     CPPUNIT_ASSERT(!helixPlayer->isPlaying());
+}
+
+
+/*------------------------------------------------------------------------------
+ *  Test different SMIL file features
+ *----------------------------------------------------------------------------*/
+void
+HelixPlayerTest :: smilParallelTest(void)
+                                                throw (CPPUNIT_NS::Exception)
+{
+    Ptr<time_duration>::Ref     sleepT(new time_duration(microseconds(10)));
+
+    helixPlayer->initialize();
 
     /* TODO: there is a bug with playing parallel, as it doesn't end
              for some reason.
              see https://bugs.helixcommunity.org/show_bug.cgi?id=3311
+    */
     helixPlayer->playThis("file:var/parallel.smil");
     CPPUNIT_ASSERT(!helixPlayer->isPlaying());
     helixPlayer->start();
@@ -221,10 +235,23 @@ HelixPlayerTest :: smilTest(void)
         TimeConversion::sleep(sleepT);
     }
     CPPUNIT_ASSERT(!helixPlayer->isPlaying());
-    */
+}
+
+
+/*------------------------------------------------------------------------------
+ *  Test different SMIL file features
+ *----------------------------------------------------------------------------*/
+void
+HelixPlayerTest :: smilSoundAnimationTest(void)
+                                                throw (CPPUNIT_NS::Exception)
+{
+    Ptr<time_duration>::Ref     sleepT(new time_duration(microseconds(10)));
+
+    helixPlayer->initialize();
 
     /* TODO: there is a bug with sound level animation, it causes a segfault
              see https://bugs.helixcommunity.org/show_bug.cgi?id=3310
+    */
     helixPlayer->playThis("file:var/animateSound.smil");
     CPPUNIT_ASSERT(!helixPlayer->isPlaying());
     helixPlayer->start();
@@ -235,7 +262,6 @@ HelixPlayerTest :: smilTest(void)
     CPPUNIT_ASSERT(!helixPlayer->isPlaying());
 
     helixPlayer->deInitialize();
-    */
 }
 
 
diff --git a/livesupport/modules/playlistExecutor/src/HelixPlayerTest.h b/livesupport/modules/playlistExecutor/src/HelixPlayerTest.h
index 8dedbd4be..1b65f5b8e 100644
--- a/livesupport/modules/playlistExecutor/src/HelixPlayerTest.h
+++ b/livesupport/modules/playlistExecutor/src/HelixPlayerTest.h
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: maroy $
-    Version  : $Revision: 1.3 $
+    Version  : $Revision: 1.4 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/modules/playlistExecutor/src/Attic/HelixPlayerTest.h,v $
 
 ------------------------------------------------------------------------------*/
@@ -58,7 +58,7 @@ namespace PlaylistExecutor {
  *  Unit test for the HelixPlayer class.
  *
  *  @author  $Author: maroy $
- *  @version $Revision: 1.3 $
+ *  @version $Revision: 1.4 $
  *  @see HelixPlayer
  */
 class HelixPlayerTest : public CPPUNIT_NS::TestFixture
@@ -68,6 +68,8 @@ class HelixPlayerTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(simplePlayTest);
     CPPUNIT_TEST(checkErrorConditions);
     CPPUNIT_TEST(smilTest);
+//    CPPUNIT_TEST(smilParallelTest);
+//    CPPUNIT_TEST(smilSoundAnimationTest);
     CPPUNIT_TEST_SUITE_END();
 
     private:
@@ -112,6 +114,22 @@ class HelixPlayerTest : public CPPUNIT_NS::TestFixture
         void
         smilTest(void)                          throw (CPPUNIT_NS::Exception);
 
+        /**
+         *  Test SMIL files, when playing audio clips in parallel.
+         *
+         *  @exception CPPUNIT_NS::Exception on test failures.
+         */
+        void
+        smilParallelTest(void)                  throw (CPPUNIT_NS::Exception);
+
+        /**
+         *  Test SMIL files, when animating the sound of a played clip.
+         *
+         *  @exception CPPUNIT_NS::Exception on test failures.
+         */
+        void
+        smilSoundAnimationTest(void)            throw (CPPUNIT_NS::Exception);
+
     public:
         
         /**