pvn 0.0.7 → 0.0.8

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

@@ -1,10 +1,8 @@
 #!/usr/bin/ruby -w
 # -*- ruby -*-
 
-require 'tc'
-require 'pvn/subcommands/revision/revision_regexp_option'
-require 'pvn/subcommands/revision/tc'
-require 'resources'
+require 'pvn/revision/tc'
+require 'pvn/revision/revision_regexp_option'
 
 module PVN
   class MockRevisionRegexpOption < RevisionRegexpOption
@@ -41,19 +39,19 @@ module PVN
     end
     
     def test_out_of_range
-      assert_revision_option_raises '-164'
+      assert_revision_option_raises '-20'
     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
 
     def test_post_process_tagval
@@ -61,11 +59,11 @@ module PVN
     end
 
     def test_post_process_tagrange
-      assert_post_process '7:177', '-r7:177'
+      assert_post_process '7:17', '-r7:17'
     end
 
     def test_post_process_absolute_middling
-      assert_post_process '1887', '1887'
+      assert_post_process '11', '11'
     end
   end
 end

data/test/unit/svnx/action_test.rb

@@ -0,0 +1,67 @@
+#!/usr/bin/ruby -w
+# -*- ruby -*-
+
+require 'tc'
+require 'svnx/action'
+
+module SVNx
+  class ActionTestCase < PVN::TestCase
+    include Loggable
+
+    def assert_action_added exp, str
+      action = Action.new str
+      assert_equal exp, action.added?
+    end
+
+    def assert_action_deleted exp, str
+      action = Action.new str
+      assert_equal exp, action.deleted?
+    end
+
+    def assert_action_modified exp, str
+      action = Action.new str
+      assert_equal exp, action.modified?
+    end
+
+    def assert_action_unversioned exp, str
+      action = Action.new str
+      assert_equal exp, action.unversioned?
+    end
+    
+    def test_added
+      [ 'added', 'A' ].each do |str|
+        assert_action_added       true,  str
+        assert_action_deleted     false, str
+        assert_action_modified    false, str
+        assert_action_unversioned false, str
+      end
+    end
+    
+    def test_deleted
+      [ 'deleted', 'D' ].each do |str|
+        assert_action_added       false, str
+        assert_action_deleted     true,  str
+        assert_action_modified    false, str
+        assert_action_unversioned false, str
+      end
+    end
+    
+    def test_modified
+      [ 'modified', 'M' ].each do |str|
+        assert_action_added       false, str
+        assert_action_deleted     false,  str
+        assert_action_modified    true,  str
+        assert_action_unversioned false, str
+      end
+    end    
+    
+    def test_unversioned
+      [ 'unversioned', '?' ].each do |str|
+        assert_action_added       false, str
+        assert_action_deleted     false, str
+        assert_action_modified    false, str
+        assert_action_unversioned true, str
+      end
+    end
+  end
+end

data/test/unit/svnx/info/entries_test.rb

@@ -5,18 +5,18 @@ require 'svnx/info/tc'
 require 'svnx/info/entries'
 
 module SVNx::Info
-  class EntriesTestCase < SVNx::Info::TestCase
-    
-    def test_create_from_xml
-      entries = Entries.new :xmllines => Resources::WIQTR_INFO_POM_XML_ADDED_FILE_TXT.readlines
-      info "entries: #{entries}"
-
-      assert_equal 2, entries.size
+  class EntriesTestCase < SVNx::Info::TestCase    
+    def assert_info_entry_equals entry, path, kind, revision
+      assert_entry_equals entry, :path => path, :kind => 'file', :url => EXPROOT + '/' + path, :root => EXPROOT, :revision => revision
+    end
 
-      exproot = 'file:///home/jpace/Programs/Subversion/Repositories/wiquery'
+    def test_create_from_xml
+      entries = Entries.new :xmllines => Resources::PTP_INFO_SIXTH_TXT_DOG_RB_FIRST_TXT.readlines
+      assert_equal 3, entries.size
 
-      assert_entry_equals entries[0], :path => 'pom.xml',   :kind => 'file', :url => exproot + '/trunk/pom.xml',   :root => exproot, :revision => '1950'
-      assert_entry_equals entries[1], :path => 'AddedFile.txt', :kind => 'file', :url => exproot + '/trunk/AddedFile.txt', :root => exproot, :revision => '0'
+      assert_info_entry_equals entries[0], 'dirzero/SixthFile.txt', 'file', '22'
+      assert_info_entry_equals entries[1], 'src/ruby/dog.rb',       'file', '0'
+      assert_info_entry_equals entries[2], 'FirstFile.txt',         'file', '22'
     end
   end
 end

