Update to ruby/spec@6f38a82

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63293 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 206 insertions, 208 deletions

diff --git a/spec/ruby/core/string/unpack/j_spec.rb b/spec/ruby/core/string/unpack/j_spec.rb
index 8f4213bd97..3c2baad642 100644
--- a/spec/ruby/core/string/unpack/j_spec.rb
+++ b/spec/ruby/core/string/unpack/j_spec.rb
@@ -3,272 +3,270 @@ require_relative '../fixtures/classes'
 require_relative 'shared/basic'
 require_relative 'shared/integer'
 
-ruby_version_is '2.3' do
-  platform_is pointer_size: 64 do
-    little_endian do
-      describe "String#unpack with format 'J'" do
-        describe "with modifier '_'" do
-          it_behaves_like :string_unpack_64bit_le, 'J_'
-          it_behaves_like :string_unpack_64bit_le_unsigned, 'J_'
-        end
-
-        describe "with modifier '!'" do
-          it_behaves_like :string_unpack_64bit_le, 'J!'
-          it_behaves_like :string_unpack_64bit_le_unsigned, 'J!'
-        end
+platform_is pointer_size: 64 do
+  little_endian do
+    describe "String#unpack with format 'J'" do
+      describe "with modifier '_'" do
+        it_behaves_like :string_unpack_64bit_le, 'J_'
+        it_behaves_like :string_unpack_64bit_le_unsigned, 'J_'
       end
 
-      describe "String#unpack with format 'j'" do
-        describe "with modifier '_'" do
-          it_behaves_like :string_unpack_64bit_le, 'j_'
-          it_behaves_like :string_unpack_64bit_le_signed, 'j_'
-        end
-
-        describe "with modifier '!'" do
-          it_behaves_like :string_unpack_64bit_le, 'j!'
-          it_behaves_like :string_unpack_64bit_le_signed, 'j!'
-        end
+      describe "with modifier '!'" do
+        it_behaves_like :string_unpack_64bit_le, 'J!'
+        it_behaves_like :string_unpack_64bit_le_unsigned, 'J!'
       end
     end
 
-    big_endian do
-      describe "String#unpack with format 'J'" do
-        describe "with modifier '_'" do
-          it_behaves_like :string_unpack_64bit_be, 'J_'
-          it_behaves_like :string_unpack_64bit_be_unsigned, 'J_'
-        end
-
-        describe "with modifier '!'" do
-          it_behaves_like :string_unpack_64bit_be, 'J!'
-          it_behaves_like :string_unpack_64bit_be_unsigned, 'J!'
-        end
+    describe "String#unpack with format 'j'" do
+      describe "with modifier '_'" do
+        it_behaves_like :string_unpack_64bit_le, 'j_'
+        it_behaves_like :string_unpack_64bit_le_signed, 'j_'
       end
 
-      describe "String#unpack with format 'j'" do
-        describe "with modifier '_'" do
-          it_behaves_like :string_unpack_64bit_be, 'j_'
-          it_behaves_like :string_unpack_64bit_be_signed, 'j_'
-        end
-
-        describe "with modifier '!'" do
-          it_behaves_like :string_unpack_64bit_be, 'j!'
-          it_behaves_like :string_unpack_64bit_be_signed, 'j!'
-        end
+      describe "with modifier '!'" do
+        it_behaves_like :string_unpack_64bit_le, 'j!'
+        it_behaves_like :string_unpack_64bit_le_signed, 'j!'
       end
     end
+  end
 
+  big_endian do
     describe "String#unpack with format 'J'" do
-      describe "with modifier '<'" do
-        it_behaves_like :string_unpack_64bit_le, 'J<'
-        it_behaves_like :string_unpack_64bit_le_unsigned, 'J<'
-      end
-
-      describe "with modifier '>'" do
-        it_behaves_like :string_unpack_64bit_be, 'J>'
-        it_behaves_like :string_unpack_64bit_be_unsigned, 'J>'
+      describe "with modifier '_'" do
+        it_behaves_like :string_unpack_64bit_be, 'J_'
+        it_behaves_like :string_unpack_64bit_be_unsigned, 'J_'
       end
 
