pvn 0.0.7 → 0.0.8

data/test/integration/pvn/status/command_test.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'integration/tc'
+require 'pvn/status/command'
+require 'resources'
+require 'stringio'
+
+Log.level = Log::DEBUG
+
+module PVN::Status
+  class CommandTest < PVN::IntegrationTestCase
+
+    def test_local
+      explines = Array.new
+
+      explines << "    \e[33mFirstFile.txt\e[0m"
+      explines << "    \e[32mSeventhFile.txt\e[0m"
+      explines << "    \e[31mdirzero/SixthFile.txt\e[0m"
+      explines << "    src/java/Charlie.java"
+      explines << "    \e[32msrc/ruby/dog.rb\e[0m"
+      
+      assert_command_output PVN::Status::Command, %w{ }, explines
+    end
+  end
+end

data/test/unit/pvn/app_test.rb

@@ -1,20 +1,22 @@
 require 'tc'
 require 'pvn/app'
+require 'stringio'
 
 class TestPVNCli < PVN::TestCase
   def setup
-    PVN::App::Runner.execute @stdout_io = StringIO.new, Array.new
-    @stdout_io.rewind
-    @stdout = @stdout_io.read
+    stdout_io = StringIO.new
+    # PVN::App::Runner.new stdout_io, Array.new
+    # stdout_io.rewind
+    @stdout = stdout_io.string
   end
   
-  def test_print_default_output
+  def xxx_test_print_default_output
     # assert_match(/To update this executable/, @stdout)
   end
   
   def xxx_test_help
     io = StringIO.new
-    PVN::App::Runner.execute io, %w{ --help }
+    PVN::App::Runner.new io, %w{ --help }
     io.rewind
     io = io.read
     # assert_match(/To update this executable/, io)

data/test/unit/pvn/diff/path_revision_test.rb

@@ -0,0 +1,45 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'pvn/diff/path_revision'
+
+module PVN::Diff
+  ### $$$ yes, a lot of this is the same as Path; there is overlap as Path
+  ### changes to a collection of PathRevisions
+  class PathRevisionTestCase < PVN::TestCase
+    def create_pathrev revision, action
+      PathRevision.new revision, action
+    end
+
+    def assert_pathrev_revision exprevision, revision
+      prev = create_pathrev revision, "added"
+      assert_equal exprevision, prev.revision
+    end
+
+    def assert_pathrev_action expaction, action
+      prev = create_pathrev "0", action
+      assert_equal expaction, prev.action
+    end
+
+    def test_init_revision_string
+      assert_pathrev_revision "0", "0"
+    end
+
+    def test_init_revision_integer
+      assert_pathrev_revision "0", 0
+    end
+
+    def test_init_action_long_string
+      assert_pathrev_action SVNx::Action.new(:added), "added"
+    end
+
+    def test_init_action_short_string
+      assert_pathrev_action SVNx::Action.new(:deleted), "D"
+    end
+
+    def test_init_action_symbol
+      assert_pathrev_action SVNx::Action.new(:modified), :modified
+    end
+  end
+end

data/test/unit/pvn/diff/path_test.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'pvn/diff/path'
+
+module PVN::Diff
+  class PathTestCase < PVN::TestCase
+    def create_path name, revision, action, url
+      Path.new name, revision, action, url
+    end
+
+    def assert_path_name expname, name
+      logpath = create_path name, "0", "added", "file:///var/svn/repo"
+      assert_equal expname, logpath.name
+    end
+
+    def assert_path_url expurl, url
+      logpath = create_path "File.txt", "0", "deleted", url
+      assert_equal expurl, logpath.url
+    end
+
+    def test_init_name
+      assert_path_name "File.txt", "File.txt"
+    end
+
+    def test_init_url
+      assert_path_url "file:///var/svn/repo", "file:///var/svn/repo"
+    end
+
+    def test_add_revision
+      path = create_path "File.txt", "0", :added, "file:///var/svn/repo"
+      assert_equal 1, path.path_revisions.size
+      path.add_revision "1", :modified
+      assert_equal 2, path.path_revisions.size
+    end
+  end
+end

