Updating Conformance Tests (#101)

conformance/runner.js

@@ -21,7 +21,6 @@ const path = require('path');
 const is = require('is');
 const through = require('through2');
 const googleProtoFiles = require('google-proto-files');
-const varint = require('varint');
 const protobufjs = require('protobufjs');
 const grpc = require('grpc');
 
@@ -44,30 +43,17 @@ function loadTestCases() {
   };
 
   const protoDefinition = protobufRoot.loadSync(
-    path.join(__dirname, 'test_definition.proto')
+    path.join(__dirname, 'test-definition.proto')
   );
 
   const binaryProtoData = require('fs').readFileSync(
-    path.join(__dirname, 'test_data.binprotos')
+    path.join(__dirname, 'test-suite.binproto')
   );
 
-  const testType = protoDefinition.lookupType('tests.Test');
+  const testType = protoDefinition.lookupType('tests.TestSuite');
+  const testSuite = testType.decode(binaryProtoData);
 
-  const testCases = [];
-
-  for (let offset = 0; offset < binaryProtoData.length; ) {
-    const messageLength = varint.decode(binaryProtoData, offset);
-    offset += varint.encodingLength(messageLength);
-
-    let testCase = testType.decode(
-      binaryProtoData.slice(offset, offset + messageLength)
-    );
-    testCases.push(testCase);
-
-    offset = offset + messageLength;
-  }
-
-  return testCases;
+  return testSuite.tests;
 }
 
 /** Converts a test object into a JS Object suitable for the Node API. */

conformance/test_definition.proto → conformance/test-definition.proto

@@ -4,9 +4,17 @@ syntax = "proto3";
 
 package tests;
 
+option csharp_namespace = "Google.Cloud.Firestore.Tests.Proto";
+option java_package = "com.google.cloud.firestore.conformance";
+
 import "google/firestore/v1beta1/firestore.proto";
 import "google/firestore/v1beta1/common.proto";
 
+// A collection of tests.
+message TestSuite {
+  repeated Test tests = 1;
+}
+
 // A Test describes a single client method call and its expected result.
 message Test {
   string description = 1; // short description of the test
@@ -96,4 +104,4 @@ message SetOption {
 // A field path.
 message FieldPath {
   repeated string field = 1;
-}
+}

package.json

@@ -80,7 +80,6 @@
     "prettier": "^1.9.2",
     "protobufjs": "^6.8.0",
     "proxyquire": "^1.7.11",
-    "typescript": "^2.5.2",
-    "varint": "^5.0.0"
+    "typescript": "^2.5.2"
   }
 }