-      describe "with modifier '<' and '_'" do
-        it_behaves_like :string_unpack_64bit_le, 'J<_'
-        it_behaves_like :string_unpack_64bit_le, 'J_<'
-        it_behaves_like :string_unpack_64bit_le_unsigned, 'J<_'
-        it_behaves_like :string_unpack_64bit_le_unsigned, 'J_<'
-      end
-
-      describe "with modifier '<' and '!'" do
-        it_behaves_like :string_unpack_64bit_le, 'J<!'
-        it_behaves_like :string_unpack_64bit_le, 'J!<'
-        it_behaves_like :string_unpack_64bit_le_unsigned, 'J<!'
-        it_behaves_like :string_unpack_64bit_le_unsigned, 'J!<'
+      describe "with modifier '!'" do
+        it_behaves_like :string_unpack_64bit_be, 'J!'
+        it_behaves_like :string_unpack_64bit_be_unsigned, 'J!'
       end
+    end
 
-      describe "with modifier '>' and '_'" do
-        it_behaves_like :string_unpack_64bit_be, 'J>_'
-        it_behaves_like :string_unpack_64bit_be, 'J_>'
-        it_behaves_like :string_unpack_64bit_be_unsigned, 'J>_'
-        it_behaves_like :string_unpack_64bit_be_unsigned, 'J_>'
+    describe "String#unpack with format 'j'" do
+      describe "with modifier '_'" do
+        it_behaves_like :string_unpack_64bit_be, 'j_'
+        it_behaves_like :string_unpack_64bit_be_signed, 'j_'
       end
 
-      describe "with modifier '>' and '!'" do
-        it_behaves_like :string_unpack_64bit_be, 'J>!'
-        it_behaves_like :string_unpack_64bit_be, 'J!>'
-        it_behaves_like :string_unpack_64bit_be_unsigned, 'J>!'
-        it_behaves_like :string_unpack_64bit_be_unsigned, 'J!>'
+      describe "with modifier '!'" do
+        it_behaves_like :string_unpack_64bit_be, 'j!'
+        it_behaves_like :string_unpack_64bit_be_signed, 'j!'
       end
     end
+  end
 
-    describe "String#unpack with format 'j'" do
-      describe "with modifier '<'" do
-        it_behaves_like :string_unpack_64bit_le, 'j<'
-        it_behaves_like :string_unpack_64bit_le_signed, 'j<'
-      end
+  describe "String#unpack with format 'J'" do
+    describe "with modifier '<'" do
+      it_behaves_like :string_unpack_64bit_le, 'J<'
+      it_behaves_like :string_unpack_64bit_le_unsigned, 'J<'
+    end
 
-      describe "with modifier '>'" do
-        it_behaves_like :string_unpack_64bit_be, 'j>'
-        it_behaves_like :string_unpack_64bit_be_signed, 'j>'
-      end
+    describe "with modifier '>'" do
+      it_behaves_like :string_unpack_64bit_be, 'J>'
+      it_behaves_like :string_unpack_64bit_be_unsigned, 'J>'
+    end
 
-      describe "with modifier '<' and '_'" do
-        it_behaves_like :string_unpack_64bit_le, 'j<_'
-        it_behaves_like :string_unpack_64bit_le, 'j_<'
-        it_behaves_like :string_unpack_64bit_le_signed, 'j<_'
-        it_behaves_like :string_unpack_64bit_le_signed, 'j_<'
-      end
+    describe "with modifier '<' and '_'" do
+      it_behaves_like :string_unpack_64bit_le, 'J<_'
+      it_behaves_like :string_unpack_64bit_le, 'J_<'
+      it_behaves_like :string_unpack_64bit_le_unsigned, 'J<_'
+      it_behaves_like :string_unpack_64bit_le_unsigned, 'J_<'
+    end
 
