amp 0.5.2 → 0.5.3

data/test/localrepo_tests/ampfile.rb

@@ -0,0 +1,12 @@
+# Any ruby code here will be executed before Amp loads a repository and
+# dispatches a command.
+#
+# Example command:
+#
+# command "echo" do |c|
+#    c.opt :"no-newline", "Don't print a trailing newline character", :short => "-n"
+#    c.on_run do |opts, args|
+#        print args.join(" ")
+#        print "\n" unless opts[:"no-newline"]
+#    end
+# end

data/test/localrepo_tests/test_local_repo.rb

@@ -1,14 +1,14 @@
-require "test/unit"
+require File.join(File.expand_path(File.dirname(__FILE__)), '../testutilities')
 require 'fileutils'
 require File.expand_path(File.join(File.dirname(__FILE__), "../../lib/amp"))
 
-class TestLocalRepo < Test::Unit::TestCase
+class TestLocalRepo < AmpTestCase
   REPO_PATH = File.expand_path(File.join(File.dirname(__FILE__)))
   EXISTING_REPO_PATH = File.expand_path(File.join(File.dirname(__FILE__), "testrepo"))
   
   def setup
     @config = Amp::AmpConfig.new
-    @repo = Amp::Repositories::LocalRepository.new(EXISTING_REPO_PATH, false, @config)
+    @repo = Amp::Repositories::Mercurial::LocalRepository.new(EXISTING_REPO_PATH, false, @config)
   end
   
   def join(*args)
@@ -23,27 +23,22 @@ class TestLocalRepo < Test::Unit::TestCase
     FileUtils.rm_rf join(".hg")
   end
     
-    def test_create_repo
-      Amp::Repositories::LocalRepository.new(REPO_PATH, true, @config)
-      assert File.directory?(join(".hg"))
-      assert File.exists?(hg_join("00changelog.i"))
-      assert File.exists?(hg_join("requires"))
-      assert File.directory?(hg_join("store"))
-      assert_file_contents hg_join("requires"),"revlogv1\nstore\nfncache\n"
-    end
-    
-    def test_open_existing_repo
-      assert_not_nil @repo
-    end
-    
-    def test_get_initial_changeset
-      changeset = @repo[0]
-      assert_equal Amp::Changeset, changeset.class
-    end
-    
-    def test_repo_size
-      assert_equal 4, @repo.size
-    end
+  def test_create_repo
+    Amp::Repositories::Mercurial::LocalRepository.new(REPO_PATH, true, @config)
+    assert File.directory?(join(".hg"))
+    assert File.exists?(hg_join("00changelog.i"))
+    assert File.exists?(hg_join("requires"))
+    assert File.directory?(hg_join("store"))
+    assert_file_contents hg_join("requires"),"revlogv1\nstore\nfncache\n"
+  end
+  
+  def test_open_existing_repo
+    refute_nil @repo
+  end
+  
+  def test_repo_size
+    assert_equal 4, @repo.size
+  end
   
   def test_initial_changeset_manifest
     changeset = @repo[0]
@@ -56,40 +51,40 @@ class TestLocalRepo < Test::Unit::TestCase
     assert_equal expected_list.sort, actual.sort
   end
     
-    def test_initial_readme
-      changeset = @repo[0]
-      
-      changeset.manifest.inspect # force load of manifest
-      
-      file = changeset["readme"]
-      # data check on a file
-      expected_readme = "this is the readme. I hope you like it.\nAmp is "+
-                        "totally sweet. We're gonna do awesome stuff.\nI hope "+
-                        "you lik it.\n"
-                        
-      expected = expected_readme
-      actual = file.data
-      assert_equal expected, actual
-      
-      expected = Zlib::Deflate.deflate(file.data).size
-      actual = file.size # compressed size
-      assert_equal expected, actual
-      
-      assert_false file.cmp(expected_readme)
-    end
+  def test_initial_readme
+    changeset = @repo[0]
     
