Skip to content

Commit 7dde1c7

Browse files
perlunperlun
committed
Whitespace fixes.
1 parent 37b38b5 commit 7dde1c7

File tree

3 files changed

+39
-41
lines changed

3 files changed

+39
-41
lines changed

‎tests/units/test_archive.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
require File.dirname(__FILE__) + '/../test_helper'
44

55
class TestArchive < Test::Unit::TestCase
6-
6+
77
def setup
88
set_file_paths
99
@git = Git.open(@wdir)
1010
end
11-
11+
1212
def tempfile
1313
Tempfile.new('archive-test').path
1414
end
15-
15+
1616
def test_archive
1717
f = @git.archive('v2.6', tempfile)
1818
assert(File.exist?(f))
@@ -22,7 +22,7 @@ def test_archive
2222

2323
f = @git.object('v2.6').archive # returns path to temp file
2424
assert(File.exist?(f))
25-
25+
2626
f = @git.object('v2.6').archive(nil, :format => 'tar') # returns path to temp file
2727
assert(File.exist?(f))
2828

@@ -35,7 +35,7 @@ def test_archive
3535

3636
f = @git.object('v2.6').archive(tempfile, :format => 'tgz', :prefix => 'test/')
3737
assert(File.exist?(f))
38-
38+
3939
f = @git.object('v2.6').archive(tempfile, :format => 'tar', :prefix => 'test/', :path => 'ex_dir/')
4040
assert(File.exist?(f))
4141

@@ -51,5 +51,5 @@ def test_archive
5151
end
5252
end
5353
end
54-
55-
end
54+
55+
end

‎tests/units/test_bare.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@
33
require File.dirname(__FILE__) + '/../test_helper'
44

55
class TestBare < Test::Unit::TestCase
6-
6+
77
def setup
88
set_file_paths
99
@git = Git.bare(@wbare)
1010
end
11-
11+
1212
def test_commit
1313
o = @git.object('1cc8667014381')
1414
assert(o.is_a?(Git::Object::Commit))
15-
15+
1616
assert_equal('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', o.gtree.to_s)
1717
assert_equal('546bec6f8872efa41d5d97a369f669165ecda0de', o.parent.sha)
1818
assert_equal(1, o.parents.size)
@@ -24,18 +24,18 @@ def test_commit
2424
assert_equal('11-08-07', o.committer_date.getutc.strftime("%m-%d-%y"))
2525
assert_equal('11-08-07', o.date.getutc.strftime("%m-%d-%y"))
2626
assert_equal('test', o.message)
27-
27+
2828
assert_equal('tags/v2.5', o.parent.name)
2929
assert_equal('master', o.parent.parent.name)
3030
assert_equal('master~1', o.parent.parent.parent.name)
3131

3232
o = @git.object('HEAD')
3333
assert(o.is_a?(Git::Object::Commit))
3434
assert(o.commit?)
35-
35+
3636
o = @git.object('test_object')
3737
assert(o.is_a?(Git::Object::Commit))
3838
assert(o.commit?)
3939
end
40-
41-
end
40+
41+
end

