Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allowing 101 listeners #256

Merged
merged 9 commits into from
Jul 13, 2018
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
124 changes: 64 additions & 60 deletions conformance/runner.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,20 +32,20 @@ const document = require('../src/document')(reference.DocumentReference);
const DocumentSnapshot = document.DocumentSnapshot;
const convert = require('../src/convert');
const ResourcePath = require('../src/path').ResourcePath;

const firestore = new Firestore({
projectId: 'projectID',
sslCreds: grpc.credentials.createInsecure(),
timestampsInSnapshots: true,
keyFilename: './test/fake-certificate.json',
});
const createInstanceHelper = require('../test/util/helpers').createInstance;

/** List of test cases that are ignored. */
const ignoredRe = [];

/** If non-empty, list the test cases to run exclusively. */
const exclusiveRe = [];

// The project ID used in the conformance test protos.
const CONFORMANCE_TEST_PROJECT_ID = 'projectID';

// Firestore instance initialized by the test runner.
let firestore;

const docRef = function(path) {
const relativePath = ResourcePath.fromSlashSeparatedString(path).relativeName;
return firestore.doc(relativePath);
Expand All @@ -56,8 +56,18 @@ const collRef = function(path) {
return firestore.collection(relativePath);
};

const watchQuery =
collRef('projects/projectID/databases/(default)/documents/C').orderBy('a');
const watchQuery = function() {
return firestore.collection('C').orderBy('a');
};

const createInstance = function(overrides) {
return createInstanceHelper(
overrides, {projectId: CONFORMANCE_TEST_PROJECT_ID})
.then(firestoreClient => {
firestore = firestoreClient;
});
};


/** Converts JSON test data into JavaScript types suitable for the Node API. */
const convertInput = {
Expand Down Expand Up @@ -154,7 +164,7 @@ const convertInput = {
}

return new Firestore.QuerySnapshot(
watchQuery, readTime, docs.length, () => docs, () => changes);
watchQuery(), readTime, docs.length, () => docs, () => changes);
},
};

Expand Down Expand Up @@ -279,9 +289,9 @@ function runTest(spec) {
console.log(`Running Spec:\n${JSON.stringify(spec, null, 2)}\n`);

const updateTest = function(spec) {
firestore._firestoreClient._innerApiCalls.commit = commitHandler(spec);
const overrides = {commit: commitHandler(spec)};

return Promise.resolve().then(() => {
return createInstance(overrides).then(() => {
let varargs = [];

if (spec.jsonData) {
Expand All @@ -305,7 +315,7 @@ function runTest(spec) {
};

const queryTest = function(spec) {
firestore._firestoreClient._innerApiCalls.runQuery = queryHandler(spec);
const overrides = {runQuery: queryHandler(spec)};

const applyClause = function(query, clause) {
if (clause.select) {
Expand Down Expand Up @@ -337,9 +347,8 @@ function runTest(spec) {
return query;
};

let query = collRef(spec.collPath);

return Promise.resolve().then(() => {
return createInstance(overrides).then(() => {
let query = collRef(spec.collPath);
for (let clause of spec.clauses) {
query = applyClause(query, clause);
}
Expand All @@ -348,9 +357,9 @@ function runTest(spec) {
};

const deleteTest = function(spec) {
firestore._firestoreClient._innerApiCalls.commit = commitHandler(spec);
const overrides = {commit: commitHandler(spec)};

return Promise.resolve().then(() => {
return createInstance(overrides).then(() => {
if (spec.precondition) {
const precondition = convertInput.precondition(deleteSpec.precondition);
return docRef(spec.docRefPath).delete(precondition);
Expand All @@ -361,9 +370,9 @@ function runTest(spec) {
};

const setTest = function(spec) {
firestore._firestoreClient._innerApiCalls.commit = commitHandler(spec);
const overrides = {commit: commitHandler(spec)};

return Promise.resolve().then(() => {
return createInstance(overrides).then(() => {
const setOption = {};

if (spec.option && spec.option.all) {
Expand All @@ -381,19 +390,18 @@ function runTest(spec) {
};

const createTest = function(spec) {
firestore._firestoreClient._innerApiCalls.commit = commitHandler(spec);
const overrides = {commit: commitHandler(spec)};

return Promise.resolve().then(() => {
return createInstance(overrides).then(() => {
return docRef(spec.docRefPath)
.create(convertInput.argument(spec.jsonData));
});
};

const getTest = function(spec) {
firestore._firestoreClient._innerApiCalls.batchGetDocuments =
getHandler(spec);
const overrides = {batchGetDocuments: getHandler(spec)};

return Promise.resolve().then(() => {
return createInstance(overrides).then(() => {
return docRef(spec.docRefPath).get();
});
};
Expand All @@ -403,38 +411,38 @@ function runTest(spec) {

const writeStream = through.obj();

firestore._firestoreClient._innerApiCalls.listen = () => {
return duplexify.obj(through.obj(), writeStream);
};

return new Promise((resolve, reject) => {
const unlisten = watchQuery.onSnapshot(
actualSnap => {
const expectedSnapshot = expectedSnapshots.shift();
if (expectedSnapshot) {
if (!actualSnap.isEqual(
convertInput.snapshot(expectedSnapshot))) {
reject(
new Error('Expected and actual snapshots do not match.'));
}

if (expectedSnapshots.length === 0 || !spec.isError) {
unlisten();
resolve();
const overrides = {listen: () => duplexify.obj(through.obj(), writeStream)};

return createInstance(overrides).then(() => {
return new Promise((resolve, reject) => {
const unlisten = watchQuery().onSnapshot(
actualSnap => {
const expectedSnapshot = expectedSnapshots.shift();
if (expectedSnapshot) {
if (!actualSnap.isEqual(
convertInput.snapshot(expectedSnapshot))) {
reject(
new Error('Expected and actual snapshots do not match.'));
}

if (expectedSnapshots.length === 0 || !spec.isError) {
unlisten();
resolve();
}
} else {
reject(new Error('Received unexpected snapshot'));
}
} else {
reject(new Error('Received unexpected snapshot'));
}
},
err => {
assert.equal(expectedSnapshots.length, 0);
unlisten();
reject(err);
});

for (const response of spec.responses) {
writeStream.write(convertProto.listenRequest(response));
}
},
err => {
assert.equal(expectedSnapshots.length, 0);
unlisten();
reject(err);
});

for (const response of spec.responses) {
writeStream.write(convertProto.listenRequest(response));
}
});
});
};

Expand Down Expand Up @@ -509,10 +517,6 @@ describe('Conformance Tests', function() {
return testSuite.tests;
};

before(() => {
firestore._ensureClient();
});

for (let testCase of loadTestCases()) {
const isIgnored = ignoredRe.find(re => re.test(testCase.description));
const isExclusive = exclusiveRe.find(re => re.test(testCase.description));
Expand Down
Loading