-      describe "with modifier '<' and '!'" do
-        it_behaves_like :string_unpack_64bit_le, 'j<!'
-        it_behaves_like :string_unpack_64bit_le, 'j!<'
-        it_behaves_like :string_unpack_64bit_le_signed, 'j<!'
-        it_behaves_like :string_unpack_64bit_le_signed, 'j!<'
-      end
+    describe "with modifier '<' and '!'" do
+      it_behaves_like :string_unpack_64bit_le, 'J<!'
+      it_behaves_like :string_unpack_64bit_le, 'J!<'
+      it_behaves_like :string_unpack_64bit_le_unsigned, 'J<!'
+      it_behaves_like :string_unpack_64bit_le_unsigned, 'J!<'
+    end
 
-      describe "with modifier '>' and '_'" do
-        it_behaves_like :string_unpack_64bit_be, 'j>_'
-        it_behaves_like :string_unpack_64bit_be, 'j_>'
-        it_behaves_like :string_unpack_64bit_be_signed, 'j>_'
-        it_behaves_like :string_unpack_64bit_be_signed, 'j_>'
-      end
+    describe "with modifier '>' and '_'" do
+      it_behaves_like :string_unpack_64bit_be, 'J>_'
+      it_behaves_like :string_unpack_64bit_be, 'J_>'
+      it_behaves_like :string_unpack_64bit_be_unsigned, 'J>_'
+      it_behaves_like :string_unpack_64bit_be_unsigned, 'J_>'
+    end
 
-      describe "with modifier '>' and '!'" do
-        it_behaves_like :string_unpack_64bit_be, 'j>!'
-        it_behaves_like :string_unpack_64bit_be, 'j!>'
-        it_behaves_like :string_unpack_64bit_be_signed, 'j>!'
-        it_behaves_like :string_unpack_64bit_be_signed, 'j!>'
-      end
+    describe "with modifier '>' and '!'" do
+      it_behaves_like :string_unpack_64bit_be, 'J>!'
+      it_behaves_like :string_unpack_64bit_be, 'J!>'
+      it_behaves_like :string_unpack_64bit_be_unsigned, 'J>!'
+      it_behaves_like :string_unpack_64bit_be_unsigned, 'J!>'
     end
   end
 
-  platform_is pointer_size: 32 do
-    little_endian do
-      describe "String#unpack with format 'J'" do
-        describe "with modifier '_'" do
-          it_behaves_like :string_unpack_32bit_le, 'J_'
-          it_behaves_like :string_unpack_32bit_le_unsigned, 'J_'
-        end
-
-        describe "with modifier '!'" do
-          it_behaves_like :string_unpack_32bit_le, 'J!'
-          it_behaves_like :string_unpack_32bit_le_unsigned, 'J!'
-        end
-      end
-
-      describe "String#unpack with format 'j'" do
-        describe "with modifier '_'" do
-          it_behaves_like :string_unpack_32bit_le, 'j_'
-          it_behaves_like :string_unpack_32bit_le_signed, 'j_'
-        end
+  describe "String#unpack with format 'j'" do
+    describe "with modifier '<'" do
+      it_behaves_like :string_unpack_64bit_le, 'j<'
+      it_behaves_like :string_unpack_64bit_le_signed, 'j<'
+    end
 
-        describe "with modifier '!'" do
-          it_behaves_like :string_unpack_32bit_le, 'j!'
-          it_behaves_like :string_unpack_32bit_le_signed, 'j!'
-        end
-      end
+    describe "with modifier '>'" do
+      it_behaves_like :string_unpack_64bit_be, 'j>'
+      it_behaves_like :string_unpack_64bit_be_signed, 'j>'
     end
 
