moved and fixed tests around so that they are usable (during development) once again

Author: kares

test/java/pkcs7_mime_enveloped.message renamed to src/test/ruby/pkcs7/pkcs7_mime_enveloped.message

@@ -1,23 +1,25 @@
+require File.expand_path('../pkcs7_helper', File.dirname(__FILE__))
+
 module PKCS7Test
-  class TestJavaAttribute < Test::Unit::TestCase
+  class TestAttribute < Test::Unit::TestCase
     def test_attributes
       val = ASN1::OctetString.new("foo".to_java_bytes)
       val2 = ASN1::OctetString.new("bar".to_java_bytes)
       attr = Attribute.create(123, 444, val)
-      assert_raise NoMethodError do 
+      assert_raise NoMethodError do
         attr.type = 12
       end
-      assert_raise NoMethodError do 
+      assert_raise NoMethodError do
         attr.value = val2
       end
 
       assert_equal 123, attr.type
       assert_equal val, attr.set.get(0)
 
       attr2 = Attribute.create(123, 444, val)
-      
+
       assert_equal attr, attr2
-      
+
       assert_not_equal Attribute.create(124, 444, val), attr
       assert_not_equal Attribute.create(123, 444, val2), attr
     end

test/java/pkcs7_mime_signed.message renamed to src/test/ruby/pkcs7/pkcs7_mime_signed.message

@@ -1,5 +1,7 @@
+require File.expand_path('../pkcs7_helper', File.dirname(__FILE__))
+
 module PKCS7Test
-  class TestJavaBIO < Test::Unit::TestCase
+  class TestBIO < Test::Unit::TestCase
     def test_string_bio_simple
       bio = BIO::from_string("abc")
       arr = Java::byte[20].new
@@ -26,7 +28,7 @@ def test_string_bio_simple_with_newline_and_more_data
       read = bio.gets(arr, 10)
       assert_equal 4, read
       assert_equal "foo\n".to_java_bytes.to_a, arr.to_a[0...read]
-    
+
       read = bio.gets(arr, 10)
       assert_equal 1, read
       assert_equal "\n".to_java_bytes.to_a, arr.to_a[0...read]

test/java/pkcs7_multipart_signed.message renamed to src/test/ruby/pkcs7/pkcs7_multipart_signed.message

@@ -1,5 +1,7 @@
+require File.expand_path('../pkcs7_helper', File.dirname(__FILE__))
+
 module PKCS7Test
-  class TestJavaMime < Test::Unit::TestCase
+  class TestMIME < Test::Unit::TestCase
     def test_find_header_returns_null_on_nonexisting_header
       headers = []
       assert_nil Mime::DEFAULT.find_header(headers, "foo")
@@ -23,7 +25,7 @@ def test_find_param_returns_the_param_with_the_same_name
       hdr = MimeHeader.new("one", "two", [par])
       assert_equal par, Mime::DEFAULT.find_param(hdr, "hox")
     end
-    
+
     def test_simple_parse_headers
       bio = BIO::from_string("Foo: bar")
       result = Mime::DEFAULT.parse_headers(bio)
@@ -106,7 +108,7 @@ def test_parse_headers_with_param
       header = result[0]
       assert_equal "content-type", header.name
       assert_equal "multipart/related", header.value
-      assert_equal [MimeParam.new("boundary","MIME_boundary"), 
+      assert_equal [MimeParam.new("boundary","MIME_boundary"),
                     MimeParam.new("type","text/xml")], header.params.to_a
     end
 
@@ -117,7 +119,7 @@ def test_parse_headers_with_param_newline
       header = result[0]
       assert_equal "content-type", header.name
       assert_equal "multipart/related", header.value
-      assert_equal [MimeParam.new("boundary","MIME_boundary"), 
+      assert_equal [MimeParam.new("boundary","MIME_boundary"),
                     MimeParam.new("type","text/xml")], header.params.to_a
     end
 
@@ -128,17 +130,17 @@ def test_parse_headers_with_param_newline_and_semicolon
       header = result[0]
       assert_equal "content-type", header.name
       assert_equal "multipart/related", header.value
-      assert_equal [MimeParam.new("boundary","MIME_boundary"), 
+      assert_equal [MimeParam.new("boundary","MIME_boundary"),
                     MimeParam.new("type","text/xml")], header.params.to_a
     end
 
     def test_advanced_mime_message
       bio = BIO::from_string(MultipartSignedString)
       result = Mime::DEFAULT.parse_headers(bio)
-      
+
       assert_equal "mime-version", result[0].name
       assert_equal "1.0", result[0].value
-      
+
       assert_equal "to", result[1].name
       assert_equal "[email protected]", result[1].value
 
@@ -153,10 +155,10 @@ def test_advanced_mime_message
 
       assert_equal "date", result[5].name
       assert_equal "fri, 06 sep 2002 00:25:21 -0300", result[5].value
-      
+
       assert_equal "content-type", result[6].name
       assert_equal "multipart/signed", result[6].value
-      
+
       assert_equal "micalg", result[6].params[0].param_name
       assert_equal "SHA1", result[6].params[0].param_value
 
@@ -165,7 +167,7 @@ def test_advanced_mime_message
 
       assert_equal "protocol", result[6].params[2].param_name
       assert_equal "application/pkcs7-signature", result[6].params[2].param_value
-      
+
       assert_equal 3, result[6].params.length
       assert_equal 7, result.length
     end