bson 4.15.0-java → 5.0.0-java

data/spec/spec_tests/data/corpus/code.json

@@ -20,48 +20,48 @@
         },
         {
             "description": "two-byte UTF-8 (\u00e9)",
-            "canonical_bson": "190000000261000D000000C3A9C3A9C3A9C3A9C3A9C3A90000",
-            "canonical_extjson": "{\"a\" : \"\\u00e9\\u00e9\\u00e9\\u00e9\\u00e9\\u00e9\"}"
+            "canonical_bson": "190000000D61000D000000C3A9C3A9C3A9C3A9C3A9C3A90000",
+            "canonical_extjson": "{\"a\" : {\"$code\" : \"\\u00e9\\u00e9\\u00e9\\u00e9\\u00e9\\u00e9\"}}"
         },
         {
             "description": "three-byte UTF-8 (\u2606)",
-            "canonical_bson": "190000000261000D000000E29886E29886E29886E298860000",
-            "canonical_extjson": "{\"a\" : \"\\u2606\\u2606\\u2606\\u2606\"}"
+            "canonical_bson": "190000000D61000D000000E29886E29886E29886E298860000",
+            "canonical_extjson": "{\"a\" : {\"$code\" : \"\\u2606\\u2606\\u2606\\u2606\"}}"
         },
         {
             "description": "Embedded nulls",
-            "canonical_bson": "190000000261000D0000006162006261620062616261620000",
-            "canonical_extjson": "{\"a\" : \"ab\\u0000bab\\u0000babab\"}"
+            "canonical_bson": "190000000D61000D0000006162006261620062616261620000",
+            "canonical_extjson": "{\"a\" : {\"$code\" : \"ab\\u0000bab\\u0000babab\"}}"
         }
     ],
     "decodeErrors": [
         {
             "description": "bad code string length: 0 (but no 0x00 either)",
-            "bson": "0C0000000261000000000000"
+            "bson": "0C0000000D61000000000000"
         },
         {
             "description": "bad code string length: -1",
-            "bson": "0C000000026100FFFFFFFF00"
+            "bson": "0C0000000D6100FFFFFFFF00"
         },
         {
             "description": "bad code string length: eats terminator",
-            "bson": "10000000026100050000006200620000"
+            "bson": "100000000D6100050000006200620000"
         },
         {
             "description": "bad code string length: longer than rest of document",
-            "bson": "120000000200FFFFFF00666F6F6261720000"
+            "bson": "120000000D00FFFFFF00666F6F6261720000"
         },
         {
             "description": "code string is not null-terminated",
-            "bson": "1000000002610004000000616263FF00"
+            "bson": "100000000D610004000000616263FF00"
         },
         {
             "description": "empty code string, but extra null",
-            "bson": "0E00000002610001000000000000"
+            "bson": "0E0000000D610001000000000000"
         },
         {
             "description": "invalid UTF-8",
-            "bson": "0E00000002610002000000E90000"
+            "bson": "0E0000000D610002000000E90000"
         }
     ]
 }

data/spec/spec_tests/data/corpus/decimal128-4.json

@@ -112,6 +112,54 @@
        {
           "description": "[basx563] Near-specials (Conversion_syntax)",
           "string": "NaNs"
+       },
+       {
+          "description": "[dqbas939] overflow results at different rounding modes (Overflow & Inexact & Rounded)",
+          "string": "-7e10000"
+       },
+       {
+          "description": "[dqbsr534] negatives (Rounded & Inexact)",
+          "string": "-1.11111111111111111111111111111234650"
+       },
+       {
+          "description": "[dqbsr535] negatives (Rounded & Inexact)",
+          "string": "-1.11111111111111111111111111111234551"
+       },
+       {
+          "description": "[dqbsr533] negatives (Rounded & Inexact)",
+          "string": "-1.11111111111111111111111111111234550"
+       },
+       {
+          "description": "[dqbsr532] negatives (Rounded & Inexact)",
+          "string": "-1.11111111111111111111111111111234549"
+       },
+       {
+          "description": "[dqbsr432] check rounding modes heeded (Rounded & Inexact)",
+          "string": "1.11111111111111111111111111111234549"
+       },
+       {
+          "description": "[dqbsr433] check rounding modes heeded (Rounded & Inexact)",
+          "string": "1.11111111111111111111111111111234550"
+       },
+       {
+          "description": "[dqbsr435] check rounding modes heeded (Rounded & Inexact)",
+          "string": "1.11111111111111111111111111111234551"
+       },
+       {
+          "description": "[dqbsr434] check rounding modes heeded (Rounded & Inexact)",
+          "string": "1.11111111111111111111111111111234650"
+       },
+       {
+          "description": "[dqbas938] overflow results at different rounding modes (Overflow & Inexact & Rounded)",
+          "string": "7e10000"
+       },
+       {
+          "description": "Inexact rounding#1",
+          "string": "100000000000000000000000000000000000000000000000000000000001"
+       },
+       {
+          "description": "Inexact rounding#2",
+          "string": "1E-6177"
        }
     ]
 }