-    big_endian do
-      describe "String#unpack with format 'J'" do
-        describe "with modifier '_'" do
-          it_behaves_like :string_unpack_32bit_be, 'J_'
-          it_behaves_like :string_unpack_32bit_be_unsigned, 'J_'
-        end
+    describe "with modifier '<' and '_'" do
+      it_behaves_like :string_unpack_64bit_le, 'j<_'
+      it_behaves_like :string_unpack_64bit_le, 'j_<'
+      it_behaves_like :string_unpack_64bit_le_signed, 'j<_'
+      it_behaves_like :string_unpack_64bit_le_signed, 'j_<'
+    end
 
-        describe "with modifier '!'" do
-          it_behaves_like :string_unpack_32bit_be, 'J!'
-          it_behaves_like :string_unpack_32bit_be_unsigned, 'J!'
-        end
-      end
+    describe "with modifier '<' and '!'" do
+      it_behaves_like :string_unpack_64bit_le, 'j<!'
+      it_behaves_like :string_unpack_64bit_le, 'j!<'
+      it_behaves_like :string_unpack_64bit_le_signed, 'j<!'
+      it_behaves_like :string_unpack_64bit_le_signed, 'j!<'
+    end
 
-      describe "String#unpack with format 'j'" do
-        describe "with modifier '_'" do
-          it_behaves_like :string_unpack_32bit_be, 'j_'
-          it_behaves_like :string_unpack_32bit_be_signed, 'j_'
-        end
+    describe "with modifier '>' and '_'" do
+      it_behaves_like :string_unpack_64bit_be, 'j>_'
+      it_behaves_like :string_unpack_64bit_be, 'j_>'
+      it_behaves_like :string_unpack_64bit_be_signed, 'j>_'
+      it_behaves_like :string_unpack_64bit_be_signed, 'j_>'
+    end
 
-        describe "with modifier '!'" do
-          it_behaves_like :string_unpack_32bit_be, 'j!'
-          it_behaves_like :string_unpack_32bit_be_signed, 'j!'
-        end
-      end
+    describe "with modifier '>' and '!'" do
+      it_behaves_like :string_unpack_64bit_be, 'j>!'
+      it_behaves_like :string_unpack_64bit_be, 'j!>'
+      it_behaves_like :string_unpack_64bit_be_signed, 'j>!'
+      it_behaves_like :string_unpack_64bit_be_signed, 'j!>'
     end
+  end
+end
 
+platform_is pointer_size: 32 do
+  little_endian do
     describe "String#unpack with format 'J'" do
-      describe "with modifier '<'" do
-        it_behaves_like :string_unpack_32bit_le, 'J<'
-        it_behaves_like :string_unpack_32bit_le_unsigned, 'J<'
+      describe "with modifier '_'" do
+        it_behaves_like :string_unpack_32bit_le, 'J_'
+        it_behaves_like :string_unpack_32bit_le_unsigned, 'J_'
       end
 
-      describe "with modifier '>'" do
-        it_behaves_like :string_unpack_32bit_be, 'J>'
-        it_behaves_like :string_unpack_32bit_be_unsigned, 'J>'
+      describe "with modifier '!'" do
+        it_behaves_like :string_unpack_32bit_le, 'J!'
+        it_behaves_like :string_unpack_32bit_le_unsigned, 'J!'
       end
+    end
 
-      describe "with modifier '<' and '_'" do
-        it_behaves_like :string_unpack_32bit_le, 'J<_'
-        it_behaves_like :string_unpack_32bit_le, 'J_<'
-        it_behaves_like :string_unpack_32bit_le_unsigned, 'J<_'
-        it_behaves_like :string_unpack_32bit_le_unsigned, 'J_<'
+    describe "String#unpack with format 'j'" do
+      describe "with modifier '_'" do
+        it_behaves_like :string_unpack_32bit_le, 'j_'
+        it_behaves_like :string_unpack_32bit_le_signed, 'j_'
       end
 
