fix test.kbase

kbase · Feb 16, 2024 · 8a08e64 · 8a08e64
1 parent e1a3897
commit 8a08e64
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/src/us/kbase/workspace/test/kbase/JSONRPCLayerTester.java b/src/us/kbase/workspace/test/kbase/JSONRPCLayerTester.java
@@ -87,7 +87,9 @@
 import com.fasterxml.jackson.core.JsonParseException;
 import com.fasterxml.jackson.databind.JsonMappingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.mongodb.MongoClient;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 
 /*
@@ -538,7 +540,7 @@ public static void tearDownClass() throws Exception {
 
 	@Before
 	public void clearDB() throws Exception {
-		try (final MongoClient mcli = new MongoClient("localhost:" + mongo.getServerPort())) {
+		try (final MongoClient mcli = MongoClients.create("mongodb://localhost:" + mongo.getServerPort())) {
 			for (final String name: list(DB_WS_NAME_1, DB_WS_NAME_2, DB_WS_NAME_AUTH2_ADMINS)) {
 				final MongoDatabase wsdb = mcli.getDatabase(name);
 				TestCommon.destroyDB(wsdb);

diff --git a/src/us/kbase/workspace/test/kbase/LoggingTest.java b/src/us/kbase/workspace/test/kbase/LoggingTest.java
@@ -52,7 +52,8 @@
 import us.kbase.workspace.database.DynamicConfig;
 import us.kbase.workspace.test.WorkspaceServerThread;
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 
 /** Tests application logging only - not the standard logging that comes with
@@ -221,7 +222,7 @@ public static void tearDownClass() throws Exception {
 	@Before
 	public void clearDB() throws Exception {
 		logout.reset();
-		try (final MongoClient mcli = new MongoClient("localhost:" + mongo.getServerPort())) {
+		try (final MongoClient mcli = MongoClients.create("mongodb://localhost:" + mongo.getServerPort())) {
 			final MongoDatabase wsdb = mcli.getDatabase(DB_WS_NAME);
 			TestCommon.destroyDB(wsdb);
 			wsdb.getCollection("dyncfg").insertOne(

diff --git a/src/us/kbase/workspace/test/kbase/SampleServiceIntegrationTest.java b/src/us/kbase/workspace/test/kbase/SampleServiceIntegrationTest.java
@@ -30,7 +30,9 @@
 import com.arangodb.model.CollectionCreateOptions;
 import com.github.zafarkhaja.semver.Version;
 import com.google.common.collect.ImmutableMap;
-import com.mongodb.MongoClient;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 
 import us.kbase.auth.AuthToken;
@@ -310,7 +312,7 @@ public static void tearDownClass() throws Exception {
 
 	@Before
 	public void clearDB() throws Exception {
-		try (final MongoClient cli = new MongoClient("localhost:" + MONGO.getServerPort())) {
+		try (final MongoClient cli = MongoClients.create("mongodb://localhost:" + MONGO.getServerPort())) {
 			final MongoDatabase db = cli.getDatabase(WS_DB);
 			TestCommon.destroyDB(db);
 			db.getCollection("dyncfg").insertOne(

diff --git a/src/us/kbase/workspace/test/kbase/SchemaUpdaterCLITest.java b/src/us/kbase/workspace/test/kbase/SchemaUpdaterCLITest.java
@@ -27,7 +27,7 @@
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
-import com.mongodb.MongoClient;
+import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoDatabase;
 
 import us.kbase.common.test.MapBuilder;

diff --git a/src/us/kbase/workspace/test/kbase/TypeDelegationTest.java b/src/us/kbase/workspace/test/kbase/TypeDelegationTest.java
@@ -22,7 +22,9 @@
 import org.junit.Test;
 
 import com.google.common.collect.ImmutableMap;
-import com.mongodb.MongoClient;
+
+import com.mongodb.client.MongoClient;
+import com.mongodb.client.MongoClients;
 import com.mongodb.client.MongoDatabase;
 
 import us.kbase.auth.AuthToken;
@@ -252,7 +254,7 @@ public static void tearDownClass() throws Exception {
 	@Before
 	public void clearDB() throws Exception {
 		// since we're testing types, we nuke the type database as well as the workspace db
-		try (final MongoClient mcli = new MongoClient("localhost:" + MONGO.getServerPort())) {
+		try (final MongoClient mcli = MongoClients.create("mongodb://localhost:" + MONGO.getServerPort())) {
 			for (final String name: list(
 					DB_NAME_WS, DB_NAME_WS_TYPES, DB_NAME_WS_REMOTE, DB_NAME_WS_REMOTE_TYPES)) {
 				final MongoDatabase wsdb = mcli.getDatabase(name);