amp 0.5.2 → 0.5.3

data/test/test_commands.rb

@@ -1,8 +1,8 @@
-require "test/unit"
+require File.join(File.expand_path(File.dirname(__FILE__)), 'testutilities')
 require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp"))
 require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp/commands/command.rb"))
 
-class TestCommmands < Test::Unit::TestCase
+class TestCommmands < AmpTestCase
   include Amp
   include Amp::KernelMethods
   extend  Amp::KernelMethods

data/test/test_difflib.rb

@@ -1,8 +1,8 @@
-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 TestDifflib < Test::Unit::TestCase
+class TestDifflib < AmpTestCase
   include Amp::Diffs
   def test_one_match
     matcher = SequenceMatcher.new("hi there my name is mike i hope you like me", 

data/test/test_generator.rb

@@ -0,0 +1,34 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'testutilities')
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp/support/generator"))
+
+class FibonacciGeneratorTester < Generator
+  def generator_loop
+    a, b = 0, 1
+    while true
+      yield_gen b
+      a, b = b, a + b
+    end
+  end
+end
+
+class TestGenerator < AmpTestCase
+  def setup
+    @generator = FibonacciGeneratorTester.new
+  end
+  
+  def test_next
+    assert_equal 1, @generator.next
+    assert_equal 1, @generator.next
+    assert_equal 2, @generator.next
+    assert_equal 3, @generator.next
+    assert_equal 5, @generator.next
+  end
+  
+  def test_reset
+    10.times { @generator.next }
+    #reset it, first num should be 1
+    @generator.reset
+    assert_equal 1, @generator.next
+  end
+  
+end

data/test/test_ignore.rb