-      describe "with modifier '<' and '!'" do
-        it_behaves_like :string_unpack_32bit_le, 'J<!'
-        it_behaves_like :string_unpack_32bit_le, 'J!<'
-        it_behaves_like :string_unpack_32bit_le_unsigned, 'J<!'
-        it_behaves_like :string_unpack_32bit_le_unsigned, 'J!<'
+      describe "with modifier '!'" do
+        it_behaves_like :string_unpack_32bit_le, 'j!'
+        it_behaves_like :string_unpack_32bit_le_signed, 'j!'
       end
+    end
+  end
 
-      describe "with modifier '>' and '_'" do
-        it_behaves_like :string_unpack_32bit_be, 'J>_'
-        it_behaves_like :string_unpack_32bit_be, 'J_>'
-        it_behaves_like :string_unpack_32bit_be_unsigned, 'J>_'
-        it_behaves_like :string_unpack_32bit_be_unsigned, 'J_>'
+  big_endian do
+    describe "String#unpack with format 'J'" do
+      describe "with modifier '_'" do
+        it_behaves_like :string_unpack_32bit_be, 'J_'
+        it_behaves_like :string_unpack_32bit_be_unsigned, 'J_'
       end
 
-      describe "with modifier '>' and '!'" do
-        it_behaves_like :string_unpack_32bit_be, 'J>!'
-        it_behaves_like :string_unpack_32bit_be, 'J!>'
-        it_behaves_like :string_unpack_32bit_be_unsigned, 'J>!'
-        it_behaves_like :string_unpack_32bit_be_unsigned, 'J!>'
+      describe "with modifier '!'" do
+        it_behaves_like :string_unpack_32bit_be, 'J!'
+        it_behaves_like :string_unpack_32bit_be_unsigned, 'J!'
       end
     end
 
     describe "String#unpack with format 'j'" do
-      describe "with modifier '<'" do
-        it_behaves_like :string_unpack_32bit_le, 'j<'
-        it_behaves_like :string_unpack_32bit_le_signed, 'j<'
+      describe "with modifier '_'" do
+        it_behaves_like :string_unpack_32bit_be, 'j_'
+        it_behaves_like :string_unpack_32bit_be_signed, 'j_'
       end
 
-      describe "with modifier '>'" do
-        it_behaves_like :string_unpack_32bit_be, 'j>'
-        it_behaves_like :string_unpack_32bit_be_signed, 'j>'
+      describe "with modifier '!'" do
+        it_behaves_like :string_unpack_32bit_be, 'j!'
+        it_behaves_like :string_unpack_32bit_be_signed, 'j!'
       end
+    end
+  end
 
-      describe "with modifier '<' and '_'" do
-        it_behaves_like :string_unpack_32bit_le, 'j<_'
-        it_behaves_like :string_unpack_32bit_le, 'j_<'
-        it_behaves_like :string_unpack_32bit_le_signed, 'j<_'
-        it_behaves_like :string_unpack_32bit_le_signed, 'j_<'
-      end
+  describe "String#unpack with format 'J'" do
+    describe "with modifier '<'" do
+      it_behaves_like :string_unpack_32bit_le, 'J<'
+      it_behaves_like :string_unpack_32bit_le_unsigned, 'J<'
+    end
 
-      describe "with modifier '<' and '!'" do
-        it_behaves_like :string_unpack_32bit_le, 'j<!'
-        it_behaves_like :string_unpack_32bit_le, 'j!<'
-        it_behaves_like :string_unpack_32bit_le_signed, 'j<!'
-        it_behaves_like :string_unpack_32bit_le_signed, 'j!<'
-      end
+    describe "with modifier '>'" do
+      it_behaves_like :string_unpack_32bit_be, 'J>'
+      it_behaves_like :string_unpack_32bit_be_unsigned, 'J>'
+    end
 