data/test/unit/svnx/info/entry_test.rb

@@ -7,19 +7,16 @@ require 'svnx/info/entry'
 module SVNx::Info
   class EntryTestCase < SVNx::Info::TestCase
     include Loggable
+    
+    def assert_info_entry_equals entry, path, kind, revision
+      assert_entry_equals entry, :path => path, :kind => 'file', :url => EXPROOT + '/' + path, :root => EXPROOT, :revision => revision
+    end
+
     def test_entry_from_xml
-      xmllines = Resources::WIQTR_INFO_WIQUERY_CORE_POM_XML.readlines
-      
-      expdata = {
-        :url  => 'file:///home/jpace/Programs/Subversion/Repositories/wiquery/trunk/wiquery-core/pom.xml',
-        :kind => 'file',
-        :path => 'wiquery-core/pom.xml',
-        :root => 'file:///home/jpace/Programs/Subversion/Repositories/wiquery',
-        :revision => '1950'
-      }
+      xmllines = Resources::PTP_INFO_SIXTH_TXT.readlines
 
       entry = Entry.new :xmllines => xmllines
-      assert_entry_equals entry, expdata
+      assert_info_entry_equals entry, 'dirzero/SixthFile.txt', 'file', '22'
     end
   end
 end

data/test/unit/svnx/log/entries_test.rb

@@ -14,72 +14,74 @@ module SVNx::Log
       assert entry.author
     end
 
-    def assert_log_entry_1947 entry
-      expdata = '1947', 'reiern70', '2011-11-14T12:24:45.757124Z', 'added a convenience method to set the range'
+    def assert_log_entry_16 entry
+      expdata = '16', 'Buddy Bizarre', '2012-09-16T14:07:30.329525Z', 'CUT! What in the hell do you think you\'re doing here? This is a closed set.'
+      expdata << { :kind => 'dir', 
+        :action => 'A', 
+        :name => '/src/java'
+      }
+      expdata << { :kind => 'file', 
+        :action => 'A', 
+        :name => '/src/java/Alpha.java'
+      }
       expdata << { :kind => 'file', 
-        :action => 'M', 
-        :name => '/trunk/wiquery-jquery-ui/src/test/java/org/odlabs/wiquery/ui/slider/SliderTestCase.java'
+        :action => 'A', 
+        :name => '/src/java/Bravo.java'
       }
       
       assert_log_entry_equals entry, expdata
     end
     
     def test_create_from_xml
-      entries = Entries.new :xmllines => get_test_lines_limit_15
-      assert_log_entry_1947 entries[2]
+      # entries = Entries.new :xmllines => Resources::PT_LOG_L_15.readlines this
+      # is the equivalent of being at revision 19 (when this was written) and
+      # doing "svn log -r19:5"
+      entries = Entries.new :xmllines => Resources::PT_LOG_R19_5.readlines
+      assert_log_entry_16 entries[3]
     end
     
-    def test_no_author_field
-      entries = Entries.new :xmllines => get_test_lines_no_author
-      nentries = entries.size
-
-      # revision 1 has no author ... wtf?
-      assert_entry_fields_not_nil entries[0]
-    end
-
     def test_empty_message_element
-      entries = Entries.new :xmllines => get_test_lines_empty_message
+      entries = Entries.new :xmllines => Resources::PT_LOG_R19.readlines
       nentries = entries.size
-
+      
       # empty message here:
       assert_entry_fields_not_nil entries[0]
     end
 
     def test_create_on_demand
       # although entries now supports xmllines as an Array, we need the size for the assertion:
-      xmllines = get_test_lines_no_limit.join ''
+      xmllines = Resources::PT_LOG_R19_5.readlines
       
-      # quite a big file ...
-      assert_equal 324827, xmllines.size
+      assert_equal 101, xmllines.size
 
       entries = Entries.new :xmllines => xmllines
 
       nentries = entries.size
-      assert_equal 1949, nentries
+      assert_equal 15, nentries
 
       # the power of Ruby, effortlessly getting instance variables ...
 
       real_entries = entries.instance_eval '@entries'
 
       # nothing processed yet ...
-      assert_nil real_entries[16]
-      assert_nil real_entries[17]
-      assert_nil real_entries[18]
+      assert_nil real_entries[12]
+      assert_nil real_entries[13]
+      assert_nil real_entries[14]
 
