test/test_journal.rb in amp-0.5.2 vs test/test_journal.rb in amp-0.5.3

@@ -1,29 +1,34 @@
-require "test/unit"
+require File.join(File.expand_path(File.dirname(__FILE__)), 'testutilities')
 require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp"))
 
-class TestJournal < Test::Unit::TestCase
+class TestJournal < AmpTestCase
   def test_journal
     tfile = "tempjournal"
-    j = Amp::Journal.new(Amp::StandardErrorReporter, tfile, nil)
-    j << ["file",12345]
+    j = Amp::Mercurial::Journal.new(:reporter => Amp::StandardErrorReporter, :journal => tfile, :opener => simple_opener)
+    j << {:file => "file", :offset => 12345}
     
-    
-    test_open = open(tfile)
-    assert_equal("file\0#{12345}\n", test_open.read)
-    test_open.close
+    open(tfile) do |input|
+      assert_equal("file\0#{12345}\n", input.read)
+    end
     j.close
     
     assert !File.exists?(tfile)
   end
   
   def test_journal_start_mode
     tfile = "tempjournal"
-    Amp::Journal.start tfile do |j|
-      j << ["file",12345]
-      test_open = open(tfile)
-      assert_equal("file\0#{12345}\n", test_open.read)
-      test_open.close
+    Amp::Mercurial::Journal.start(tfile, :opener => simple_opener) do |j|
+      j << {:file => "file", :offset => 12345}
+      open(tfile) do |input|
+        assert_equal("file\0#{12345}\n", input.read)
+      end
     end
     assert !File.exists?(tfile)
+  end
+  
+  def simple_opener
+    opener = Amp::Opener.new(Dir.pwd)
+    opener.default = :open_file
+    opener
   end
 end
\ No newline at end of file