moving test files into test/units/

ch1ago · ch1ago · commit 07a94dd5c842 · 2016-04-28T18:47:27.000-03:00
diff --git a/test/test_helper_units.rb b/test/test_helper_units.rb
@@ -0,0 +1 @@
+require 'test_helper'
diff --git a/test/units/test_access_token.rb b/test/units/test_access_token.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 
 class TestAccessToken < Minitest::Test
   def setup
diff --git a/test/units/test_action_controller_request_proxy.rb b/test/units/test_action_controller_request_proxy.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 
 require 'oauth/request_proxy/action_controller_request'
 
diff --git a/test/units/test_consumer.rb b/test/units/test_consumer.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 
 require 'stringio'
 
diff --git a/test/units/test_curb_request_proxy.rb b/test/units/test_curb_request_proxy.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 
 begin
 
diff --git a/test/units/test_em_http_client.rb b/test/units/test_em_http_client.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 begin
 
 require 'oauth/client/em_http'
diff --git a/test/units/test_em_http_request_proxy.rb b/test/units/test_em_http_request_proxy.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 
 begin
 
diff --git a/test/units/test_hmac_sha1.rb b/test/units/test_hmac_sha1.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 
 class TestSignatureHmacSha1 < Minitest::Test
   def test_that_hmac_sha1_implements_hmac_sha1
diff --git a/test/units/test_net_http_client.rb b/test/units/test_net_http_client.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 
 class NetHTTPClientTest < Minitest::Test
 
diff --git a/test/units/test_net_http_request_proxy.rb b/test/units/test_net_http_request_proxy.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 
 class NetHTTPRequestProxyTest < Minitest::Test
 
diff --git a/test/units/test_oauth_helper.rb b/test/units/test_oauth_helper.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 
 class TestOAuthHelper < Minitest::Test
 
diff --git a/test/units/test_rack_request_proxy.rb b/test/units/test_rack_request_proxy.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 require 'oauth/request_proxy/rack_request'
 require 'rack/request'
 require 'rack/mock'
diff --git a/test/units/test_request_token.rb b/test/units/test_request_token.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 
 class StubbedToken < OAuth::RequestToken
   define_method :build_authorize_url_promoted do |root_domain, params|
diff --git a/test/units/test_rest_client_request_proxy.rb b/test/units/test_rest_client_request_proxy.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 
 begin
   require 'oauth/request_proxy/rest_client_request'
diff --git a/test/units/test_rsa_sha1.rb b/test/units/test_rsa_sha1.rb
@@ -1,14 +1,13 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 require 'oauth/consumer'
 require 'oauth/signature/rsa/sha1'
 
 class TestSignatureRsaSha1 < Minitest::Test
 
   def setup
-    @request = Net::HTTP::Get.new('/photos?file=vacaction.jpg&size=original&oauth_version=1.0&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_timestamp=1196666512&oauth_nonce=13917289812797014437&oauth_signature_method=RSA-SHA1')
-
-    @consumer = OAuth::Consumer.new('dpf43f3p2l4k3l03', OpenSSL::PKey::RSA.new(IO.read(File.dirname(__FILE__) + "/keys/rsa.pem")))
+    @request = Net::HTTP::Get.new("/photos?file=vacaction.jpg&size=original&oauth_version=1.0&oauth_consumer_key=#{consumer_key}&oauth_timestamp=1196666512&oauth_nonce=13917289812797014437&oauth_signature_method=RSA-SHA1")
 
+    @consumer = OAuth::Consumer.new(consumer_key, pkey_rsa)
   end
 
   def test_that_rsa_sha1_implements_rsa_sha1
@@ -27,33 +26,53 @@ def test_that_get_request_from_oauth_test_cases_produces_matching_signature
                                                  :uri => 'http://photos.example.net/photos' } )
 
     assert_equal 'jvTp/wX1TYtByB1m+Pbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2/9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW//e+RinhejgCuzoH26dyF8iY2ZZ/5D1ilgeijhV/vBka5twt399mXwaYdCwFYE=', signature
-
   end
 
   def test_that_get_request_from_oauth_test_cases_produces_matching_signature_using_private_key_file
-    @consumer = OAuth::Consumer.new('dpf43f3p2l4k3l03',nil)
+    @consumer = OAuth::Consumer.new(consumer_key,nil)
 
     signature = OAuth::Signature.sign(@request, { :consumer => @consumer,
-                                                  :private_key_file=>File.dirname(__FILE__) + "/keys/rsa.pem",
+                                                  :private_key_file=>pem_path,
                                                  :uri => 'http://photos.example.net/photos' } )
 
     assert_equal 'jvTp/wX1TYtByB1m+Pbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2/9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW//e+RinhejgCuzoH26dyF8iY2ZZ/5D1ilgeijhV/vBka5twt399mXwaYdCwFYE=', signature
   end
 
   def test_that_get_request_from_oauth_test_cases_verifies_signature