-      assert_entry_fields_not_nil entries[17]
+      assert_entry_fields_not_nil entries[13]
 
       # and these still aren't processed:
-      assert_nil real_entries[16]
-      assert_nil real_entries[18]
+      assert_nil real_entries[12]
+      assert_nil real_entries[14]
     end
 
     def test_each
       idx = 0
 
-      entries = Entries.new :xmllines => get_test_lines_limit_15
+      entries = Entries.new :xmllines => Resources::PT_LOG_R19_5.readlines
       entries.each do |entry|
-        if idx == 2
-          assert_log_entry_1947 entry
+        if idx == 3
+          assert_log_entry_16 entry
         end
         idx += 1
       end

data/test/unit/svnx/log/entry_test.rb

@@ -9,13 +9,9 @@ module SVNx::Log
     include Loggable
     
     def test_entry_from_xml
-      expdata = '1947', 'reiern70', '2011-11-14T12:24:45.757124Z', 'added a convenience method to set the range'
-      expdata << { :kind => 'file', :action => 'M', :name => '/trunk/wiquery-jquery-ui/src/test/java/org/odlabs/wiquery/ui/slider/SliderTestCase.java' }
-
-      doc = REXML::Document.new get_test_lines_limit_15.join('')
-
-      entry = Entry.new :xmlelement => doc.elements[1].elements[3]        
-      assert_log_entry_equals entry, expdata
+      doc = REXML::Document.new Resources::PT_LOG_R19_5.readlines.join('')
+      entry = Entry.new :xmlelement => doc.elements[1].elements[4]
+      assert_log_entry_16 entry
     end
   end
 end

data/test/unit/svnx/status/entries_test.rb

@@ -8,13 +8,14 @@ module SVNx::Status
   class EntriesTestCase < SVNx::Status::TestCase
     
     def test_create_from_xml
-      entries = Entries.new :xmllines => get_test_lines_all
+      entries = Entries.new :xmllines => Resources::PTP_STATUS.readlines
 
-      assert_equal 4, entries.size
-      assert_status_entry_equals 'added',   'AddedFile.txt', entries[0]
-      assert_status_entry_equals 'deleted', 'LICENSE', entries[1]
-      assert_status_entry_equals 'modified', 'pom.xml', entries[2]
-      assert_status_entry_equals 'modified', 'wiquery-core/src/main/java/org/odlabs/wiquery/core/effects/EffectBehavior.java', entries[3]
+      assert_equal 5, entries.size
+      assert_status_entry_equals 'modified', 'FirstFile.txt', entries[0]
+      assert_status_entry_equals 'unversioned', 'src/java/Charlie.java', entries[1]
+      assert_status_entry_equals 'added', 'src/ruby/dog.rb', entries[2]
+      assert_status_entry_equals 'added', 'SeventhFile.txt', entries[3]
+      assert_status_entry_equals 'deleted', 'dirzero/SixthFile.txt', entries[4]
     end
   end
 end

data/test/unit/svnx/status/entry_test.rb

@@ -9,29 +9,8 @@ module SVNx::Status
     include Loggable
     
     def test_entry_from_xml
-      xml = Array.new
-      xml << "<?xml version=\"1.0\"?>\n"
-      xml << "<status>\n"
-      xml << "<target\n"
-      xml << "   path=\"LICENSE\">\n"
-      xml << "<entry\n"
-      xml << "   path=\"LICENSE\">\n"
-      xml << "<wc-status\n"
-      xml << "   props=\"none\"\n"
-      xml << "   item=\"deleted\"\n"
-      xml << "   revision=\"1950\">\n"
-      xml << "<commit\n"
-      xml << "   revision=\"412\">\n"
-      xml << "<author>lionel.armanet</author>\n"
-      xml << "<date>2010-09-17T21:23:25.763385Z</date>\n"
-      xml << "</commit>\n"
-      xml << "</wc-status>\n"
-      xml << "</entry>\n"
-      xml << "</target>\n"
-      xml << "</status>\n"
-
-      entry = Entry.new :xmllines => xml.join('')
-      assert_status_entry_equals 'deleted', 'LICENSE', entry
+      entry = Entry.new :xmllines => Resources::PTP_STATUS_DOG_RB.readlines
+      assert_status_entry_equals 'added', 'src/ruby/dog.rb', entry
     end
   end
 end

data/test/unit/system/command/cachefile_test.rb