data/spec/spec_tests/data/corpus/decimal128-6.json

@@ -75,6 +75,18 @@
             "description": "Empty string",
             "string": ""
         },
+        {
+            "description": "leading white space positive number",
+            "string": " 1"
+        },
+        {
+            "description": "leading white space negative number",
+            "string": " -1"
+        },
+        {
+            "description": "trailing white space",
+            "string": "1 "
+        },
         {
             "description": "Invalid",
             "string": "E"

data/spec/spec_tests/data/corpus/decimal128-7.json

@@ -267,6 +267,10 @@
           "description": "[basx570] Near-specials (Conversion_syntax)",
           "string": "9Inf"
        },
+       {
+          "description": "[basx512] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
+          "string": "12 "
+       },
        {
           "description": "[basx517] The 'baddies' tests from DiagBigDecimal, plus some new ones (Conversion_syntax)",
           "string": "12-"

data/spec/spec_tests/data/corpus/document.json

@@ -17,6 +17,26 @@
             "description": "Single-character key subdoc",
             "canonical_bson": "160000000378000E0000000261000200000062000000",
             "canonical_extjson": "{\"x\" : {\"a\" : \"b\"}}"
+        },
+        {
+            "description": "Dollar-prefixed key in sub-document",
+            "canonical_bson": "170000000378000F000000022461000200000062000000",
+            "canonical_extjson": "{\"x\" : {\"$a\" : \"b\"}}"
+        },
+        {
+            "description": "Dollar as key in sub-document",
+            "canonical_bson": "160000000378000E0000000224000200000061000000",
+            "canonical_extjson": "{\"x\" : {\"$\" : \"a\"}}"
+        },
+        {
+            "description": "Dotted key in sub-document",
+            "canonical_bson": "180000000378001000000002612E62000200000063000000",
+            "canonical_extjson": "{\"x\" : {\"a.b\" : \"c\"}}"
+        },
+        {
+            "description": "Dot as key in sub-document",
+            "canonical_bson": "160000000378000E000000022E000200000061000000",
+            "canonical_extjson": "{\"x\" : {\".\" : \"a\"}}"
         }
     ],
     "decodeErrors": [

data/spec/spec_tests/data/corpus/symbol.json

@@ -50,31 +50,31 @@
     "decodeErrors": [
         {
             "description": "bad symbol length: 0 (but no 0x00 either)",
-            "bson": "0C0000000261000000000000"
+            "bson": "0C0000000E61000000000000"
         },
         {
             "description": "bad symbol length: -1",
-            "bson": "0C000000026100FFFFFFFF00"
+            "bson": "0C0000000E6100FFFFFFFF00"
         },
         {
             "description": "bad symbol length: eats terminator",
-            "bson": "10000000026100050000006200620000"
+            "bson": "100000000E6100050000006200620000"
         },
         {
             "description": "bad symbol length: longer than rest of document",
-            "bson": "120000000200FFFFFF00666F6F6261720000"
+            "bson": "120000000E00FFFFFF00666F6F6261720000"
         },
         {
             "description": "symbol is not null-terminated",
-            "bson": "1000000002610004000000616263FF00"
+            "bson": "100000000E610004000000616263FF00"
         },
         {
             "description": "empty symbol, but extra null",
-            "bson": "0E00000002610001000000000000"
+            "bson": "0E0000000E610001000000000000"
         },
         {
             "description": "invalid UTF-8",
-            "bson": "0E00000002610002000000E90000"
+            "bson": "0E0000000E610002000000E90000"
         }
     ]
 }

data/spec/spec_tests/data/corpus/top.json

