From 1b728a919ece3352f58c9c7d73878940cdc7abcc Mon Sep 17 00:00:00 2001 From: kares Date: Tue, 13 Feb 2024 15:54:33 +0100 Subject: [PATCH] [test] cleanup - no longer tested on Java 7 --- src/test/ruby/test_helper.rb | 7 +------ src/test/ruby/x509/test_x509cert.rb | 9 ++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/test/ruby/test_helper.rb b/src/test/ruby/test_helper.rb index 1b81d67a..b13f3cb1 100644 --- a/src/test/ruby/test_helper.rb +++ b/src/test/ruby/test_helper.rb @@ -101,7 +101,7 @@ def assert_not_same(expected, actual) end end - def self.disable_security_restrictions!; @@security_restrictions = nil end # do nothing on MRI + def self.disable_security_restrictions!; end # do nothing on MRI @@security_restrictions = '' @@ -121,11 +121,6 @@ def self.disable_security_restrictions disable_security_restrictions! if @@security_restrictions.eql?('') end - def self.security_restrictions? - disable_security_restrictions; return @@security_restrictions - end - - def self.java7?; java_version.last.to_i == 7 end def self.java8?; java_version.last.to_i == 8 end def self.java_version diff --git a/src/test/ruby/x509/test_x509cert.rb b/src/test/ruby/x509/test_x509cert.rb index d2429b0d..1528df8b 100644 --- a/src/test/ruby/x509/test_x509cert.rb +++ b/src/test/ruby/x509/test_x509cert.rb @@ -141,11 +141,10 @@ def test_resolve_extensions assert_equal 5, cert.extensions.size # Java 6/7 seems to maintain same order but Java 8 does definitely not : - # TODO there must be something going on under - maybe not BC parsing ?!? - if self.class.java7? - 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 - assert_equal 'email:self@jruby.org, DNS:jruby.org', cert.extensions[4].value - end + #if self.class.java_version.last.to_i == 7 + # 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 + # assert_equal 'email:self@jruby.org, DNS:jruby.org', cert.extensions[4].value + #end exts = cert.extensions.dup