Skip to content

Commit 37f8e6d

Browse files
committed
fix tests on windows: change path comparison so that c:\tmp can be seen as equal to c:/tmp
1 parent 06e1f92 commit 37f8e6d

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

test/helper.rb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,11 @@ class TestCase < Minitest::Test
1111
alias :assert_not_nil :refute_nil
1212
alias :assert_raise :assert_raises
1313

14+
15+
def assert_path_equal(p1, p2)
16+
assert_equal( Pathname.new(p1).realpath, Pathname.new(p2).realpath )
17+
end
18+
1419
def assert_nothing_raised
1520
yield
1621
end

test/test_database.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ def test_db_filename
1919
assert_equal '', @db.filename('main')
2020
tf = Tempfile.new 'thing'
2121
@db = SQLite3::Database.new tf.path
22-
assert_equal tf.path, @db.filename('main')
22+
assert_path_equal tf.path, @db.filename('main')
2323
ensure
2424
tf.unlink if tf
2525
end
@@ -29,7 +29,7 @@ def test_filename
2929
assert_equal '', @db.filename
3030
tf = Tempfile.new 'thing'
3131
@db = SQLite3::Database.new tf.path
32-
assert_equal tf.path, @db.filename
32+
assert_path_equal tf.path, @db.filename
3333
ensure
3434
tf.unlink if tf
3535
end
@@ -39,7 +39,7 @@ def test_filename_with_attachment
3939
assert_equal '', @db.filename
4040
tf = Tempfile.new 'thing'
4141
@db.execute "ATTACH DATABASE '#{tf.path}' AS 'testing'"
42-
assert_equal tf.path, @db.filename('testing')
42+
assert_path_equal tf.path, @db.filename('testing')
4343
ensure
4444
tf.unlink if tf
4545
end

0 commit comments

Comments
 (0)