data/test/unit/pvn/diff/revision_test.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'pvn/diff/revision'
+
+module PVN::Diff
+  class RevisionTestCase < PVN::TestCase
+    def to_message change, revision
+      "change: #{change}; revision: #{revision}"
+    end   
+
+    def assert_revision_to_s expstr, change, revision
+      rev = RevisionRange.new change, revision
+      assert_equal expstr, rev.to_s, "change: #{change}; revision: #{revision}"
+    end   
+
+    def assert_revision_gt exp, chgx, revx, chgy, revy
+      x = RevisionRange.new chgx, revx
+      y = RevisionRange.new chgx, revy
+      msg = "x: #{to_message(chgx, revx)}; y: #{to_message(chgy, revy)}"
+      info "x: #{x}".cyan
+      info "y: #{y}".cyan
+      assert_equal exp, x > y, msg
+    end
+   
+    def test_change_str
+      assert_revision_to_s '14:15', '15', nil
+    end
+
+    def test_revision_str
+      assert_revision_to_s '14:15', nil, [ '14', '15' ]
+    end
+  end
+end

data/test/unit/pvn/io/element/log/log_test.rb

@@ -26,11 +26,11 @@ module PVN::IO::IOElement
     end
     
     def test_options_none
-      assert_log_command 163, Resources::WIQTR_PATH
+      assert_log_command 163, Resources::PT_PATH
     end
     
     def test_option_limit
-      assert_log_command 15, Resources::WIQTR_PATH, :limit => 15
+      assert_log_command 15, Resources::PT_PATH, :limit => 15
     end
   end
 end

data/test/unit/pvn/log/formatter/entry_formatter_test.rb

@@ -6,13 +6,11 @@ require 'svnx/log/entries'
 require 'pvn/io/element'
 require 'pvn/log/formatter/entry_formatter'
 
-require 'resources'
-
 module PVN; module Log; end; end
 
 module PVN::Log
   class EntryFormatTestCase < PVN::TestCase
-    TEST_LINES = Resources::WIQTR_LOG_L_15_V.readlines
+    TEST_LINES = Resources::PT_LOG_R19_1_V.readlines
     ENTRIES = SVNx::Log::Entries.new :xmllines => TEST_LINES
 
     def show_all entries, from_head, from_tail
@@ -20,71 +18,84 @@ module PVN::Log
       puts ef.format
     end
 
-    def assert_format explines, entry, use_colors, idx, from_head, from_tail, total
+    def assert_format explines, use_colors, idx, from_head, from_tail
+      total = 15
+      entry = ENTRIES[idx]
       ef = EntryFormatter.new use_colors, entry, idx, from_head, from_tail, total
 
       fmtlines = ef.format
-      assert_equal explines, fmtlines
+      # assert_equal explines, fmtlines
+      (0 .. [ explines.length, fmtlines.length ].max).each do |lnum|
+        assert_equal explines[lnum], fmtlines[lnum], "line: #{lnum}"
+      end
     end
 
     def test_colors_from_head_not_from_tail_index_0
       entries = ENTRIES
       explines = [
-                  "\e[1m1950\e[0m      \e[1m-1\e[0m        \e[36m\e[1mjpace\e[0m\e[0m                    \e[35m\e[1m2011-12-05T12:41:52.385786Z\e[0m\e[0m",
+                  "\e[1m19\e[0m        \e[1m-1\e[0m        \e[36m\e[1mLili von Shtupp\e[0m\e[0m          \e[35m\e[1m2012-09-16T14:24:07.913759Z\e[0m\e[0m",
                   "",
-                  "\e[37mTesting.\e[0m",
+                  "\e[37m\e[0m",
                   "",
-                  "    \e[33m/trunk/buildNumber.properties\e[0m"
+                  "    \e[33m/SecondFile.txt\e[0m"
                  ]
-      assert_format explines, entries[0], true, 0, true, false, 15
+      assert_format explines, true, 0, true, false
     end
 
-    def test_colors_from_head_not_from_tail_index_4
+    def test_colors_from_head_not_from_tail_index_3
       entries = ENTRIES
       explines = [
-                  "\e[1m1950\e[0m      \e[1m-5\e[0m        \e[36m\e[1mjpace\e[0m\e[0m                    \e[35m\e[1m2011-12-05T12:41:52.385786Z\e[0m\e[0m",
+                  "\e[1m16\e[0m        \e[1m-4\e[0m        \e[36m\e[1mBuddy Bizarre\e[0m\e[0m            \e[35m\e[1m2012-09-16T14:07:30.329525Z\e[0m\e[0m",
                   "",
-                  "\e[37mTesting.\e[0m",
+                  "\e[37mCUT! What in the hell do you think you're doing here? This is a closed set.\e[0m",
                   "",
-                  "    \e[33m/trunk/buildNumber.properties\e[0m"
+                  "\e[1m    \e[32m/src/java\e[0m\e[0m",
+                  "    \e[32m/src/java/Alpha.java\e[0m",
+                  "    \e[32m/src/java/Bravo.java\e[0m"
                  ]
