From aed08706e037eec0104c913577f7da83f9ba7aa4 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 15 Feb 2011 11:05:33 +0000
Subject: [PATCH] scm: bazaar: move cat and annotate test from unit app test to
 unit lib test.

Bazaar supports revision number and do not need to read database.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4836 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 .../scm/adapters/bazaar_adapter_test.rb       | 13 +++++++++++++
 test/unit/repository_bazaar_test.rb           | 19 +++----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb b/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
index 6be6b9635..7945e9bc2 100644
--- a/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
+++ b/test/unit/lib/redmine/scm/adapters/bazaar_adapter_test.rb
@@ -21,6 +21,19 @@ begin
         end
       end
 
+      def test_cat
+        cat = @adapter.cat('directory/document.txt')
+        assert cat =~ /Write the contents of a file as of a given revision to standard output/
+      end
+    
+      def test_annotate
+        annotate = @adapter.annotate('doc-mkdir.txt')
+        assert_equal 17, annotate.lines.size
+        assert_equal '1', annotate.revisions[0].identifier
+        assert_equal 'jsmith@', annotate.revisions[0].author
+        assert_equal 'mkdir', annotate.lines[0]
+      end
+
       private
 
       def test_scm_version_for(scm_command_version, version)
diff --git a/test/unit/repository_bazaar_test.rb b/test/unit/repository_bazaar_test.rb
index 5cd7da13c..55d3b8a29 100644
--- a/test/unit/repository_bazaar_test.rb
+++ b/test/unit/repository_bazaar_test.rb
@@ -28,7 +28,7 @@ class RepositoryBazaarTest < ActiveSupport::TestCase
     @project = Project.find(1)
     assert @repository = Repository::Bazaar.create(:project => @project, :url => "file:///#{REPOSITORY_PATH}")
   end
-  
+
   if File.directory?(REPOSITORY_PATH)  
     def test_fetch_changesets_from_scratch
       @repository.fetch_changesets
@@ -38,7 +38,7 @@ class RepositoryBazaarTest < ActiveSupport::TestCase
       assert_equal 9, @repository.changes.count
       assert_equal 'Initial import', @repository.changesets.find_by_revision('1').comments
     end
-    
+
     def test_fetch_changesets_incremental
       @repository.fetch_changesets
       # Remove changesets with revision > 5
@@ -49,7 +49,7 @@ class RepositoryBazaarTest < ActiveSupport::TestCase
       @repository.fetch_changesets
       assert_equal 4, @repository.changesets.count
     end
-    
+
     def test_entries
       entries = @repository.entries
       assert_equal 2, entries.size
@@ -68,19 +68,6 @@ class RepositoryBazaarTest < ActiveSupport::TestCase
       assert_equal 'file', entries.last.kind
       assert_equal 'edit.png', entries.last.name
     end
-    
-    def test_cat
-      cat = @repository.scm.cat('directory/document.txt')
-      assert cat =~ /Write the contents of a file as of a given revision to standard output/
-    end
-    
-    def test_annotate
-      annotate = @repository.scm.annotate('doc-mkdir.txt')
-      assert_equal 17, annotate.lines.size
-      assert_equal '1', annotate.revisions[0].identifier
-      assert_equal 'jsmith@', annotate.revisions[0].author
-      assert_equal 'mkdir', annotate.lines[0]
-    end
   else
     puts "Bazaar test repository NOT FOUND. Skipping unit tests !!!"
     def test_fake; assert true end