refactor(NODE-3717): Test reorg part 7 (#3093)

baileympearson · web-flow · commit 00be68fbc3b6 · 2022-01-06T16:27:16.000-05:00
diff --git a/test/functional/replicaset_mock.test.js b/test/functional/replicaset_mock.test.js
diff --git a/test/integration/auth/saslprep.test.js b/test/integration/auth/saslprep.test.js
@@ -1,7 +1,6 @@
 'use strict';
 
-const setupDatabase = require('./shared').setupDatabase;
-const withClient = require('./shared').withClient;
+const { setupDatabase, withClient } = require('../shared');
 
 describe('SASLPrep', function () {
   // Step 4
diff --git a/test/integration/auth/scram_sha_1.test.js b/test/integration/auth/scram_sha_1.test.js
@@ -1,9 +1,9 @@
 'use strict';
-var test = require('./shared').assert;
-var setupDatabase = require('./shared').setupDatabase;
-const { MongoClient } = require('../../src');
+const { MongoClient } = require('../../../src');
 const { expect } = require('chai');
 
+const { assert: test, setupDatabase } = require('../shared');
+
 describe('SCRAM', function () {
   before(function () {
     return setupDatabase(this.configuration);
diff --git a/test/integration/auth/scram_sha_256.test.js b/test/integration/auth/scram_sha_256.test.js
@@ -2,10 +2,10 @@
 
 const sinon = require('sinon');
 const { expect } = require('chai');
-const { Connection } = require('../../src/cmap/connection');
-const { ScramSHA256 } = require('../../src/cmap/auth/scram');
-const { setupDatabase, withClient } = require('./shared');
-const { LEGACY_HELLO_COMMAND } = require('../../src/constants');
+const { Connection } = require('../../../src/cmap/connection');
+const { ScramSHA256 } = require('../../../src/cmap/auth/scram');
+const { setupDatabase, withClient } = require('../shared');
+const { LEGACY_HELLO_COMMAND } = require('../../../src/constants');
 
 describe('SCRAM-SHA-256 auth', function () {
   const test = {};
diff --git a/test/integration/auth/ssl_x509_connect.test.js b/test/integration/auth/ssl_x509_connect.test.js
@@ -1,10 +1,9 @@
 'use strict';
-var fs = require('fs');
-var f = require('util').format;
-var test = require('./shared').assert;
-var setupDatabase = require('./shared').setupDatabase;
+const fs = require('fs');
+const { format: f } = require('util');
+const { test, setupDatabase } = require('../shared');
 const { expect } = require('chai');
-const { MongoClient } = require('../../src');
+const { MongoClient } = require('../../../src');
 
 describe('SSL (x509)', function () {
   before(function () {
diff --git a/test/integration/crud/pk_factory.test.js b/test/integration/crud/pk_factory.test.js
@@ -1,9 +1,9 @@
 'use strict';
 const { expect } = require('chai');
-var setupDatabase = require('./shared').setupDatabase;
-const { ObjectId } = require('../../src');
+var setupDatabase = require('../../functional/shared').setupDatabase;
+const { ObjectId } = require('../../../src');
 
-describe('Custom PK', function () {
+describe('PkFactory', function () {
   before(function () {
     return setupDatabase(this.configuration);
   });
diff --git a/test/integration/node-specific/bson-options/promote_buffers.test.js b/test/integration/node-specific/bson-options/promote_buffers.test.js
@@ -1,7 +1,7 @@
 'use strict';
-var test = require('./shared').assert;
 const { expect } = require('chai');
-var setupDatabase = require('./shared').setupDatabase;
+
+const { assert: test, setupDatabase } = require('../../shared');
 
 describe('Promote Buffers', function () {
   before(function () {
diff --git a/test/integration/node-specific/bson-options/promote_values.test.js b/test/integration/node-specific/bson-options/promote_values.test.js
@@ -1,8 +1,7 @@
 'use strict';
-var test = require('./shared').assert;
 const { expect } = require('chai');
-var setupDatabase = require('./shared').setupDatabase;
-const { Long, Int32, Double } = require('../../src');
+const { Long, Int32, Double } = require('../../../../src');
+const { assert: test, setupDatabase } = require('../../shared');
 
 describe('Promote Values', function () {
   before(function () {
diff --git a/test/integration/node-specific/bson-options/raw.test.js b/test/integration/node-specific/bson-options/raw.test.js
@@ -1,5 +1,5 @@
 'use strict';
-const { assert: test, setupDatabase } = require('./shared');
+const { assert: test, setupDatabase } = require('../../shared');
 const { Buffer } = require('buffer');
 const { expect } = require('chai');
 
diff --git a/test/integration/server-discovery-and-monitoring/sharding_connection.test.js b/test/integration/server-discovery-and-monitoring/sharding_connection.test.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const { withClient, setupDatabase } = require('./shared');
+const { withClient, setupDatabase } = require('../shared');
 const { expect } = require('chai');
-const { TopologyType } = require('../../src/sdam/common');
+const { TopologyType } = require('../../../src/sdam/common');
 
 describe('Sharding (Connection)', function () {
   before(function () {
diff --git a/test/integration/server-selection/readpreference.test.js b/test/integration/server-selection/readpreference.test.js
@@ -1,13 +1,11 @@
 'use strict';
 
-const test = require('./shared').assert;
-const setupDatabase = require('./shared').setupDatabase;
-const withMonitoredClient = require('./shared').withMonitoredClient;
-const { ReadPreference, Topology } = require('../../src');
-const { withClient } = require('./shared');
+const { ReadPreference, Topology } = require('../../../src');
 const chai = require('chai');
 chai.use(require('chai-subset'));
 
+const { assert: test, setupDatabase, withClient, withMonitoredClient } = require('../shared');
+
 const expect = chai.expect;
 
 describe('ReadPreference', function () {