-    def test_second_readme
-      expected_readme = "this is the readme. I hope you like it.\nAmp is "+
-                        "totally sweet. We're gonna do awesome stuff.\nI hope "+
-                        "you like it.\n" # typo fixed
-      changeset = @repo[1]
-      changeset.manifest # force load of manifest
-      file = changeset["readme"]
-      
-      expected = expected_readme
-      actual = file.data
-      assert_equal expected, actual
-    end
+    changeset.manifest_entry.inspect # force load of manifest
+    
+    file = changeset["readme"]
+    # data check on a file
+    expected_readme = "this is the readme. I hope you like it.\nAmp is "+
+                      "totally sweet. We're gonna do awesome stuff.\nI hope "+
+                      "you lik it.\n"
+                      
+    expected = expected_readme
+    actual = file.data
+    assert_equal expected, actual
+    
+    expected = Zlib::Deflate.deflate(file.data).size
+    actual = file.size # compressed size
+    assert_equal expected, actual
+    
+    assert_false file.cmp(expected_readme)
+  end
+  
+  def test_second_readme
+    expected_readme = "this is the readme. I hope you like it.\nAmp is "+
+                      "totally sweet. We're gonna do awesome stuff.\nI hope "+
+                      "you like it.\n" # typo fixed
+    changeset = @repo[1]
+    changeset.manifest_entry # force load of manifest
+    file = changeset["readme"]
+    
+    expected = expected_readme
+    actual = file.data
+    assert_equal expected, actual
+  end
   
   def test_status
     
@@ -105,6 +100,8 @@ class TestLocalRepo < Test::Unit::TestCase
     added    = []
     deleted  = []
     removed  = []
+    #copied   = []
+    #moved    = []
     expected = { :modified => modified.sort,
                  :added    => added.sort,
                  :removed  => removed.sort,
@@ -112,6 +109,8 @@ class TestLocalRepo < Test::Unit::TestCase
                  :unknown  => unknown.sort,
                  :ignored  => ignored.sort,
                  :clean    => clean.sort  ,
+                 #:copied   => copied,
+                 #:moved    => moved,
                  :delta    => 19
                }
       

data/test/manifest_tests/test_manifest.rb

@@ -1,14 +1,12 @@
-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 TestManifest < Test::Unit::TestCase
+class TestManifest < AmpTestCase
   
   def setup
     opener = Amp::Opener.new(File.dirname(__FILE__))
     opener.default = :open_file
-    @manifest = Amp::Manifest.new(opener)
+    @manifest = Amp::Mercurial::Manifest.new(opener)
   end
   
   def test_load_manifest

data/test/merge_tests/test_merge.rb

@@ -1,7 +1,7 @@
-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 TestMerge < Test::Unit::TestCase
+class TestMerge < AmpTestCase
   TEST_BASE = File.expand_path(File.join(File.dirname(__FILE__), 'base.txt'))
   TEST_LOCAL = File.expand_path(File.join(File.dirname(__FILE__), 'local.txt'))
   TEST_REMOTE = File.expand_path(File.join(File.dirname(__FILE__), 'remote.txt'))
@@ -14,7 +14,7 @@ class TestMerge < Test::Unit::TestCase
     
     # kill the error output...
     old, $stderr = $stderr, StringIO.new
