Merge pull request #537

Author: jmikola

tests/GridFS/spec-tests/delete.json

@@ -13,11 +13,8 @@
         "md5": "d41d8cd98f00b204e9800998ecf8427e",
         "filename": "length-0",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -31,11 +28,8 @@
         "md5": "d41d8cd98f00b204e9800998ecf8427e",
         "filename": "length-0-with-empty-chunk",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -49,11 +43,8 @@
         "md5": "c700ed4fdb1d27055aa3faa2c2432283",
         "filename": "length-2",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -67,11 +58,8 @@
         "md5": "dd254cdc958e53abaa67da9f797125f5",
         "filename": "length-8",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       }
     ],
     "chunks": [
@@ -295,22 +283,9 @@
                 "limit": 1
               }
             ]
-          },
-          {
-            "delete": "expected.chunks",
-            "deletes": [
-              {
-                "q": {
-                  "files_id": {
-                    "$oid": "000000000000000000000004"
-                  }
-                },
-                "limit": 0
-              }
-            ]
           }
         ]
       }
     }
   ]
-}
+}

tests/GridFS/spec-tests/download.json

@@ -13,11 +13,8 @@
         "md5": "d41d8cd98f00b204e9800998ecf8427e",
         "filename": "length-0",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -31,11 +28,8 @@
         "md5": "d41d8cd98f00b204e9800998ecf8427e",
         "filename": "length-0-with-empty-chunk",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -49,11 +43,8 @@
         "md5": "c700ed4fdb1d27055aa3faa2c2432283",
         "filename": "length-2",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -67,11 +58,8 @@
         "md5": "dd254cdc958e53abaa67da9f797125f5",
         "filename": "length-8",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -85,11 +73,22 @@
         "md5": "57d83cd477bfb1ccd975ab33d827a92b",
         "filename": "length-10",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
+      },
+      {
+        "_id": {
+          "$oid": "000000000000000000000006"
+        },
+        "length": 2,
+        "chunkSize": 4,
+        "uploadDate": {
+          "$date": "1970-01-01T00:00:00.000Z"
+        },
+        "md5": "c700ed4fdb1d27055aa3faa2c2432283",
+        "contentType": "application/octet-stream",
+        "aliases": [],
+        "metadata": {}
       }
     ],
     "chunks": [
@@ -176,6 +175,18 @@
         "data": {
           "$hex": "99aa"
         }
+      },
+      {
+        "_id": {
+          "$oid": "000000000000000000000008"
+        },
+        "files_id": {
+          "$oid": "000000000000000000000006"
+        },
+        "n": 0,
+        "data": {
+          "$hex": "1122"
+        }
       }
     ]
   },
@@ -188,8 +199,7 @@
           "id": {
             "$oid": "000000000000000000000001"
           },
-          "options": {
-          }
+          "options": {}
         }
       },
       "assert": {
@@ -206,8 +216,7 @@
           "id": {
             "$oid": "000000000000000000000002"
           },
-          "options": {
-          }
+          "options": {}
         }
       },
       "assert": {
@@ -224,8 +233,7 @@
           "id": {
             "$oid": "000000000000000000000003"
           },
-          "options": {
-          }
+          "options": {}
         }
       },
       "assert": {
@@ -242,8 +250,7 @@
           "id": {
             "$oid": "000000000000000000000004"
           },
-          "options": {
-          }
+          "options": {}
         }
       },
       "assert": {
@@ -260,8 +267,7 @@
           "id": {
             "$oid": "000000000000000000000005"
           },
-          "options": {
-          }
+          "options": {}
         }
       },
       "assert": {
@@ -278,8 +284,7 @@
           "id": {
             "$oid": "000000000000000000000000"
           },
-          "options": {
-          }
+          "options": {}
         }
       },
       "assert": {
@@ -440,6 +445,23 @@
       "assert": {
         "error": "ChunkIsWrongSize"
       }
+    },
+    {
+      "description": "Download legacy file with no name",
+      "act": {
+        "operation": "download",
+        "arguments": {
+          "id": {
+            "$oid": "000000000000000000000006"
+          },
+          "options": {}
+        }
+      },
+      "assert": {
+        "result": {
+          "$hex": "1122"
+        }
+      }
     }
   ]
-}
+}

tests/GridFS/spec-tests/download_by_name.json

@@ -13,11 +13,8 @@
         "md5": "47ed733b8d10be225eceba344d533586",
         "filename": "abc",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -31,11 +28,8 @@
         "md5": "b15835f133ff2e27c7cb28117bfae8f4",
         "filename": "abc",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -49,11 +43,8 @@
         "md5": "eccbc87e4b5ce2fe28308fd9f2a7baf3",
         "filename": "abc",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -67,11 +58,8 @@
         "md5": "f623e75af30e62bbd73d6df5b50bb7b5",
         "filename": "abc",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       },
       {
         "_id": {
@@ -85,11 +73,8 @@
         "md5": "4c614360da93c0a041b22e537de151eb",
         "filename": "abc",
         "contentType": "application/octet-stream",
-        "aliases": [
-
-        ],
-        "metadata": {
-        }
+        "aliases": [],
+        "metadata": {}
       }
     ],
     "chunks": [
@@ -252,4 +237,4 @@
       }
     }
   ]
-}
+}

tests/GridFS/spec-tests/upload.json

@@ -1,11 +1,7 @@
 {
   "data": {
-    "files": [
-
-    ],
-    "chunks": [
-
-    ]
+    "files": [],
+    "chunks": []
   },
   "tests": [
     {
@@ -388,4 +384,4 @@
       }
     }
   ]
-}
+}