-      assert_format explines, entries[0], true, 4, true, false, 15
+      assert_format explines, true, 3, true, false
     end
 
-    def test_no_colors_from_head_from_tail_index_4
+    def test_no_colors_from_head_from_tail_index_3
       entries = ENTRIES
       explines = [
-                  "1950      -5   +10  jpace                    2011-12-05T12:41:52.385786Z",
+                  "16        -4   +11  Buddy Bizarre            2012-09-16T14:07:30.329525Z",
                   "",
-                  "Testing.",
+                  "CUT! What in the hell do you think you're doing here? This is a closed set.",
                   "",
-                  "    /trunk/buildNumber.properties"
+                  "    /src/java",
+                  "    /src/java/Alpha.java",
+                  "    /src/java/Bravo.java"
                  ]
-      assert_format explines, entries[0], false, 4, true, true, 15
+      assert_format explines, false, 3, true, true
     end
 
-    def test_colors_from_head_from_tail_index_4
+    def test_colors_from_head_from_tail_index_3
       entries = ENTRIES
       explines = [
-                  "\e[1m1950\e[0m      \e[1m-5\e[0m   \e[1m+10\e[0m  \e[36m\e[1mjpace\e[0m\e[0m                    \e[35m\e[1m2011-12-05T12:41:52.385786Z\e[0m\e[0m",
+                  "\e[1m16\e[0m        \e[1m-4\e[0m   \e[1m+11\e[0m  \e[36m\e[1mBuddy Bizarre\e[0m\e[0m            \e[35m\e[1m2012-09-16T14:07:30.329525Z\e[0m\e[0m",
                   "",
-                  "\e[37mTesting.\e[0m",
+                  "\e[37mCUT! What in the hell do you think you're doing here? This is a closed set.\e[0m",
                   "",
-                  "    \e[33m/trunk/buildNumber.properties\e[0m"
+                  "\e[1m    \e[32m/src/java\e[0m\e[0m",
+                  "    \e[32m/src/java/Alpha.java\e[0m",
+                  "    \e[32m/src/java/Bravo.java\e[0m"
                  ]
-      assert_format explines, entries[0], true, 4, true, true, 15
+      assert_format explines, true, 3, true, true
     end
 
-    def test_no_colors_from_head_not_from_tail_index_4
+    def test_no_colors_from_head_not_from_tail_index_3
       entries = ENTRIES
       explines = [
-                  "1950      -5        jpace                    2011-12-05T12:41:52.385786Z",
+                  "16        -4        Buddy Bizarre            2012-09-16T14:07:30.329525Z",
                   "",
-                  "Testing.",
+                  "CUT! What in the hell do you think you're doing here? This is a closed set.",
                   "",
-                  "    /trunk/buildNumber.properties"
+                  "    /src/java",
+                  "    /src/java/Alpha.java",
+                  "    /src/java/Bravo.java"
                  ]
-      assert_format explines, entries[0], false, 4, true, false, 15
+      assert_format explines, false, 3, true, false
     end
   end
 end

data/test/unit/pvn/{subcommands/log → log}/options_test.rb

@@ -2,7 +2,7 @@
 # -*- ruby -*-
 
 require 'tc'
-require 'pvn/subcommands/log/options'
+require 'pvn/log/options'
 require 'resources'
 
 module PVN; module App; module Log; end; end; end
@@ -10,7 +10,7 @@ module PVN; module App; module Log; end; end; end
 module PVN::App::Log
   class OptionsTest < PVN::TestCase
     def assert_options exp, args
-      options = PVN::Subcommands::Log::OptionSet.new 
+      options = PVN::Log::OptionSet.new 
       options.process args
 
       assert_equal exp[:limit], options.limit
@@ -24,8 +24,8 @@ module PVN::App::Log
       expdata = Hash.new
       expdata[:limit] = nil
       expdata[:revision] = rev
-      expdata[:path] = Resources::WIQTR_PATH
-      assert_options expdata, [ arg, Resources::WIQTR_PATH ].flatten
+      expdata[:path] = Resources::PT_PATH
+      assert_options expdata, [ arg, Resources::PT_PATH ].flatten
     end
 
     def test_default

data/test/unit/pvn/revision/argument_test.rb