‎tests/units/test_object.rb

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ class TestObject < Test::Unit::TestCase
66
def setup
77
set_file_paths
88
@git = Git.open(@wdir)
9-
9+
1010
@commit = @git.gcommit('1cc8667014381')
1111
@tree = @git.gtree('1cc8667014381^{tree}')
1212
@blob = @git.gblob('v2.5:example.txt')
@@ -18,13 +18,13 @@ def test_sha_state
1818
o.date
1919
assert_equal(original_sha, o.sha)
2020
end
21-
21+
2222
def test_commit
2323
o = @git.gcommit('1cc8667014381')
2424
assert(o.is_a?(Git::Object::Commit))
2525
assert(o.commit?)
2626
assert(!o.tag?)
27-
27+
2828
assert_equal('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', o.gtree.to_s)
2929
assert_equal('546bec6f8872efa41d5d97a369f669165ecda0de', o.parent.sha)
3030
assert_equal(1, o.parents.size)
@@ -36,95 +36,95 @@ def test_commit
3636
assert_equal('11-08-07', o.committer_date.getutc.strftime("%m-%d-%y"))
3737
assert_equal('11-08-07', o.date.getutc.strftime("%m-%d-%y"))
3838
assert_equal('test', o.message)
39-
39+
4040
assert_equal('tags/v2.5', o.parent.name)
41-
assert_equal('master', o.parent.parent.name)
42-
assert_equal('master~1', o.parent.parent.parent.name)
43-
41+
assert_equal('tags/v2.5~1', o.parent.parent.name)
42+
assert_equal('tags/v2.5~2', o.parent.parent.parent.name)
43+
4444
o = @git.gcommit('HEAD')
4545
assert(o.is_a?(Git::Object::Commit))
4646
assert(o.commit?)
47-
47+
4848
o = @git.gcommit('test_object')
4949
assert(o.is_a?(Git::Object::Commit))
5050
assert(o.commit?)
5151
end
52-
52+
5353
def test_commit_contents
5454
o = @git.gcommit('1cc8667014381')
5555
assert_equal('tree 94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', o.contents_array[0])
5656
assert_equal('parent 546bec6f8872efa41d5d97a369f669165ecda0de', o.contents_array[1])
5757
end
58-
58+
5959
def test_object_to_s
6060
assert_equal('1cc8667014381e2788a94777532a788307f38d26', @commit.sha)
6161
assert_equal('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7', @tree.sha)
6262
assert_equal('ba492c62b6227d7f3507b4dcc6e6d5f13790eabf', @blob.sha)
6363
end
64-
64+
6565
def test_object_size
6666
assert_equal(265, @commit.size)
6767
assert_equal(72, @tree.size)
6868
assert_equal(128, @blob.size)
6969
end
70-
70+
7171
def test_tree
7272
o = @git.gtree('1cc8667014381^{tree}')
7373
assert(o.is_a?(Git::Object::Tree))
7474
assert(o.tree?)
75-
75+
7676
o = @git.gtree('v2.7^{tree}')
77-
77+
7878
assert_equal(2, o.children.size)
7979
assert_equal(1, o.blobs.size)
8080
assert_equal(1, o.subtrees.size)
8181
assert_equal(1, o.trees['ex_dir'].blobs.size)
8282

8383
assert_equal(2, o.full_tree.size)
8484
assert_equal("100644 blob e69de29bb2d1d6434b8b29ae775ad8c2e48c5391\tex_dir/ex.txt", o.full_tree.first)
85-
85+
8686
assert_equal(2, o.depth)
87-
87+
8888
o = @git.gtree('94c827875e2cadb8bc8d4cdd900f19aa9e8634c7')
8989
assert(o.is_a?(Git::Object::Tree))
9090
assert(o.tree?)
9191
end
92-
92+
9393
def test_tree_contents
9494
o = @git.gtree('1cc8667014381^{tree}')
9595
assert_equal('040000 tree 6b790ddc5eab30f18cabdd0513e8f8dac0d2d3ed ex_dir', o.contents_array.first)
9696
end
97-
97+
9898
def test_blob
9999
o = @git.gblob('ba492c62b6')
100100
assert(o.is_a?(Git::Object::Blob))
101101
assert(o.blob?)
102-
102+
103103
o = @git.gblob('v2.5:example.txt')
104104
assert(o.is_a?(Git::Object::Blob))
105105
assert(o.blob?)
106106
end
107-
107+
108108
def test_blob_contents
109109
o = @git.gblob('v2.6:example.txt')
110110
assert_equal('replace with new text', o.contents)
111111
assert_equal('replace with new text', o.contents) # this should be cached
112-
112+
113113
# make sure the block is called
114114
block_called = false
115115
o.contents do |f|
116116
block_called = true
117117
assert_equal('replace with new text', f.read.chomp)
118118
end
119-
119+
120120
assert(block_called)
121121
end
122-
122+
123123
def test_revparse
124124
sha = @git.revparse('v2.6:example.txt')
125125
assert_equal('1f09f2edb9c0d9275d15960771b363ca6940fbe3', sha)
126126
end
127-
127+
128128
def test_grep
129129
g = @git.gtree('a3db7143944dcfa0').grep('search') # there
130130
assert_equal(3, g.to_a.flatten.size)
@@ -135,11 +135,9 @@ def test_grep
135135
g = @git.gcommit('gitsearch1').grep('search') # there
136136
assert_equal(8, g.to_a.flatten.size)
137137
assert_equal(2, g.size)
138-
138+
139139
g = @git.gcommit('gitsearch1').grep('search', 'scott/new*') # there
140140
assert_equal(3, g.to_a.flatten.size)
141141
assert_equal(1, g.size)
142142
end
143-
144-
145143
end

0 commit comments

Comments
 (0)