-      describe "with modifier '>' and '_'" do
-        it_behaves_like :string_unpack_32bit_be, 'j>_'
-        it_behaves_like :string_unpack_32bit_be, 'j_>'
-        it_behaves_like :string_unpack_32bit_be_signed, 'j>_'
-        it_behaves_like :string_unpack_32bit_be_signed, 'j_>'
-      end
+    describe "with modifier '<' and '_'" do
+      it_behaves_like :string_unpack_32bit_le, 'J<_'
+      it_behaves_like :string_unpack_32bit_le, 'J_<'
+      it_behaves_like :string_unpack_32bit_le_unsigned, 'J<_'
+      it_behaves_like :string_unpack_32bit_le_unsigned, 'J_<'
+    end
 
-      describe "with modifier '>' and '!'" do
-        it_behaves_like :string_unpack_32bit_be, 'j>!'
-        it_behaves_like :string_unpack_32bit_be, 'j!>'
-        it_behaves_like :string_unpack_32bit_be_signed, 'j>!'
-        it_behaves_like :string_unpack_32bit_be_signed, 'j!>'
-      end
+    describe "with modifier '<' and '!'" do
+      it_behaves_like :string_unpack_32bit_le, 'J<!'
+      it_behaves_like :string_unpack_32bit_le, 'J!<'
+      it_behaves_like :string_unpack_32bit_le_unsigned, 'J<!'
+      it_behaves_like :string_unpack_32bit_le_unsigned, 'J!<'
+    end
+
+    describe "with modifier '>' and '_'" do
+      it_behaves_like :string_unpack_32bit_be, 'J>_'
+      it_behaves_like :string_unpack_32bit_be, 'J_>'
+      it_behaves_like :string_unpack_32bit_be_unsigned, 'J>_'
+      it_behaves_like :string_unpack_32bit_be_unsigned, 'J_>'
+    end
+
+    describe "with modifier '>' and '!'" do
+      it_behaves_like :string_unpack_32bit_be, 'J>!'
+      it_behaves_like :string_unpack_32bit_be, 'J!>'
+      it_behaves_like :string_unpack_32bit_be_unsigned, 'J>!'
+      it_behaves_like :string_unpack_32bit_be_unsigned, 'J!>'
+    end
+  end
+
+  describe "String#unpack with format 'j'" do
+    describe "with modifier '<'" do
+      it_behaves_like :string_unpack_32bit_le, 'j<'
+      it_behaves_like :string_unpack_32bit_le_signed, 'j<'
+    end
+
+    describe "with modifier '>'" do
+      it_behaves_like :string_unpack_32bit_be, 'j>'
+      it_behaves_like :string_unpack_32bit_be_signed, 'j>'
+    end
+
+    describe "with modifier '<' and '_'" do
+      it_behaves_like :string_unpack_32bit_le, 'j<_'
+      it_behaves_like :string_unpack_32bit_le, 'j_<'
+      it_behaves_like :string_unpack_32bit_le_signed, 'j<_'
+      it_behaves_like :string_unpack_32bit_le_signed, 'j_<'
+    end
+
+    describe "with modifier '<' and '!'" do
+      it_behaves_like :string_unpack_32bit_le, 'j<!'
+      it_behaves_like :string_unpack_32bit_le, 'j!<'
+      it_behaves_like :string_unpack_32bit_le_signed, 'j<!'
+      it_behaves_like :string_unpack_32bit_le_signed, 'j!<'
+    end
+
+    describe "with modifier '>' and '_'" do
+      it_behaves_like :string_unpack_32bit_be, 'j>_'
+      it_behaves_like :string_unpack_32bit_be, 'j_>'
+      it_behaves_like :string_unpack_32bit_be_signed, 'j>_'
+      it_behaves_like :string_unpack_32bit_be_signed, 'j_>'
+    end
+
+    describe "with modifier '>' and '!'" do
+      it_behaves_like :string_unpack_32bit_be, 'j>!'
+      it_behaves_like :string_unpack_32bit_be, 'j!>'
+      it_behaves_like :string_unpack_32bit_be_signed, 'j>!'
+      it_behaves_like :string_unpack_32bit_be_signed, 'j!>'
     end
   end
 end