@@ -0,0 +1,157 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'svnx/log/entries'
+require 'pvn/revision/argument'
+
+require 'resources'
+
+module PVN::Revision
+  class ArgumentTestCase < PVN::TestCase
+    def setup
+      # This is the equivalent of "log" at revision 22, when this file was added
+      # at revision 13. Using this instead of just "log" when regenerating the
+      # resource files keeps the revisions from bouncing around.
+      @xmllines = Resources::PT_LOG_R22_13_SECONDFILE_TXT.readlines
+    end
+
+    def create_argument value
+      Argument.new value, @xmllines
+    end
+
+    def assert_argument_value exp_value, value
+      arg = create_argument value
+      assert_equal exp_value, arg.value
+    end
+
+    def assert_argument_value_raises value
+      assert_raises(PVN::Revision::RevisionError) do 
+        assert_argument_value nil, value
+      end
+    end
+
+    def assert_argument_to_s exp_str, value
+      arg = create_argument value
+      assert_equal exp_str, arg.to_s
+    end      
+
+    def assert_compare op, exp, xval, yval
+      x = create_argument xval
+      y = create_argument yval
+      msg = "xval: #{xval}; yval: #{yval}"
+      assert_equal exp, x.send(op, y), msg
+    end
+
+    def assert_argument_eq expeq, xval, yval
+      # it's the emoticon programming language
+      assert_compare :==, expeq, xval, yval
+    end
+
+    def assert_argument_gt expeq, xval, yval
+      assert_compare :>, expeq, xval, yval
+    end
+
+    def test_absolute_midrange
+      assert_argument_value 19, 19
+    end
+
+    def test_absolute_most_recent
+      assert_argument_value 22, 22
+    end
+
+    def test_absolute_least_recent
+      assert_argument_value 13, 13
+    end
+
+    def test_absolute_midrange_as_string
+      assert_argument_value 19, '19'
+    end
+
+    def test_absolute_most_recent_as_string
+      assert_argument_value 22, '22'
+    end
+
+    def test_absolute_least_recent_as_string
+      assert_argument_value 13, '13'
+    end
+
+    def test_svn_word
+      %w{ HEAD BASE COMMITTED PREV }.each do |word|
+        assert_argument_value word, word
+      end
+    end
+
+    def test_negative_most_recent
+      assert_argument_value 22, -1
+    end
+
+    def test_negative_second_most_recent
+      assert_argument_value 20, -2
+    end
+
+    def test_negative_least_recent
+      assert_argument_value 13, -5
+    end
+
+    def test_negative_too_far_back
+      assert_argument_value_raises(-6)
+    end
+
+    def test_negative_most_recent_as_string
+      assert_argument_value 22, '-1'
+    end
+
+    def test_negative_second_most_recent_as_string
+      assert_argument_value 20, '-2'
+    end
+
+    def test_negative_least_recent_as_string
+      assert_argument_value 13, '-5'
+    end
+
+    def test_negative_too_far_back_as_string
+      assert_argument_value_raises '-6'
+    end
+
+    def test_positive_most_recent
+      assert_argument_value 22, '+5'
+    end
+
+    def test_positive_second_most_recent
+      assert_argument_value 20, '+4'
+    end
+
+    def test_positive_least_recent
+      assert_argument_value 13, '+1'
+    end
+
+    def test_positive_too_far_forward
+      assert_argument_value_raises '+6'
+    end
+
+    def xxxtest_range_svn_word_to_number
+      assert_argument_value 'BASE:1', 'BASE:1'
+    end
+
+    def xxxtest_date
+      assert_argument_to_s '1967-12-10', '1967-12-10'
+    end
+
+    def test_to_s
+      assert_argument_to_s '5', '5'
+      assert_argument_to_s 'HEAD', 'HEAD'
+    end
+
+    def test_eq
+      assert_argument_eq true, '5', '5'
+      assert_argument_eq false, '4', '5'
+      assert_argument_eq false, '5', '4'
+    end
+
+    def test_gt
+      assert_argument_gt true, '17', '16'
+      assert_argument_gt false, '13', '14'
+    end
+  end
+end

data/test/unit/pvn/{subcommands/revision → revision}/multiple_revisions_option_test.rb

@@ -1,9 +1,8 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'tc'
-require 'pvn/subcommands/revision/multiple_revisions_option'
-require 'pvn/subcommands/revision/tc'
+require 'pvn/revision/tc'
+require 'pvn/revision/multiple_revisions_option'
 
 module PVN
   class MockMultipleRevisionsRegexpOption < MultipleRevisionsRegexpOption
