# HG changeset patch
# User Frederic Bastien <bastienf@iro.umontreal.ca>
# Date 1210698345 14400
# Node ID 051e07807554b7e6d6a3dfade42d89c3a490fc5d
# Parent  c704a66706fed993fb4959877febf5d2f27ee595
added test for CachedDataSet(ds,cache_all_upon_construction=True)

diff -r c704a66706fe -r 051e07807554 test_dataset.py
--- a/test_dataset.py	Tue May 13 13:00:54 2008 -0400
+++ b/test_dataset.py	Tue May 13 13:05:45 2008 -0400
@@ -404,10 +404,9 @@
 
     test_iterate_over_examples(a2, ds)
     test_getitem(a2, ds)
-
-#     - for val1,val2,val3 in dataset(field1, field2,field3):
     test_ds_iterator(a2,ds('x','y'),ds('y','z'),ds('x','y','z'))
     test_fields_fct(ds)
+
     del a2, ds
 
 def test_LookupList():
@@ -432,20 +431,24 @@
 
 def test_CachedDataSet():
     print "test_CacheDataSet"
-    a2 = numpy.random.rand(10,4)
-    ds1 = ArrayDataSet(a2,LookupList(['x','y','z'],[slice(3),3,[0,2]]))###???tuple not tested
+    a = numpy.random.rand(10,4)
+    ds1 = ArrayDataSet(a,LookupList(['x','y','z'],[slice(3),3,[0,2]]))###???tuple not tested
     ds2 = CachedDataSet(ds1)
     ds3 = CachedDataSet(ds1,cache_all_upon_construction=True)
     assert len(ds2)==10
+    assert len(ds3)==10
 
-    test_iterate_over_examples(a2, ds2)
-    test_getitem(a2, ds2)
-
-#     - for val1,val2,val3 in dataset(field1, field2,field3):
-    test_ds_iterator(a2,ds2('x','y'),ds2('y','z'),ds2('x','y','z'))
+    test_iterate_over_examples(a, ds2)
+    test_getitem(a, ds2)
+    test_ds_iterator(a,ds2('x','y'),ds2('y','z'),ds2('x','y','z'))
     test_fields_fct(ds2)
 
-    del a2,ds1,ds2,ds3
+    test_iterate_over_examples(a, ds3)
+    test_getitem(a, ds3)
+    test_ds_iterator(a,ds3('x','y'),ds3('y','z'),ds3('x','y','z'))
+    test_fields_fct(ds3)
+
+    del a,ds1,ds2,ds3
 
 
 def test_DataSetFields():