@@ -3,9 +3,24 @@
     "bson_type": "0x00",
     "valid": [
         {
-            "description": "Document with keys that start with $",
+            "description": "Dollar-prefixed key in top-level document",
             "canonical_bson": "0F00000010246B6579002A00000000",
             "canonical_extjson": "{\"$key\": {\"$numberInt\": \"42\"}}"
+        },
+        {
+            "description": "Dollar as key in top-level document",
+            "canonical_bson": "0E00000002240002000000610000",
+            "canonical_extjson": "{\"$\": \"a\"}"
+        },
+        {
+            "description": "Dotted key in top-level document",
+            "canonical_bson": "1000000002612E620002000000630000",
+            "canonical_extjson": "{\"a.b\": \"c\"}"
+        },
+        {
+            "description": "Dot as key in top-level document",
+            "canonical_bson": "0E000000022E0002000000610000",
+            "canonical_extjson": "{\".\": \"a\"}"
         }
     ],
     "decodeErrors": [
@@ -77,11 +92,11 @@
         },
         {
             "description": "Bad $regularExpression (pattern is number, not string)",
-            "string": "{\"x\" : {\"$regularExpression\" : { \"pattern\": 42, \"$options\" : \"\"}}}"
+            "string": "{\"x\" : {\"$regularExpression\" : { \"pattern\": 42, \"options\" : \"\"}}}"
         },
         {
             "description": "Bad $regularExpression (options are number, not string)",
-            "string": "{\"x\" : {\"$regularExpression\" : { \"pattern\": \"a\", \"$options\" : 0}}}"
+            "string": "{\"x\" : {\"$regularExpression\" : { \"pattern\": \"a\", \"options\" : 0}}}"
         },
         {
             "description" : "Bad $regularExpression (missing pattern field)",

data/spec/support/shared_examples.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 # Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -63,6 +64,28 @@ shared_examples_for "a JSON serializable object" do
   end
 end
 
+shared_examples_for "an Extended JSON serializable object" do
+
+  it "serializes the Extended JSON from #as_extended_json" do
+    expect(object.to_extended_json).to eq(object.as_extended_json.to_json)
+  end
+end
+
+shared_examples_for '#as_extended_json returns self' do
+
+  it 'returns self' do
+    expect(object.as_extended_json).to eq(object)
+  end
+end
+
+shared_examples_for '#as_json calls #as_extended_json' do
+
+  it 'calls #as_extended_json' do
+    expect(object).to receive(:as_extended_json).with(no_args)
+    object.as_json
+  end
+end
+
 shared_examples_for "immutable when frozen" do |block|
 
   context "when the document is frozen" do
@@ -122,7 +145,7 @@ shared_examples_for "a validated BSON key" do
     end
   end
 
-  context "when the string is invalid" do
+  context "when the string has dots/dollars" do
 
     context "when the string starts with $" do
 
@@ -130,10 +153,10 @@ shared_examples_for "a validated BSON key" do
         "$testing"
       end
 
-      it "raises an exception" do
+      it "does not raise an exception" do
         expect {
           validated
-        }.to raise_error(BSON::String::IllegalKey)
+        }.to_not raise_error
       end
     end
 
@@ -143,10 +166,10 @@ shared_examples_for "a validated BSON key" do
         "testing.testing"
       end
 
-      it "raises an exception" do
+      it "does not raise an exception" do
         expect {
           validated
-        }.to raise_error(BSON::String::IllegalKey)
+        }.to_not raise_error
       end
     end
   end

data/spec/support/spec_config.rb

@@ -1,3 +1,4 @@
+# rubocop:todo all
 require 'singleton'
 
 class SpecConfig

data/spec/support/utils.rb

@@ -1,10 +1,58 @@
+# rubocop:todo all
 module Utils
+  extend self
+
   # JRuby chokes when strings like "\xfe\x00\xff", which are not valid UTF-8,
   # appear in the source. Use this method to build such strings.
   # char_array is an array of byte values to use for the string.
-  module_function def make_byte_string(char_array, encoding = 'BINARY')
+  def make_byte_string(char_array, encoding = 'BINARY')
     char_array.map do |char|
       char.chr.force_encoding('BINARY')
     end.join.force_encoding(encoding)
   end
+
+  # Forks the current process and executes the given block in the child.
+  # The value returned by the block is then returned in the parent process
+  # by this method.
+  #
+  # @return [ Object ] the value returned by the block
+  def perform_in_child(&block)
+    reader, writer = IO.pipe
+
+    if fork
+      parent_worker(reader, writer)
+    else
+      child_worker(reader, writer, &block)
+    end
+  end
+
+  private
+
+  # A utility method for #perform_in_child, to handle tasks for the parent
+  # side of the fork.
+  #
+  # @param [ IO ] reader The reader IO for the pipe
+  # @param [ IO ] writer The writer IO for the pipe
+  #
+  # @return [ Object ] the value returned by the child process
+  def parent_worker(reader, writer)
+    writer.close
+    blob = reader.read
+    reader.close
+    Process.wait
+    Marshal.load(blob)
+  end
+
+  # A utility method for #perform_in_child, to handle tasks for the child
+  # side of the fork.
+  #
+  # @param [ IO ] reader The reader IO for the pipe
+  # @param [ IO ] writer The writer IO for the pipe
+  def child_worker(reader, writer, &block)
+    reader.close
+    result = block.call
+    writer.write Marshal.dump(result)
+    writer.close
+    exit! 0
+  end
 end