Add version 0.2 and 0.12 JPK file examples from Michael Haggerty.

[hooke.git] / test / jpk_driver.py

diff --git a/test/jpk_driver.py b/test/jpk_driver.py
index 2515273c5efc9e4f0750bcc48ecb5499ff6a5c09..cfc11c9ed319c3145feb34c78b6bb7e075a6fb0b 100644 (file)
--- a/test/jpk_driver.py
+++ b/test/jpk_driver.py
@@ -23,35 +23,23 @@
 >>> r = HookeRunner()
 >>> playlist = os.path.join('test', 'data', 'vclamp_jpk', 'playlist')
 >>> h = r.run_lines(h, ['load_playlist ' + playlist]) # doctest: +ELLIPSIS
-<FilePlaylist playlist.hkp>
+<FilePlaylist JPK>
 Success
 <BLANKLINE>
 >>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
 name: 2009.04.23-15.15.47.jpk
-path: test/data/vclamp_jpk/2009.04.23-15.15.47.jpk
-experiment: None
+path: .../test/data/vclamp_jpk/2009.04.23-15.15.47.jpk
 driver: <hooke.driver.jpk.JPKDriver object at 0x...>
-filetype: None
-note: 
+note: None
+command stack: []
 blocks: 2
+block names: ['approach', 'retract']
 block sizes: [(4096, 6), (4096, 4)]
 Success
 <BLANKLINE>
+>>> p = h.playlists.current()
+>>> for i,curve in enumerate(p.items()):
+...     print i, [d.info['name'] for d in curve.data]
+... # doctest: +REPORT_UDIFF
 
-Load the second curve, to test calibration file overriding.
-
->>> h = r.run_lines(h, ['next_curve'])
-Success
-<BLANKLINE>
->>> h = r.run_lines(h, ['curve_info']) # doctest: +ELLIPSIS, +REPORT_UDIFF
-name: 2009.04.23-15.21.39.jpk
-path: test/data/vclamp_jpk/2009.04.23-15.21.39.jpk
-experiment: None
-driver: <hooke.driver.jpk.JPKDriver object at 0x...>
-filetype: None
-note: 
-blocks: 3
-block sizes: [(4096, 6), (2048, 3), (4096, 4)]
-Success
-<BLANKLINE>
 """