JAVA-2363: Fix logic that verifies the contents of a string when reading JSON

Author: jyemin

bson/src/main/org/bson/json/JsonReader.java

@@ -505,7 +505,7 @@ private void verifyString(final String expected) {
         JsonToken token = popToken();
         JsonTokenType type = token.getType();
 
-        if ((type != JsonTokenType.STRING && type != JsonTokenType.UNQUOTED_STRING) && !expected.equals(token.getValue())) {
+        if ((type != JsonTokenType.STRING && type != JsonTokenType.UNQUOTED_STRING) || !expected.equals(token.getValue())) {
             throw new JsonParseException("JSON reader expected '%s' but found '%s'.", expected, token.getValue());
         }
     }

bson/src/test/unit/org/bson/json/JsonReaderTest.java

@@ -628,6 +628,19 @@ public void testTimestampStrict() {
         assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
     }
 
+    @Test
+    public void testTimestampStrictWithOutOfOrderFields() {
+        String json = "{ \"$timestamp\" : { \"i\" : 1, \"t\" : 1234 } }";
+        bsonReader = new JsonReader(json);
+
+        try {
+            bsonReader.readBsonType();
+            fail("Should have failed to read timestamp with fields not in expected order");
+        } catch (JsonParseException e) {
+            // all good
+        }
+    }
+
     @Test
     public void testTimestampShell() {
         String json = "Timestamp(1234, 1)";