@@ -0,0 +1,203 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'testutilities')
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp"))
+
+class TestIgnore < AmpTestCase
+  include Amp::Mercurial::Ignore
+  
+  def setup
+    super
+    @ignore_path = self.write_file "ignore" do |io|
+      io << "syntax: glob\n" << "test/**/test_*.rb\n" << "doc/*\n"
+      io << "syntax: regexp\n\.DS_Store\n"
+    end
+  end
+
+  #### parse_line #############
+
+  def test_parse_line_no_sym
+    assert_nil parse_line(nil, "doc/*")
+  end
+  
+  def test_parse_line_regexp
+    expected = /doc\/(\d\d\d)/
+    assert_regexp_equal expected, parse_line(:regexp, "doc/(\\d\\d\\d)")
+  end
+  
+  def test_parse_line_glob_one_star
+    input = "test/*/test_*.rb"
+    expected = /^test\/[^\/]*\/test_[^\/]*\.rb/
+    result = parse_line(:glob, input)
+    assert_regexp_equal expected, result
+  end
+  
+  def test_glob_one_star_matches
+    input = "test/*/test_*.rb"
+    result = parse_line(:glob, input)
+    assert_match(result, "test/silly/test_crazy.rb")
+  end
+  
+  def test_glob_one_star_is_not_relative
+    input = "test/*/test_*.rb"
+    result = parse_line(:glob, input)
+    refute_match(result, "some/test/silly/test_crazy.rb")
+  end
+    
+  def test_parse_line_relglob_one_star
+    input = "test/*/test_*.rb"
+    expected = /test\/[^\/]*\/test_[^\/]*\.rb/
+    result = parse_line(:relglob, input)
+    assert_regexp_equal expected, result
+  end
+  
+  def test_relglob_one_star_matches
+    input = "test/*/test_*.rb"
+    result = parse_line(:relglob, input)
+    assert_match(result, "test/silly/test_crazy.rb")
+  end
+  
+  def test_relglob_one_star_also_relative
+    input = "test/*/test_*.rb"
+    result = parse_line(:relglob, input)
+    assert_match(result, "some/test/silly/test_crazy.rb")
+  end
+  
+  def test_parse_line_glob_two_star
+    input = "test/**/test_*.rb"
+    expected = /^test\/(?:.*\/)*test_[^\/]*\.rb/
+    result = parse_line(:glob, input)
+    assert_regexp_equal expected, result
+  end
+  
+  def test_glob_two_star_matches_subdirs
+    input = "test/**/test_*.rb"
+    result = parse_line(:glob, input)
+    assert_match(result, "test/first/second/third/fourth/test_filez.rb")
+  end
+  
+  def test_glob_two_star_matches_no_subdirs
+    input = "test/**/test_*.rb"
+    result = parse_line(:glob, input)
+    assert_match(result, "test/test_filez.rb")
+  end
+  
+  #### matcher_for_string #############
+  
+  # defaults to regexp
+  def test_matcher_for_string_nilcase
+    expected = /doc\/(\d\d\d)/
+    result = matcher_for_string("doc/(\\d\\d\\d)")
+    assert_regexp_equal expected, result
+  end
+  
+  def test_matcher_for_string_glob
+    input = "glob: test/**/test_*.rb"
+    expected = /^test\/(?:.*\/)*test_[^\/]*\.rb/
+    result = matcher_for_string(input)
+    assert_regexp_equal expected, result
+  end
+  
+  def test_matcher_for_string_relglob
+    input = "relglob: test/**/test_*.rb"
+    expected = /test\/(?:.*\/)*test_[^\/]*\.rb/
+    result = matcher_for_string(input)
+    assert_regexp_equal expected, result
+  end
+  
+  def test_matcher_for_string_regexp
+    expected = /doc\/(\d\d\d)/
+    result = matcher_for_string("regexp: doc/(\\d\\d\\d)")
+    assert_regexp_equal expected, result
+  end
+  
+  #### regexps_to_proc #############
+  
+  def test_regexps_to_proc_matches
+    prok = regexps_to_proc(/abc/, /bcd/, /a*bc/)
+    assert prok.call("abc")
+    assert prok.call("aaaaabc")
+    assert prok.call("bcd")
+  end
+  
+  def test_regexps_to_proc_doesnt_match
+    prok = regexps_to_proc(/abc/, /bcd/, /a*bc/)
+    assert_false prok.call("cde")
+  end
+  
+  #### strip_comment #############
+  
+  def test_strip_comment_simple
+    assert_equal "", strip_comment("# hello there")
+  end
+  
+  def test_strip_comment_other_stuff
+    assert_equal "hello ", strip_comment("hello # there")
+  end
+  
+  def test_strip_comment_no_comment
+    assert_equal "hello there", strip_comment("hello there")
+  end
+  
+  def test_strip_comment_escaped_hashes
+    assert_equal "hello # there", strip_comment("hello \\# there")
+  end
+  
+  def test_strip_comment_complex
+    assert_equal "hello # there ##", strip_comment("hello \\# there \\#\\## some comment")
+  end
+  
+  #### parse_lines #############
+  
+  def test_parse_lines_simple
+    input = "hello\nthere\nhow\nare\nyou"
+    assert_equal %w[hello there how are you], parse_lines(input)
+  end
+  
+  def test_parse_lines_strip_whitespace
+    input = "hello  \t\nthere\t  \nhow\t\t  \t\nare  \t\t  \nyou  \t\t  \t"
+    assert_equal %w[hello there how are you], parse_lines(input)
+  end
+  
+  def test_parse_lines_remove_empty
+    input = "hello\n\nthere\n\ni\n  \nam\n\n\n\n\nmike"
+    assert_equal %w[hello there i am mike], parse_lines(input)
+  end
+  
+  def test_parse_lines_strip_comments
+    input = <<-EOF
+hi there # introduction
+my name 
+  
+is mike   
+EOF
+    expected = ["hi there", "my name", "is mike"]
+    assert_equal expected, parse_lines(input)
+  end
+  
+  #### matcher_for_text #############
+  
+  def test_matcher_for_text_simple
+    input = "syntax: regexp\n\\.DS_Store # God damn OS X files\ndoc/\\d\\d\\d.txt\n\n"
+    expected = [/\.DS_Store/, /doc\/\d\d\d.txt/]
+    result = matcher_for_text input
+    expected.zip(result).each {|a,b| assert_regexp_equal a,b}
+  end
+  
+  def test_matcher_for_text_mixed
+    input = "syntax: regexp\n\\.DS_Store # God damn OS X files\nsyntax: glob  \ntest/**/test_*.rb\n\n"
+    expected = [/\.DS_Store/, /^test\/(?:.*\/)*test_[^\/]*\.rb/]
+    result = matcher_for_text input
+    expected.zip(result).each {|a,b| assert_regexp_equal a,b}
+  end
+  
+  #### parse_ignore #############
+  
+  def test_parse_ignore
+    proc = parse_ignore File.dirname(@ignore_path), "ignore"
+    assert proc.call("test/some/test/dir/test_crazy.rb")
+    assert proc.call("test/test_crazy.rb")
+    assert proc.call("doc/file.html")
+    assert_false proc.call("dir/doc/dir/file.html")
+    assert proc.call(".DS_Store")
+    assert proc.call("some/dir/.DS_Store")
+  end
+end

data/test/test_journal.rb