-    @request = Net::HTTP::Get.new('/photos?oauth_signature_method=RSA-SHA1&oauth_version=1.0&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_timestamp=1196666512&oauth_nonce=13917289812797014437&file=vacaction.jpg&size=original&oauth_signature=jvTp%2FwX1TYtByB1m%2BPbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2%2F9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW%2F%2Fe%2BRinhejgCuzoH26dyF8iY2ZZ%2F5D1ilgeijhV%2FvBka5twt399mXwaYdCwFYE%3D')
-    @consumer = OAuth::Consumer.new('dpf43f3p2l4k3l03',OpenSSL::X509::Certificate.new(IO.read(File.dirname(__FILE__) + "/keys/rsa.cert")))
+    @request = Net::HTTP::Get.new("/photos?oauth_signature_method=RSA-SHA1&oauth_version=1.0&oauth_consumer_key=#{consumer_key}&oauth_timestamp=1196666512&oauth_nonce=13917289812797014437&file=vacaction.jpg&size=original&oauth_signature=jvTp%2FwX1TYtByB1m%2BPbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2%2F9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW%2F%2Fe%2BRinhejgCuzoH26dyF8iY2ZZ%2F5D1ilgeijhV%2FvBka5twt399mXwaYdCwFYE%3D")
+    @consumer = OAuth::Consumer.new(consumer_key, x509_certificate)
 
     assert OAuth::Signature.verify(@request, { :consumer => @consumer,
                                                  :uri => 'http://photos.example.net/photos' } )
 
   end
 
   def test_that_get_request_from_oauth_test_cases_verifies_signature_with_pem
-    @request = Net::HTTP::Get.new('/photos?oauth_signature_method=RSA-SHA1&oauth_version=1.0&oauth_consumer_key=dpf43f3p2l4k3l03&oauth_timestamp=1196666512&oauth_nonce=13917289812797014437&file=vacaction.jpg&size=original&oauth_signature=jvTp%2FwX1TYtByB1m%2BPbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2%2F9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW%2F%2Fe%2BRinhejgCuzoH26dyF8iY2ZZ%2F5D1ilgeijhV%2FvBka5twt399mXwaYdCwFYE%3D')
+    @request = Net::HTTP::Get.new("/photos?oauth_signature_method=RSA-SHA1&oauth_version=1.0&oauth_consumer_key=#{consumer_key}&oauth_timestamp=1196666512&oauth_nonce=13917289812797014437&file=vacaction.jpg&size=original&oauth_signature=jvTp%2FwX1TYtByB1m%2BPbyo0lnCOLIsyGCH7wke8AUs3BpnwZJtAuEJkvQL2%2F9n4s5wUmUl4aCI4BwpraNx4RtEXMe5qg5T1LVTGliMRpKasKsW%2F%2Fe%2BRinhejgCuzoH26dyF8iY2ZZ%2F5D1ilgeijhV%2FvBka5twt399mXwaYdCwFYE%3D")
     assert OAuth::Signature.verify(@request, { :consumer => @consumer,
                                                  :uri => 'http://photos.example.net/photos' } )
+  end
+
+  private
+
+  def consumer_key
+    'dpf43f3p2l4k3l03'
+  end
+
+  def x509_certificate
+    OpenSSL::X509::Certificate.new(IO.read(cert_path))
+  end
+
+  def pkey_rsa
+    OpenSSL::PKey::RSA.new(IO.read(pem_path))
+  end
+
+  def cert_path
+    File.dirname(__FILE__) + "/../keys/rsa.cert"
+  end
 
+  def pem_path
+    File.dirname(__FILE__) + "/../keys/rsa.pem"
   end
 
 end
diff --git a/test/units/test_server.rb b/test/units/test_server.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 require 'oauth/server'
 
 class ServerTest < Minitest::Test
diff --git a/test/units/test_signature.rb b/test/units/test_signature.rb
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 
 class TestOauth < Minitest::Test
 
diff --git a/test/units/test_signature_base.rb b/test/units/test_signature_base.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 require 'oauth/signature/base'
 require 'net/http'
 
diff --git a/test/units/test_signature_hmac_sha1.rb b/test/units/test_signature_hmac_sha1.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 require 'oauth/signature/hmac/sha1'
 
 class SignatureHMACSHA1Test < Minitest::Test
diff --git a/test/units/test_signature_plain_text.rb b/test/units/test_signature_plain_text.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 require 'oauth/signature/plaintext'
 
 class TestSignaturePlaintext < Minitest::Test
diff --git a/test/units/test_token.rb b/test/units/test_token.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 require 'oauth/token'
 
 class TestToken < Minitest::Test
diff --git a/test/units/test_typhoeus_request_proxy.rb b/test/units/test_typhoeus_request_proxy.rb
@@ -1,4 +1,4 @@
-require File.expand_path('../test_helper', __FILE__)
+require File.expand_path('../../test_helper_units', __FILE__)
 
 begin
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-require File.expand_path('../test_helper', __FILE__)`
	`1`	`+require File.expand_path('../../test_helper_units', __FILE__)`
`2`	`2`
`3`	`3`	`class TestAccessToken < Minitest::Test`
`4`	`4`	`def setup`