From c7ba993c18e7f563480a2c4ce59886c35ca5f9f4 Mon Sep 17 00:00:00 2001
From: fgerlits <fgerlits@cfc7b370-4200-0410-a6e3-cb6bdb053afe>
Date: Sat, 12 Mar 2005 22:39:26 +0000
Subject: [PATCH] updated TestStorageClient test data to be in line with the
 test data of WebStorageClient (i.e., of the php storageServer)

---
 livesupport/products/scheduler/etc/scheduler.xml          | 8 ++++----
 .../products/scheduler/src/RpcDisplayAudioClipTest.cxx    | 4 ++--
 .../products/scheduler/src/RpcDisplayAudioClipsTest.cxx   | 6 +++---
 .../products/scheduler/src/RpcDisplayPlaylistsTest.cxx    | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/livesupport/products/scheduler/etc/scheduler.xml b/livesupport/products/scheduler/etc/scheduler.xml
index 424d8590e..2460fc42b 100644
--- a/livesupport/products/scheduler/etc/scheduler.xml
+++ b/livesupport/products/scheduler/etc/scheduler.xml
@@ -99,10 +99,10 @@
 
     <storageClientFactory>
         <testStorage tempFiles="file:///tmp/tempPlaylist">
-            <playlist id="0000000000000001" playlength="01:30:00.000">
+            <playlist id="0000000000000001" playlength="01:30:00.000000">
                 <playlistElement id="0000000000000101" relativeOffset="0" >
                         <audioClip id="0000000000010001" 
-                                   playlength="01:00:00.000" 
+                                   playlength="01:30:00.000000" 
                                    title="one"
                                    uri="file:var/test1.mp3" />
                 </playlistElement>
@@ -114,10 +114,10 @@
                                    uri="file:var/test2.mp3" />
                 </playlistElement>
             </playlist>
-            <audioClip id="0000000000010001" playlength="01:00:00.000" 
+            <audioClip id="0000000000010001" playlength="00:00:11.000000" 
                        title="one"
                        uri="file:var/test1.mp3" />
-            <audioClip id="0000000000010002" playlength="00:30:00.000" 
+            <audioClip id="0000000000010002" playlength="00:00:12.200000" 
                        title="two"
                        uri="file:var/test2.mp3" /> 
         </testStorage>
diff --git a/livesupport/products/scheduler/src/RpcDisplayAudioClipTest.cxx b/livesupport/products/scheduler/src/RpcDisplayAudioClipTest.cxx
index 641b0821b..0b4b76527 100644
--- a/livesupport/products/scheduler/src/RpcDisplayAudioClipTest.cxx
+++ b/livesupport/products/scheduler/src/RpcDisplayAudioClipTest.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.9 $
+    Version  : $Revision: 1.10 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcDisplayAudioClipTest.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -123,7 +123,7 @@ RpcDisplayAudioClipTest :: firstTest(void)
     Ptr<AudioClip>::Ref  audioClip;
     CPPUNIT_ASSERT_NO_THROW(audioClip.reset(new AudioClip(result)));
     CPPUNIT_ASSERT(audioClip->getId()->getId() == 0x10001);
-    CPPUNIT_ASSERT(audioClip->getPlaylength()->total_seconds() == 60 * 60);
+    CPPUNIT_ASSERT(audioClip->getPlaylength()->total_seconds() == 11);
 
     xmlRpcClient.close();
 }
diff --git a/livesupport/products/scheduler/src/RpcDisplayAudioClipsTest.cxx b/livesupport/products/scheduler/src/RpcDisplayAudioClipsTest.cxx
index 9d71fbbab..82999f1fd 100644
--- a/livesupport/products/scheduler/src/RpcDisplayAudioClipsTest.cxx
+++ b/livesupport/products/scheduler/src/RpcDisplayAudioClipsTest.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.6 $
+    Version  : $Revision: 1.7 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcDisplayAudioClipsTest.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -123,7 +123,7 @@ RpcDisplayAudioClipsTest :: firstTest(void)
     Ptr<AudioClip>::Ref     audioClip;
     CPPUNIT_ASSERT_NO_THROW(audioClip.reset(new AudioClip(result0)));
     CPPUNIT_ASSERT(audioClip->getId()->getId() == 0x10001);
-    CPPUNIT_ASSERT(audioClip->getPlaylength()->total_seconds() == 60 * 60);
+    CPPUNIT_ASSERT(audioClip->getPlaylength()->total_seconds() == 11);
 
     XmlRpc::XmlRpcValue     result1 = result[1];
     CPPUNIT_ASSERT(result1.hasMember("audioClip"));
@@ -131,7 +131,7 @@ RpcDisplayAudioClipsTest :: firstTest(void)
                                         == XmlRpc::XmlRpcValue::TypeString);
     CPPUNIT_ASSERT_NO_THROW(audioClip.reset(new AudioClip(result1)));
     CPPUNIT_ASSERT(audioClip->getId()->getId() == 0x10002);
-    CPPUNIT_ASSERT(audioClip->getPlaylength()->total_seconds() == 30 * 60);
+    CPPUNIT_ASSERT(audioClip->getPlaylength()->total_microseconds() == 12200000);
 
     xmlRpcClient.close();
 }
diff --git a/livesupport/products/scheduler/src/RpcDisplayPlaylistsTest.cxx b/livesupport/products/scheduler/src/RpcDisplayPlaylistsTest.cxx
index 83056766d..802a1f695 100644
--- a/livesupport/products/scheduler/src/RpcDisplayPlaylistsTest.cxx
+++ b/livesupport/products/scheduler/src/RpcDisplayPlaylistsTest.cxx
@@ -22,7 +22,7 @@
  
  
     Author   : $Author: fgerlits $
-    Version  : $Revision: 1.9 $
+    Version  : $Revision: 1.10 $
     Location : $Source: /home/paul/cvs2svn-livesupport/newcvsrepo/livesupport/products/scheduler/src/RpcDisplayPlaylistsTest.cxx,v $
 
 ------------------------------------------------------------------------------*/
@@ -114,7 +114,7 @@ RpcDisplayPlaylistsTest :: firstTest(void)
     parameters["sessionId"]  = sessionId->getId();
     xmlRpcClient.execute("displayPlaylists", parameters, result);
     CPPUNIT_ASSERT(!xmlRpcClient.isFault());
-    CPPUNIT_ASSERT(result.size() == 1);
+    CPPUNIT_ASSERT(result.size() >= 1);
 
     XmlRpc::XmlRpcValue     result0 = result[0];
     CPPUNIT_ASSERT(result0.hasMember("playlist"));