@@ -22,19 +21,19 @@ module PVN
     end
 
     def test_out_of_range
-      assert_revision_option_raises '-164'
+      assert_revision_option_raises '-20'
     end
 
     def test_post_process_single_middling
-      assert_post_process [ '1887' ], [ '-7' ]
+      assert_post_process [ '13' ], [ '-7' ]
     end
 
     def test_post_process_single_latest
-      assert_post_process [ '1950' ], '-1'
+      assert_post_process [ '19' ], '-1'
     end
 
     def test_post_process_single_oldest
-      assert_post_process [ '412' ], '-163'
+      assert_post_process [ '1' ], '-19'
     end
 
     def test_post_process_single_tagval_unconverted
@@ -42,19 +41,19 @@ module PVN
     end
 
     def test_post_process_single_tagrange_unconverted
-      assert_post_process [ '7:177' ], '-r7:177'
+      assert_post_process [ '7:17' ], '-r7:17'
     end
 
     def test_post_process_multiple_middling
-      assert_post_process [ '1887', '1950' ], [ '-7', '-1' ]
+      assert_post_process [ '13', '19' ], [ '-7', '-1' ]
     end
 
     def test_post_process_multiple_relative_tagval_unconverted
-      assert_post_process [ '1944', '7' ], [ '-5', '-r7' ]
+      assert_post_process [ '15', '7' ], [ '-5', '-r7' ]
     end
 
     def test_process_tag_value
-      assert_process %w{ 317 }, %w{ -r 317 }
+      assert_process %w{ 17 }, %w{ -r 17 }
     end
   end
 end

data/test/unit/pvn/revision/range_test.rb

@@ -0,0 +1,26 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'svnx/log/entries'
+require 'pvn/revision/range'
+
+require 'resources'
+
+module PVN::Revision
+  class RangeTestCase < PVN::TestCase
+    def test_init
+      rr = Range.new '143:199'
+      assert_equal '143', rr.from.to_s
+      assert_equal '199', rr.to.to_s
+      assert_equal '143:199', rr.to_s
+    end
+
+    def test_to_working_copy
+      rr = Range.new '143'
+      assert_equal '143', rr.from.to_s
+      assert_nil rr.to
+      assert_equal '143', rr.to_s
+    end
+  end
+end

data/test/unit/pvn/{subcommands/revision → revision}/revision_option_test.rb

@@ -1,10 +1,8 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'tc'
-require 'pvn/subcommands/revision/revision_option'
-require 'pvn/subcommands/revision/tc'
-require 'resources'
+require 'pvn/revision/tc'
+require 'pvn/revision/revision_option'
 
 module PVN
   class MockRevisionOption < RevisionOption
@@ -20,45 +18,42 @@ module PVN
       opt.set_value val
     end
 
-    def assert_relative_to_absolute exp, val
+    def assert_relative_to_absolute exp, val, path = Resources::PT_PATH
       ropt = MockRevisionOption.new
-      act = ropt.relative_to_absolute val, Resources::WIQTR_PATH
-      info "act: #{act}".cyan
-      assert_equal exp, act, "val: #{val}; path: #{val}"
+      act = ropt.relative_to_absolute val, path
+      assert_equal exp, act, "val: #{val}; path: #{path}"
     end
 
     def test_relative_to_absolute_middling
-      assert_relative_to_absolute '1887', '-7'
+      assert_relative_to_absolute '13', '-7'
     end
 
     def test_relative_to_absolute_latest
-      assert_relative_to_absolute '1950', '-1'
+      assert_relative_to_absolute '19', '-1'
     end
 
     def test_relative_to_absolute_oldest
-      assert_relative_to_absolute '412', '-163'
+      assert_relative_to_absolute '1', '-19'
     end
 
     def test_out_of_range
-      assert_raises(PVN::Revision::RevisionError) do 
-        assert_relative_to_absolute '1944', '-164'
-      end
+      assert_revision_option_raises '-20'
     end
 
     def test_post_process_absolute_middling
-      assert_post_process '1887', '1887'
+      assert_post_process '13', '13'
     end
 
     def test_post_process_middling
-      assert_post_process '1887', '-7'
+      assert_post_process '13', '-7'
     end
 
     def test_post_process_latest
-      assert_post_process '1950', '-1'
+      assert_post_process '19', '-1'
     end
 
     def test_post_process_oldest
-      assert_post_process '412', '-163'
+      assert_post_process '1', '-19'
     end
   end
 end