Skip to content

Commit 2d3aa77

Browse files
committed
Delete test about loading postgres jdbc driver for java 7
1 parent 840e1ed commit 2d3aa77

File tree

1 file changed

+7
-30
lines changed

1 file changed

+7
-30
lines changed

test/db/postgresql/jdbc_postgres_test.rb

Lines changed: 7 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
module Jdbc
44
class PostgresTest < Test::Unit::TestCase
5-
6-
SKIP_TESTS = false
75
SYSTEM_ENV = ENV_JAVA.dup
86

97
setup do
@@ -16,37 +14,16 @@ class PostgresTest < Test::Unit::TestCase
1614

1715
test('some') { assert Jdbc::Postgres }
1816

19-
test 'returns jdbc version 4.1 on java 7' do
20-
ENV_JAVA[ 'java.specification.version' ] = '1.7'
21-
assert_equal 7, Jdbc::Postgres.send(:jre_version)
22-
end unless SKIP_TESTS
23-
24-
test 'returns jdbc version default (4.2) on java 8/9' do
25-
ENV_JAVA[ 'java.specification.version' ] = '1.8'
26-
assert_nil Jdbc::Postgres.send(:jre_version)
17+
test 'returns jdbc version default (4.2) on java 8' do
18+
ENV_JAVA['java.specification.version'] = '1.8'
2719

28-
ENV_JAVA[ 'java.specification.version' ] = '9'
2920
assert_nil Jdbc::Postgres.send(:jre_version)
30-
end unless SKIP_TESTS
31-
32-
context 'load-driver' do
33-
34-
ROOT_DIR = File.expand_path('../../..', File.dirname(__FILE__))
35-
36-
@@driver_dir = File.join(ROOT_DIR, 'jdbc-postgres/lib')
21+
end
3722

38-
test 'on java 7' do
39-
ENV_JAVA[ 'java.specification.version' ] = '1.7'
40-
Jdbc::Postgres.expects(:load).with do |driver_jar|
41-
assert_match(/.jre7.jar$/, driver_jar)
42-
full_path = File.join(@@driver_dir, driver_jar)
43-
assert File.exist?(full_path), "#{driver_jar.inspect} not found in: #{@@driver_dir.inspect}"
44-
true
45-
end
46-
Jdbc::Postgres.load_driver
47-
end
23+
test 'returns jdbc version 4.2 on java 11' do
24+
ENV_JAVA['java.specification.version'] = '11'
4825

26+
assert_nil Jdbc::Postgres.send(:jre_version)
4927
end
50-
51-
end if defined? JRUBY_VERSION
28+
end
5229
end

0 commit comments

Comments
 (0)