-    Amp::Merges::ThreeWayMerger.three_way_merge(TEST_LOCAL, TEST_BASE, TEST_REMOTE,
+    Amp::Merges::Mercurial::ThreeWayMerger.three_way_merge(TEST_LOCAL, TEST_BASE, TEST_REMOTE,
                                                 :labels => ["local","other"])
     $stderr = old # and reassign
     

data/test/revlog_tests/test_revlog.rb

@@ -1,15 +1,14 @@
 # -*- coding: us-ascii -*-
-
-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 TestRevlog < Test::Unit::TestCase
+class TestRevlog < AmpTestCase
   TEST_REVLOG_INDEX = "testindex.i"
   
   def setup
     opener = Amp::Opener.new(File.expand_path(File.dirname(__FILE__)))
     opener.default = :open_file # for testing purposes!
-    @revlog = Amp::Revlog.new(opener, TEST_REVLOG_INDEX)
+    @revlog = Amp::Mercurial::Revlog.new(opener, TEST_REVLOG_INDEX)
   end
   
   def test_load_revlog
@@ -23,6 +22,15 @@ class TestRevlog < Test::Unit::TestCase
     assert_equal expected, result
   end
   
+  
+  def test_node_raises
+    assert_raises(Amp::Mercurial::RevlogSupport::LookupError) { @revlog.node_id_for_index(12345) }
+  end
+  
+  def test_rev_raises
+    assert_raises(Amp::Mercurial::RevlogSupport::LookupError) { @revlog.revision_index_for_node("abcdefghijkl") }
+  end
+  
   def test_revlog_size
     result = @revlog.size
     expected = 51
@@ -297,8 +305,8 @@ class TestRevlog < Test::Unit::TestCase
     new_file = "./test/revlog_tests/test_adding_index.i"
     opener = Amp::Opener.new(".")
     opener.default = :open_file
-    newrevlog = Amp::Revlog.new(opener, new_file)
-    Amp::Journal.start("sillymonkey.tx") do |j|
+    newrevlog = Amp::Mercurial::Revlog.new(opener, new_file)
+    Amp::Mercurial::Journal.start("sillymonkey.tx") do |j|
       newrevlog.add_revision("silly", j, 50, "|\x03\xfe\x149\x81+\xcc5\xa3\x97\x94*I\xe2\xb9T\xa9\xac\x02", "\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00")
     end
     new_str = ""

data/test/store_tests/test_fncache_store.rb

@@ -1,38 +1,38 @@
-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 TestFilenameCacheStore < Test::Unit::TestCase
+class TestFilenameCacheStore < AmpTestCase
   STORE_PATH = File.expand_path(File.join(File.dirname(__FILE__)))
   def setup
-    @store = Amp::Repositories::Stores.pick(['store','fncache'], STORE_PATH, Amp::Opener)
+    @store = Amp::Repositories::Mercurial::Stores.pick(['store','fncache'], STORE_PATH, Amp::Opener)
   end
   
   def test_load_manifest
     assert_not_nil @store
-    assert_instance_of Amp::Repositories::Stores::FilenameCacheStore, @store
+    assert_instance_of Amp::Repositories::Mercurial::Stores::FilenameCacheStore, @store
   end
   
   def test_hybrid_encode
-    result = Amp::Repositories::Stores.hybrid_encode("data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAH"+
+    result = Amp::Repositories::Mercurial::Stores.hybrid_encode("data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAH"+
                                        "A????WHHHHHHHHHHHAAAAAAAAATTTTTTTTTT/"+
                                        "lolzorZ?.rb")
     expected = "dh/abcdefgh/hahaha~3/lolzorz~3f.rb0d132fe8aa79af42d3d3c11038"+
                "3007e9f5bd43d4.rb"
     assert_equal expected, result
     
-    result = Amp::Repositories::Stores.hybrid_encode("data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAH"+
+    result = Amp::Repositories::Mercurial::Stores.hybrid_encode("data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAH"+
                                        "A????WHHHHTT/lolzorZ?.rb")
     expected = "data/_a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z/_h"+
                "_a_h_a_h_a~3f~3f~3f~3f_w_h_h_h_h_t_t/lolzor_z~3f.rb"
     assert_equal expected, result
     
-    result = Amp::Repositories::Stores.hybrid_encode("data///../.././//lolzorZ?.rb")
+    result = Amp::Repositories::Mercurial::Stores.hybrid_encode("data///../.././//lolzorZ?.rb")
     expected = "data///.~2e/.~2e/~2e///lolzor_z~3f.rb"
     assert_equal expected, result
   end
   
   def test_normal_encode
-    result = Amp::Repositories::Stores.encode_filename("data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAH"+
+    result = Amp::Repositories::Mercurial::Stores.encode_filename("data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAH"+
                                        "A????WHHHHHHHHHHHAAAAAAAAATTTTTTTTTT/"+
                                        "lolzorZ?.rb")
     expected = "data/_a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z/_h_"+
@@ -40,19 +40,19 @@ class TestFilenameCacheStore < Test::Unit::TestCase
                "_a_t_t_t_t_t_t_t_t_t_t/lolzor_z~3f.rb"
     assert_equal expected, result
     
-    result = Amp::Repositories::Stores.encode_filename("data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAH"+
+    result = Amp::Repositories::Mercurial::Stores.encode_filename("data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAH"+
                                        "A????WHHHHTT/lolzorZ?.rb")
     expected = "data/_a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z/_h_"+
                "a_h_a_h_a~3f~3f~3f~3f_w_h_h_h_h_t_t/lolzor_z~3f.rb"
     assert_equal expected, result
     
-    result = Amp::Repositories::Stores.encode_filename("data///../.././//lolzorZ?.rb")
+    result = Amp::Repositories::Mercurial::Stores.encode_filename("data///../.././//lolzorZ?.rb")
     expected = "data///../.././//lolzor_z~3f.rb"
     assert_equal expected, result
   end
   
   def test_normal_decode
-    result = Amp::Repositories::Stores.decode_filename(
+    result = Amp::Repositories::Mercurial::Stores.decode_filename(
                "data/_a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z/_h_"+
                "a_h_a_h_a~3f~3f~3f~3f_w_h_h_h_h_h_h_h_h_h_h_h_a_a_a_a_a_a_a_a"+
                "_a_t_t_t_t_t_t_t_t_t_t/lolzor_z~3f.rb")
@@ -62,13 +62,13 @@ class TestFilenameCacheStore < Test::Unit::TestCase
                 "lolzorZ?.rb"
     assert_equal expected, result
     
-    result = Amp::Repositories::Stores.decode_filename(
+    result = Amp::Repositories::Mercurial::Stores.decode_filename(
                 "data/_a_b_c_d_e_f_g_h_i_j_k_l_m_n_o_p_q_r_s_t_u_v_w_x_y_z/_h_"+
                            "a_h_a_h_a~3f~3f~3f~3f_w_h_h_h_h_t_t/lolzor_z~3f.rb")
     expected = "data/ABCDEFGHIJKLMNOPQRSTUVWXYZ/HAHAHA????WHHHHTT/lolzorZ?.rb"
     assert_equal expected, result
     
-    result = Amp::Repositories::Stores.decode_filename("data///../.././//lolzor_z~3f.rb")
+    result = Amp::Repositories::Mercurial::Stores.decode_filename("data///../.././//lolzor_z~3f.rb")
     expected = "data///../.././//lolzorZ?.rb"
     assert_equal expected, result
   end
@@ -107,16 +107,16 @@ class TestFilenameCacheStore < Test::Unit::TestCase
   
   def test_picker_works
     requirements = []
-    store = Amp::Repositories::Stores.pick(requirements, STORE_PATH, Amp::Opener)
-    assert_instance_of Amp::Repositories::Stores::BasicStore, store
+    store = Amp::Repositories::Mercurial::Stores.pick(requirements, STORE_PATH, Amp::Opener)
+    assert_instance_of Amp::Repositories::Mercurial::Stores::BasicStore, store
     
     requirements = ['store']
-    store = Amp::Repositories::Stores.pick(requirements, STORE_PATH, Amp::Opener)
-    assert_instance_of Amp::Repositories::Stores::EncodedStore, store
+    store = Amp::Repositories::Mercurial::Stores.pick(requirements, STORE_PATH, Amp::Opener)
+    assert_instance_of Amp::Repositories::Mercurial::Stores::EncodedStore, store
     
     requirements = ['store', 'fncache']
-    store = Amp::Repositories::Stores.pick(requirements, STORE_PATH, Amp::Opener)
-    assert_instance_of Amp::Repositories::Stores::FilenameCacheStore, store
+    store = Amp::Repositories::Mercurial::Stores.pick(requirements, STORE_PATH, Amp::Opener)
+    assert_instance_of Amp::Repositories::Mercurial::Stores::FilenameCacheStore, store
     
   end
 end

data/test/test_19_compatibility.rb

@@ -0,0 +1,46 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'testutilities')
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp"))
+
+class Test19Compatibility < AmpTestCase
+  
+  def test_string_any?
+    assert "hello".any?
+  end
+  
+  def test_string_any_false
+    assert_false "".any?
+  end
+  
+  def test_lines
+    input = "hello\nthere\n\n mike"
+    expected = ["hello\n","there\n","\n"," mike"]
+    result = []
+    input.lines {|str| result << str}
+    assert_equal expected, result
+  end
+  
+  def test_lines_to_enum
+    input = "hello\nthere\n\n mike"
+    # can't do a kind_of? because ruby1.9 has ::Enumerator and
+    # 1.8 uses Enumerable::Enumerator
+    classname = input.lines.class.to_s.split("::").last
+    assert_equal "Enumerator", classname
+  end
+  
+  def test_ord
+    assert_equal "h".ord, 104
+  end
+  
+  def test_ord_long_string
+    assert_equal "hello".ord, 104
+  end
+  
+  def test_tap
+    value = "hi there"
+    in_block = nil
+    value.tap {|val| in_block = val}
+    assert_equal value, in_block
+  end
+  
+  
+end

data/test/test_base85.rb

@@ -1,7 +1,7 @@
-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 TestBase85 < Test::Unit::TestCase
+class TestBase85 < AmpTestCase
   def test_encode
     assert_equal("Xk~0{Zy<DNWpZUKAZ>XdZeeX@AZc?TZE0g@VP$L~AZTxQAYpQ4AbD?fAarkJVR=6",
                Amp::Encoding::Base85.encode("hello there, my name is michael! how are you today?"))

data/test/test_bdiff.rb

@@ -1,7 +1,7 @@
-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 TestBdiff < Test::Unit::TestCase
+class TestBdiff < AmpTestCase
   include Amp::Diffs
 
   def test_create_bdiff

data/test/test_changegroup.rb

@@ -0,0 +1,59 @@
+require 'stringio'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'testutilities')
+require 'zlib'
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp"))
+
+class TestChangegroup < AmpTestCase
+  include Amp::Mercurial::RevlogSupport
+  
+  def test_compressor_uncompressed
+    compressor = ChangeGroup.compressor_by_type("HG10UN")
+    assert_kind_of StringIO, compressor
+    assert_respond_to compressor, :flush
+    compressor << "input string"
+    assert_equal "input string", compressor.flush
+  end
+  
+  def test_compressor_no_header
+    assert_kind_of StringIO, ChangeGroup.compressor_by_type("")
+  end
+  
+  def test_compressor_zlib
+    compressor = ChangeGroup.compressor_by_type("HG10GZ")
+    assert_kind_of Zlib::Deflate, compressor
+  end
+  
+  def test_compressor_bz
+    # this fails. bz2 is borked atm.
+    # compressor = ChangeGroup.compressor_by_type("HG10BZ")
+    # assert_kind_of BZ2::Writer, compressor
+  end
+  
+  def test_unbundle_uncompressed
+    input_io = StringIO.new("input data")
+    decompressing_io = ChangeGroup.unbundle("HG10UN", input_io)
+    assert_equal("input data", decompressing_io.read)
+  end
+  
+  def test_unbundle_funny_header
+    input_io = StringIO.new("input data")
+    funny_header = "BUNDLE"
+    decompressing_io = ChangeGroup.unbundle(funny_header, input_io)
+    assert_equal("BUNDLEinput data", decompressing_io.read)
+  end
+  
+  def test_unbundle_gzip
+    input_io = StringIO.new("", "r+")
+    gzip_maker = Zlib::GzipWriter.new(input_io)
+    gzip_maker << "input string"
+    gzip_maker.flush
+    gzip_maker.close
+    input_io.reopen(input_io.string,"r")
+    input_io.rewind
+    decompressing_io = ChangeGroup.unbundle("HG10GZ", input_io)
+    assert_kind_of Zlib::GzipReader, decompressing_io
+    assert_equal "input string", decompressing_io.read
+  end
+    
+  
+end