From 16bece1081e92600bd4dbe4d6d50a703b7d5a85c Mon Sep 17 00:00:00 2001
From: Andy Balaam <andybalaam@artificialworlds.net>
Date: Sat, 29 Nov 2008 16:49:22 +0000
Subject: [PATCH] Added the propertiesfile test to the test suite.

---
 src/rtv_abstractpropertiesfile.py | 25 -------------------------
 src/rtv_propertiesfile.py         | 29 +++++++++++++++++++++++++++++
 src/rtv_schedule.py               |  3 +--
 src/test_recordtv                 | 11 +++++++++--
 4 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/src/rtv_abstractpropertiesfile.py b/src/rtv_abstractpropertiesfile.py
index 461d711..65ce644 100644
--- a/src/rtv_abstractpropertiesfile.py
+++ b/src/rtv_abstractpropertiesfile.py
@@ -97,29 +97,4 @@ class AbstractPropertiesFile( object ):
 	def get_keys( self ):
 		raise Exception( "Method not implemented." )
 
-if __name__=="__main__":
-	# Testing code:
-
-	pf = PropertiesFile()
-	pf.mystr = "Hello2"
-	pf.mystrpipe = "|Hello"
-	pf.mytuple = ( "x", "y", "z" )
-	pf.mylist = [ "xa", "yb", "zc" ]
-	pf.myint = 45
-	pf.myfloat = 5.8
-
-	filename = "tmp.rtvtestpropertiesfile"
-
-	pf.save( filename )
-
-	pf2 = PropertiesFile()
-	pf2.load( filename )
-
-	os.unlink( filename )
-
-	#print pf2.__dict__
-
-	# TODO: assert( pf.__dict__ == pf2.__dict__ )
-
-	# TODO: test reading a file with spaces around the =, etc.
 
diff --git a/src/rtv_propertiesfile.py b/src/rtv_propertiesfile.py
index 8a4ee16..04acae1 100644
--- a/src/rtv_propertiesfile.py
+++ b/src/rtv_propertiesfile.py
@@ -1,5 +1,7 @@
 #!/usr/bin/python
 
+import os
+
 from rtv_abstractpropertiesfile import AbstractPropertiesFile
 
 class PropertiesFile( AbstractPropertiesFile ):
@@ -16,3 +18,30 @@ class PropertiesFile( AbstractPropertiesFile ):
 	def get_keys( self ):
 		return self.__dict__.keys()
 
+def test():
+	# Testing code:
+
+	pf = PropertiesFile()
+	pf.mystr = "Hello2"
+	pf.mystrpipe = "|Hello"
+	pf.mytuple = ( "x", "y", "z" )
+	pf.mylist = [ "xa", "yb", "zc" ]
+	pf.myint = 45
+	pf.myfloat = 5.8
+
+	filename = "tmp.rtvtestpropertiesfile"
+
+	pf.save( filename )
+
+	pf2 = PropertiesFile()
+	pf2.load( filename )
+
+	os.unlink( filename )
+
+	#print pf2.__dict__
+
+	# TODO: assert( pf.__dict__ == pf2.__dict__ )
+
+	# TODO: test reading a file with spaces around the =, etc.
+
+
diff --git a/src/rtv_schedule.py b/src/rtv_schedule.py
index 944f010..9a709cd 100644
--- a/src/rtv_schedule.py
+++ b/src/rtv_schedule.py
@@ -4,7 +4,6 @@ import time, datetime, os, re
 import rtv_favourite, rtv_utils, rtv_programmeinfo
 import rtv_propertiesfile, rtv_selection
 
-# TODO: prevent overlapping recordings
 # TODO: delete old files:
 #          - scheduled recordings
 #          - logs
@@ -384,7 +383,7 @@ class FakeScheduler:
 					format_pi_list( self.queue ) ) )
 
 
-def test_schedule( config ):
+def test( config ):
 	p = FakeScheduler()
 	p.schedule = Schedule( config )
 
diff --git a/src/test_recordtv b/src/test_recordtv
index a3ada96..9f8000b 100755
--- a/src/test_recordtv
+++ b/src/test_recordtv
@@ -1,13 +1,20 @@
 #!/usr/bin/python
 
-import rtv_download, rtv_schedule, rtv_tvguide, rtv_delete, rtv_convert
+import rtv_download
+import rtv_schedule
+import rtv_tvguide
+import rtv_delete
+import rtv_convert
+import rtv_propertiesfile
+
 from rtv_config import GTVGConfig
 
 def main():
 
 	config = GTVGConfig( [], [] )
 
-	rtv_schedule.test_schedule( config )
+	rtv_propertiesfile.test()
+	rtv_schedule.test( config )
 
 	print "All tests passed."
 
-- 
2.11.4.GIT