Skip to content

Commit 0068b77

Browse files
committed
[test] cleanup - no longer tested on Java 7
1 parent 28e66d4 commit 0068b77

File tree

2 files changed

+5
-11
lines changed

2 files changed

+5
-11
lines changed

src/test/ruby/test_helper.rb

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def assert_not_same(expected, actual)
101101
end
102102
end
103103

104-
def self.disable_security_restrictions!; @@security_restrictions = nil end # do nothing on MRI
104+
def self.disable_security_restrictions!; end # do nothing on MRI
105105

106106
@@security_restrictions = ''
107107

@@ -121,11 +121,6 @@ def self.disable_security_restrictions
121121
disable_security_restrictions! if @@security_restrictions.eql?('')
122122
end
123123

124-
def self.security_restrictions?
125-
disable_security_restrictions; return @@security_restrictions
126-
end
127-
128-
def self.java7?; java_version.last.to_i == 7 end
129124
def self.java8?; java_version.last.to_i == 8 end
130125

131126
def self.java_version

src/test/ruby/x509/test_x509cert.rb

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -141,11 +141,10 @@ def test_resolve_extensions
141141
assert_equal 5, cert.extensions.size
142142

143143
# Java 6/7 seems to maintain same order but Java 8 does definitely not :
144-
# TODO there must be something going on under - maybe not BC parsing ?!?
145-
if self.class.java7?
146-
assert_equal '97:39:9D:C3:FB:CD:BA:8F:54:0C:90:7B:46:3F:EA:D6:43:75:B1:CB', cert.extensions[2].value
147-
assert_equal 'email:[email protected], DNS:jruby.org', cert.extensions[4].value
148-
end
144+
#if self.class.java_version.last.to_i == 7
145+
# assert_equal '97:39:9D:C3:FB:CD:BA:8F:54:0C:90:7B:46:3F:EA:D6:43:75:B1:CB', cert.extensions[2].value
146+
# assert_equal 'email:[email protected], DNS:jruby.org', cert.extensions[4].value
147+
#end
149148

150149
exts = cert.extensions.dup
151150

0 commit comments

Comments
 (0)