@@ -0,0 +1,53 @@
+require 'tc'
+require 'system/command/tc'
+require 'system/command/caching'
+require 'zlib'
+
+module System
+  class CacheFileTestCase < CommandTestCase
+    include Loggable
+
+    CACHE_DIR = Pathname.new '/tmp/pvn/testing'
+
+    def test_creates_gzfile
+      cf = CacheFile.new CACHE_DIR, [ "ls", "/var/tmp" ]
+      cfpn = cf.instance_eval '@pn'
+      cfpn.unlink if cfpn.exist?
+      
+      lines = cf.readlines
+
+      cfpn = cf.instance_eval '@pn'
+      assert cfpn.exist?
+
+      Zlib::GzipReader.open(cfpn.to_s) do |gz|
+        fromgz = gz.readlines
+        assert_equal lines, fromgz
+      end
+    end
+
+    def test_reads_gzfile
+      cf = CacheFile.new CACHE_DIR, [ "ls", "-l", "/var/tmp" ]
+      cfpn = cf.instance_eval '@pn'
+      cfpn.unlink if cfpn.exist?
+      
+      lines = cf.readlines
+
+      cfpn = cf.instance_eval '@pn'
+      assert cfpn.exist?
+
+      # same as above
+      cf2 = CacheFile.new CACHE_DIR, [ "ls", "-l", "/var/tmp" ]
+      
+      def cf2.save_file
+        fail "should not have called save file for read"
+      end
+
+      lines2 = cf2.readlines
+
+      assert_equal lines2, lines
+
+      fromgz = read_gzfile cfpn
+      assert_equal lines, fromgz
+    end
+  end
+end

data/test/unit/system/command/caching_test.rb

@@ -1,24 +1,13 @@
 require 'tc'
 require 'system/command/caching'
+require 'system/command/tc'
 
 module System
-  class CachingCommandLineTestCase < PVN::TestCase
+  class CachingCommandLineTestCase < CommandTestCase
     include Loggable
 
-    CACHE_DIR = Pathname.new '/tmp/pvn/testing'
-
-    def setup
-      super
-      CACHE_DIR.rmtree if CACHE_DIR.exist?
-    end
-
-    def teardown
-      CACHE_DIR.rmtree if CACHE_DIR.exist?
-      super
-    end
-
     def create_ls_tmp
-      CachingCommandLine.new [ "ls", "/tmp" ]
+      CachingCommandLine.new [ "ls", "/bin" ]
     end
 
     def test_ctor_no_args
@@ -27,14 +16,14 @@ module System
     end
 
     def test_ctor_with_args
-      cl = CachingCommandLine.new [ "ls", "/tmp" ]
-      assert_equal "ls /tmp", cl.to_command
+      cl = CachingCommandLine.new [ "ls", "/bin" ]
+      assert_equal "ls /bin", cl.to_command
     end
 
     def test_lshift
       cl = CachingCommandLine.new [ "ls" ]
-      cl << "/tmp"
-      assert_equal "ls /tmp", cl.to_command
+      cl << "/bin"
+      assert_equal "ls /bin", cl.to_command
     end
 
     def test_cache_dir_defaults_to_executable
@@ -44,7 +33,7 @@ module System
 
     def test_cache_file_defaults_to_executable
       cl = create_ls_tmp
-      assert_equal '/tmp' + (Pathname.new($0).expand_path).to_s + '/ls-\/tmp', cl.cache_file.to_s
+      assert_equal '/tmp' + (Pathname.new($0).expand_path).to_s + '/ls-_slash_bin.gz', cl.cache_file.to_s
     end
 
     def test_cache_dir_set_cachefile
@@ -54,7 +43,7 @@ module System
       assert !CACHE_DIR.exist?
 
       cachefile = cl.cache_file
-      assert_equal CACHE_DIR.to_s + '/ls-\/tmp', cachefile.to_s
+      assert_equal CACHE_DIR.to_s + '/ls-_slash_bin.gz', cachefile.to_s
     end
 
     def test_cache_dir_created_on_execute
@@ -65,10 +54,11 @@ module System
 
       cl.execute
       assert CACHE_DIR.exist?
-      cachelines = IO.readlines cachefile.to_s
+      cachelines = read_gzfile cachefile
 
       syslines = nil
-      IO.popen("ls /tmp") do |io|
+      # we can't use /tmp, since this test will add to it:
+      IO.popen("ls /bin") do |io|
         syslines = io.readlines
       end
 
@@ -84,7 +74,8 @@ module System
 
       cl.execute
       assert CACHE_DIR.exist?
-      cachelines = IO.readlines cachefile.to_s
+
+      cachelines = read_gzfile cachefile
 
       syslines = nil
       IO.popen("ls #{dir}") do |io|