@@ -1,16 +1,15 @@
-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)
@@ -18,12 +17,18 @@ class TestJournal < Test::Unit::TestCase
   
   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

data/test/test_match.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 TestMatch < Test::Unit::TestCase
+class TestMatch < AmpTestCase
 
   def setup
     @all_files = ["silly.rb", "code/lib.rb", "code/support.yml", "bin/amp.rb", "test/test_bdiff.rb"]

data/test/test_mdiff.rb

@@ -1,8 +1,8 @@
-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 TestMdiff < Test::Unit::TestCase
-  include Amp::Diffs
+class TestMdiff < AmpTestCase
+  include Amp::Diffs::Mercurial
 
   def test_default_whitespace_clean
     opts = MercurialDiff::DEFAULT_OPTIONS.dup

data/test/test_mpatch.rb

@@ -1,10 +1,10 @@
 # -*- coding: us-ascii -*-
 require 'stringio'
-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 TestMpatch < Test::Unit::TestCase
-  include Amp::Diffs
+class TestMpatch < AmpTestCase
+  include Amp::Diffs::Mercurial
   def test_apply_patch
     patch = "\000\000\000\t\000\000\000\021\000\000\000\ni'm stupid"
     input = "hi there\ni'm cool"

data/test/test_multi_io.rb

@@ -0,0 +1,40 @@
+require 'stringio'
+require File.join(File.expand_path(File.dirname(__FILE__)), 'testutilities')
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp/support/multi_io"))
+
+class TestMultiIO < AmpTestCase
+  def setup
+    input1 = StringIO.new("input1")
+    input2 = StringIO.new("input2input2")
+    input3 = StringIO.new("input3")
+    @multi_io = Amp::Support::MultiIO.new(input1, input2, input3)
+  end
+  
+  def test_read_all
+    assert_equal "input1input2input2input3", @multi_io.read
+  end
+  
+  def test_read_3_bytes
+    assert_equal "inp", @multi_io.read(3)
+  end
+  
+  def test_rewind
+    @multi_io.read(3)
+    @multi_io.rewind
+    assert_equal 0, @multi_io.tell
+  end
+  
+  def test_pos
+    @multi_io.read(7)
+    assert_equal 7, @multi_io.tell
+  end
+  
+  def test_read_crossing_ios
+    assert_equal "input1inp", @multi_io.read(9)
+    assert_equal "ut2input2in", @multi_io.read(11)
+    assert_equal "put3", @multi_io.read
+  end
+  
+  
+  
+end

data/test/test_support.rb

@@ -1,7 +1,14 @@
-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 TestSupport < Test::Unit::TestCase
+class OppositeMethodTestKlass
+  def base(input)
+    !!input
+  end
+  opposite_method :opposite, :base
+end
+
+class TestSupport < AmpTestCase
   def test_split_newlines
     assert_equal(["hi there what's\n", "\r up there\r kids\n", " lol"], "hi there what's\n\r up there\r kids\n lol".split_newlines)
   end
@@ -18,6 +25,15 @@ class TestSupport < Test::Unit::TestCase
     end
   end
   
+  def test_opposite_method
+    obj = OppositeMethodTestKlass.new
+    assert_respond_to obj, :opposite
+    assert obj.base(true)
+    assert_false obj.opposite(true)
+    assert_false obj.base(false)
+    assert obj.opposite(false)
+  end
+  
 end
 
 

data/test/test_templates.rb

@@ -0,0 +1,38 @@
+require File.join(File.expand_path(File.dirname(__FILE__)), 'testutilities')
+require File.expand_path(File.join(File.dirname(__FILE__), "../lib/amp/templates/template"))
+
+class TestTemplates < AmpTestCase
+  include Amp::Support  
+  
+  def setup
+    @template = Template.new(:log, :test, :erb, "<%= name %> <%= age %>")
+  end
+  
+  def test_new_template
+    assert @template
+  end
+  
+  def test_unregister
+    Template.unregister(:log, :test)
+    assert_nil(Template[:log, :test])
+  end
+  
+  def test_render
+    name = "Steve"
+    age = 21
+    assert_equal "Steve 21", @template.render({}, binding)
+  end
+  
+  def test_locals
+    locals = {:name => "Steve", :age => 21}
+    assert_equal("Steve 21", @template.render(locals))
+  end
+  
+  def test_loading_defaults
+    Template.ensure_templates_loaded
+    assert Template.templates_loaded?
+    assert_not_nil(Template[:mercurial, "default-commit"])
+    assert_not_nil(Template[:mercurial, "default-log"])
+  end
+    
+end