From ad360abb27934d368fb92d9ef7dc737f0d0129c9 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Tue, 11 Aug 2020 12:40:16 -0500 Subject: [PATCH 01/36] Started working on MongoDB functionality. create MongoDBConfig class Created tests for MongoDBConfig class, all tests pass --- jmaqs-mongoDB/config.xml | 41 ++++++++++++++ jmaqs-mongoDB/pom.xml | 38 +++++++++++++ .../MongoDBConfig.java | 54 +++++++++++++++++++ .../MongoDBConfigUnitTests.java | 50 +++++++++++++++++ .../jmaqs/utilities/helper/ConfigSection.java | 5 ++ .../utilities/helper/TestCategories.java | 5 ++ pom.xml | 1 + 7 files changed, 194 insertions(+) create mode 100644 jmaqs-mongoDB/config.xml create mode 100644 jmaqs-mongoDB/pom.xml create mode 100644 jmaqs-mongoDB/src/main/java/com.magenic.jmaqs.mongoDB/MongoDBConfig.java create mode 100644 jmaqs-mongoDB/src/test/java/com.magenic.jmaqs.mongoDB/MongoDBConfigUnitTests.java diff --git a/jmaqs-mongoDB/config.xml b/jmaqs-mongoDB/config.xml new file mode 100644 index 000000000..8a3179607 --- /dev/null +++ b/jmaqs-mongoDB/config.xml @@ -0,0 +1,41 @@ + + + + + + 100 + + + 10000 + + + YES + + + VERBOSE + + + TXT + + + ./target/logs + + + mongodb://localhost:27017 + MongoDatabaseTest + MongoTestCollection + 30 + + diff --git a/jmaqs-mongoDB/pom.xml b/jmaqs-mongoDB/pom.xml new file mode 100644 index 000000000..83eb27314 --- /dev/null +++ b/jmaqs-mongoDB/pom.xml @@ -0,0 +1,38 @@ + + + 4.0.0 + + com.magenic.jmaqs + jmaqs-framework + ${revision} + + com.magenic.jmaqs.mongoDB + jmaqs-mongoDB + JMAQS MongoDB Database Testing Module + + + + + com.magenic.jmaqs.base + jmaqs-base + ${project.version} + + + com.magenic.jmaqs.utilities + jmaqs-utilities + ${project.version} + compile + + + org.mongodb + mongo-java-driver + 3.4.1 + + + org.testng + testng + + + diff --git a/jmaqs-mongoDB/src/main/java/com.magenic.jmaqs.mongoDB/MongoDBConfig.java b/jmaqs-mongoDB/src/main/java/com.magenic.jmaqs.mongoDB/MongoDBConfig.java new file mode 100644 index 000000000..25074a2eb --- /dev/null +++ b/jmaqs-mongoDB/src/main/java/com.magenic.jmaqs.mongoDB/MongoDBConfig.java @@ -0,0 +1,54 @@ +/* + * Copyright 2020 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.mongoDB; + +import com.magenic.jmaqs.utilities.helper.Config; +import com.magenic.jmaqs.utilities.helper.ConfigSection; + +/** + * MongoDB config class + */ +public class MongoDBConfig { + + private MongoDBConfig() {} + + /** + * The MongoDB configuration section. + */ + private static final ConfigSection MONGO_SECTION = ConfigSection.MONGO_MAQS; + + /** + * Get the client connection string. + * @return The connection type + */ + public static String getConnectionString() { + return Config.getValueForSection(MONGO_SECTION, "MongoConnectionString"); + } + + /** + * Get the database connection string + * @return The database name + */ + public static String getDatabaseString() { + return Config.getValueForSection(MONGO_SECTION, "MongoDatabase"); + } + + /** + * Get the mongo collection string + * @return The mongo collection string + */ + public static String getCollectionString() { + return Config.getValueForSection(MONGO_SECTION, "MongoCollection"); + } + + /** + * Get the database timeout in seconds + * @return The timeout in seconds from the config file or default + * of 30 seconds when no config.xml key is found + */ + public static int getQueryTimeout() { + return Integer.parseInt(Config.getValueForSection(MONGO_SECTION, "MongoTimeout", "30")); + } +} diff --git a/jmaqs-mongoDB/src/test/java/com.magenic.jmaqs.mongoDB/MongoDBConfigUnitTests.java b/jmaqs-mongoDB/src/test/java/com.magenic.jmaqs.mongoDB/MongoDBConfigUnitTests.java new file mode 100644 index 000000000..51ff6667a --- /dev/null +++ b/jmaqs-mongoDB/src/test/java/com.magenic.jmaqs.mongoDB/MongoDBConfigUnitTests.java @@ -0,0 +1,50 @@ +/* + * Copyright 2020 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.mongoDB; + +import com.magenic.jmaqs.utilities.helper.TestCategories; +import org.testng.Assert; +import org.testng.annotations.Test; + +/** + * Test class for database configurations. + */ +public class MongoDBConfigUnitTests { + /** + * Gets the connection string. + */ + @Test(groups = TestCategories.MONGO) + public void getDatabaseConnectionStringTest() { + String connection = MongoDBConfig.getConnectionString(); + Assert.assertEquals(connection, "mongodb://localhost:27017", "connection strings do not match"); + } + + /** + * Gets the connection string. + */ + @Test(groups = TestCategories.MONGO) + public void getDatabaseCollectionStringTest() { + String collection = MongoDBConfig.getCollectionString(); + Assert.assertEquals(collection, "MongoTestCollection", "collection strings do not match"); + } + + /** + * Gets the database string. + */ + @Test(groups = TestCategories.MONGO) + public void getDatabaseStringTest() { + String databaseString = MongoDBConfig.getDatabaseString(); + Assert.assertEquals(databaseString, "MongoDatabaseTest", "database string do not match"); + } + + /** + * Gets the timeout value. + */ + @Test(groups = TestCategories.MONGO) + public void getDatabaseQueryTimeout() { + int databaseTimeout = MongoDBConfig.getQueryTimeout(); + Assert.assertEquals(databaseTimeout, 30, "Timeout is incorrect"); + } +} diff --git a/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/ConfigSection.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/ConfigSection.java index b1c5f223a..3b3b5986b 100644 --- a/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/ConfigSection.java +++ b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/ConfigSection.java @@ -39,6 +39,11 @@ public enum ConfigSection { */ MAGENIC_MAQS("MagenicMaqs"), + /** + * The default mongoDB maqs section. + */ + MONGO_MAQS("MongoMaqs"), + /** * The default remote selenium capabilities section. */ diff --git a/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TestCategories.java b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TestCategories.java index b5ab68cfc..2841e6ea6 100644 --- a/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TestCategories.java +++ b/jmaqs-utilities/src/main/java/com/magenic/jmaqs/utilities/helper/TestCategories.java @@ -52,4 +52,9 @@ private TestCategories() { * String for Cucumber unit test category. */ public static final String CUCUMBER = "Cucumber Unit Tests"; + + /** + * String for MongoDB unit test category. + */ + public static final String MONGO = "MongoDB Unit Tests"; } diff --git a/pom.xml b/pom.xml index c279ccc17..6269c0f20 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,7 @@ jmaqs-appium jmaqs-database jmaqs-cucumber + jmaqs-mongoDB From ee11665a177198e25724d07c8d85c7748ea7d926 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Tue, 11 Aug 2020 16:22:21 -0500 Subject: [PATCH 02/36] Continued progress, Config unit tests are only ones that still work. --- .../magenic/jmaqs/mongo/BaseMongoTest.java | 99 ++++++++++ .../magenic/jmaqs/mongo}/MongoDBConfig.java | 2 +- .../magenic/jmaqs/mongo/MongoDBDriver.java | 108 +++++++++++ .../jmaqs/mongo/MongoDriverManager.java | 96 ++++++++++ .../com/magenic/jmaqs/mongo/MongoFactory.java | 66 +++++++ .../magenic/jmaqs/mongo/MongoTestObject.java | 74 ++++++++ .../jmaqs/mongo/MongoDBConfigUnitTest.java} | 4 +- .../magenic/jmaqs/mongo/MongoDBUnitTest.java | 173 ++++++++++++++++++ 8 files changed, 619 insertions(+), 3 deletions(-) create mode 100644 jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java rename jmaqs-mongoDB/src/main/java/{com.magenic.jmaqs.mongoDB => com/magenic/jmaqs/mongo}/MongoDBConfig.java (97%) create mode 100644 jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java create mode 100644 jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java create mode 100644 jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java create mode 100644 jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java rename jmaqs-mongoDB/src/test/java/{com.magenic.jmaqs.mongoDB/MongoDBConfigUnitTests.java => com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java} (94%) create mode 100644 jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBUnitTest.java diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java new file mode 100644 index 000000000..5a747cb7d --- /dev/null +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java @@ -0,0 +1,99 @@ +/* + * Copyright 2020 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.mongo; + +import com.magenic.jmaqs.base.BaseExtendableTest; +import com.mongodb.client.MongoCollection; +import org.bson.Document; +import org.testng.ITestResult; + +import java.util.function.Supplier; + +/// +/// Generic base MongoDB test class +/// +/// The mongo collection type +public class BaseMongoTest extends BaseExtendableTest { + /// + /// Initializes a new instance of the class. + /// Setup the database client for each test class + /// + public BaseMongoTest() { } + + /** + * Steps to do before logging teardown results. + * + * @param resultType The test result + */ + @Override protected void beforeLoggingTeardown(ITestResult resultType) { + + } + + @Override protected void createNewTestObject() { + + } + + /// + /// Gets or sets the web service driver + /// + public MongoDBDriver getMongoDBDriver() { + return this.getTestObject().getMongoDBDriver(); + } + + public void setMongoDBDriver(MongoDBDriver value) { + this.getTestObject().overrideMongoDBDriver(value); + } + + /// + /// Override the Mongo driver - does not lazy load + /// + /// New Mongo driver + public void overrideConnectionDriver(MongoDBDriver driver) { + this.getTestObject().overrideMongoDBDriver(driver); + } + + /// + /// Override the Mongo driver - respects lazy loading + /// + /// The new collection connection + public void overrideConnectionDriver( + Supplier> overrideCollectionConnection) { + this.getTestObject().overrideMongoDBDriver(overrideCollectionConnection); + } + + /// + /// Override the Mongo driver - respects lazy loading + /// + /// Client connection string + /// Database connection string + /// Mongo collection string + public void overrideConnectionDriver(String connectionString, String databaseString, String collectionString) { + this.getTestObject().overrideMongoDBDriver(connectionString, databaseString, collectionString); + } + + /// + /// Get the base web service url + /// + /// The base web service url + protected String getBaseConnectionString() { + return MongoDBConfig.getConnectionString(); + } + + /// + /// Get the base web service url + /// + /// The base web service url + protected String getBaseDatabaseString() { + return MongoDBConfig.getDatabaseString(); + } + + /// + /// Get the base web service url + /// + /// The base web service url + protected String getBaseCollectionString() { + return MongoDBConfig.getCollectionString(); + } +} diff --git a/jmaqs-mongoDB/src/main/java/com.magenic.jmaqs.mongoDB/MongoDBConfig.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java similarity index 97% rename from jmaqs-mongoDB/src/main/java/com.magenic.jmaqs.mongoDB/MongoDBConfig.java rename to jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java index 25074a2eb..ca4306303 100644 --- a/jmaqs-mongoDB/src/main/java/com.magenic.jmaqs.mongoDB/MongoDBConfig.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java @@ -2,7 +2,7 @@ * Copyright 2020 (C) Magenic, All rights Reserved */ -package com.magenic.jmaqs.mongoDB; +package com.magenic.jmaqs.mongo; import com.magenic.jmaqs.utilities.helper.Config; import com.magenic.jmaqs.utilities.helper.ConfigSection; diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java new file mode 100644 index 000000000..79e141cb0 --- /dev/null +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java @@ -0,0 +1,108 @@ +/* + * Copyright 2020 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.mongo; + +import com.mongodb.MongoClient; +import com.mongodb.client.MongoCollection; +import com.mongodb.client.MongoDatabase; +import org.bson.Document; + +import java.util.List; + +/** + * Class to wrap the MongoCollection and related helper functions + */ +public class MongoDBDriver { + /** + * Initializes a new instance of the MongoDBDriver class + * @param collection The collection object + */ + public MongoDBDriver(MongoCollection collection) { + setCollection(collection); + } + + /** + * Initializes a new instance of the MongoDBDriver class + * @param connectionString Server address + * @param databaseString Name of the database + * @param collectionString Name of the collection + */ + public MongoDBDriver(String connectionString, String databaseString, String collectionString) { + setCollection(MongoFactory.getCollection(connectionString, databaseString, collectionString)); + } + + /** + * Initializes a new instance of the MongoDBDriver class. + * @param collectionString Name of the collection + */ + public MongoDBDriver(String collectionString) { + setCollection(MongoFactory.getCollection(MongoDBConfig.getConnectionString(), + MongoDBConfig.getDatabaseString(), collectionString)); + } + + /** + * Initializes a new instance of the MongoDBDriver class. + */ + public MongoDBDriver() { + setCollection(MongoFactory.getDefaultCollection()); + } + + /** + * Gets the client object. + * @return the mongo client + */ + public MongoClient getMongoClient() { + return this.Database.Client; + } + + private MongoDatabase database; + + /// + /// Gets the database object + /// + public MongoDatabase getDatabase() { + return this.collection.Database; + } + + private MongoCollection collection; + + /** + * Gets the collection object. + * @return a mongo collection + */ + public MongoCollection getCollection() { return collection; } + + /** + * Sets the Mongo Collection object. + * @param newCollection the collection to be set + */ + private void setCollection(MongoCollection newCollection) { + this.collection = newCollection; + } + + /// + /// List all of the items in the collection + /// + /// List of the items in the collection + public List listAllCollectionItems() { + return this.getCollection().Find(_ => true).ToList(); + } + + /// + /// Checks if the collection contains any records + /// + /// True if the collection is empty, false otherwise + public boolean isCollectionEmpty() { + return !this.getCollection().Find(_ => true).Any(); + } + + /// + /// Counts all of the items in the collection + /// + /// Number of items in the collection + public int countAllItemsInCollection() { + return Integer.parseInt(this.getCollection().CountDocuments(_ => true).ToString()); + } +} diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java new file mode 100644 index 000000000..b0b137533 --- /dev/null +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java @@ -0,0 +1,96 @@ +/* + * Copyright 2020 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.mongo; + +import com.magenic.jmaqs.base.BaseTestObject; +import com.magenic.jmaqs.base.DriverManager; +import com.magenic.jmaqs.utilities.logging.LoggingConfig; +import com.magenic.jmaqs.utilities.logging.LoggingEnabled; +import com.magenic.jmaqs.utilities.logging.MessageType; +import com.mongodb.client.MongoCollection; +import org.bson.Document; + +import java.util.function.Supplier; + +/** + * Mongo database driver. + */ +public class MongoDriverManager extends DriverManager { + /** + * Cached copy of the connection driver. + */ + private MongoDBDriver driver; + + /** + * Initializes a new instance of the MongoDriverManager class. + * @param connectionString Client connection string + * @param databaseString Database connection string + * @param collectionString Mongo collection string + * @param testObject Test object this driver is getting added to + */ + public MongoDriverManager(String connectionString, String databaseString, String collectionString, BaseTestObject testObject) { + super(() -> (MongoDBDriver) MongoFactory.getCollection(connectionString, databaseString, collectionString), testObject); + } + + /** + * Initializes a new instance of the MongoDriverManager class. + * @param getCollection Function for getting a Mongo collection connection + * @param testObject Test object this driver is getting added to + */ + public MongoDriverManager(Supplier getCollection, BaseTestObject testObject) { + super(getCollection, testObject); + } + + /** + * Override the Mongo driver. + * @param overrideDriver The new Mongo driver + */ + public void overrideDriver(MongoDBDriver overrideDriver) { + this.driver = overrideDriver; + this.setBaseDriver((MongoDBDriver) overrideDriver.getCollection()); + } + + /** + * Override the Mongo driver - respects lazy loading. + * @param connectionString Connection string of mongo DB + * @param databaseString Database string to use + * @param collectionString Collection string to use + */ + public void overrideDriver(String connectionString, String databaseString, String collectionString) { + this.driver = null; + this.overrideDriver(() -> MongoFactory.getCollection(connectionString, databaseString, collectionString)); + } + + /** + * Override the Mongo driver - respects lazy loading. + * @param overrideCollectionConnection The new collection connection + */ + public void overrideDriver(Supplier> overrideCollectionConnection) { + this.driver = null; + this.overrideDriver(overrideCollectionConnection); + } + + /** + * Get the Mongo driver + * @return The Mongo driver + */ + public MongoDBDriver getMongoDriver() { + if (this.driver == null) { + MongoCollection temp = (MongoCollection)getBase(); + + if (LoggingConfig.getLoggingEnabledSetting() == LoggingEnabled.NO) { + this.getLogger().logMessage(MessageType.INFORMATION, "Getting Mongo driver"); + this.driver = new MongoDBDriver(temp); + } else { + this.getLogger().logMessage(MessageType.INFORMATION, "Getting event firing Mongo driver"); + } + } + + return this.driver; + } + + @Override + public void close() throws Exception { } +} diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java new file mode 100644 index 000000000..54cdc1e7d --- /dev/null +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java @@ -0,0 +1,66 @@ +/* + * Copyright 2020 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.mongo; + +import com.mongodb.MongoClient; +import com.mongodb.MongoClientOptions; +import com.mongodb.MongoClientURI; +import com.mongodb.MongoException; +import com.mongodb.client.MongoCollection; +import com.mongodb.client.MongoDatabase; +import org.bson.Document; + +/** + * Mongo database factory. + */ +public class MongoFactory { + + private MongoFactory() {} + + /** + * Get the email client using connection information from the test run configuration. + * @return The email connection + */ + public static MongoCollection getDefaultCollection(){ + return getCollection(MongoDBConfig.getConnectionString(), + MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); + } + + /** + * Get the email client using connection information from the test run configuration. + * @param connectionString the connection string + * @param databaseString the database string + * @param collectionString the collection string + * @return The email connection + */ + public static MongoCollection getCollection(String connectionString, String databaseString, String collectionString) { + MongoDatabase database; + try (MongoClient connection = new MongoClient(new MongoClientURI(connectionString))) { + database = connection.getDatabase(databaseString); + } catch (Exception e) { + throw new MongoException("connection was not created"); + } + return database.getCollection(collectionString); + } + + /** + * Get the email client using connection information from the test run configuration. + * @param connectionString the connection string + * @param databaseString the database string + * @param settings the mongoDB settings to be set + * @param collectionString the collection string + * @return The email connection + */ + public static MongoCollection getCollection(String connectionString, String databaseString, + MongoClientOptions settings, String collectionString) { + MongoDatabase database; + try (MongoClient connection = new MongoClient(connectionString, settings)) { + database = connection.getDatabase(databaseString); + } catch (Exception e) { + throw new MongoException("connection was not created"); + } + return database.getCollection(collectionString); + } +} diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java new file mode 100644 index 000000000..c64e947d8 --- /dev/null +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java @@ -0,0 +1,74 @@ +/* + * Copyright 2020 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.mongo; + +import com.magenic.jmaqs.base.BaseTestObject; +import com.magenic.jmaqs.utilities.logging.Logger; +import com.mongodb.client.MongoCollection; +import org.bson.Document; + +import java.util.function.Supplier; + +/** + * Mongo test context data. + */ +public class MongoTestObject extends BaseTestObject { + /** + * Initializes a new instance of the MongoTestObject class + * @param connectionString Client connection string + * @param databaseString Database connection string + * @param collectionString Mongo collection string + * @param logger The test's logger + * @param fullyQualifiedTestName The test's fully qualified test name + */ + public MongoTestObject(String connectionString, String databaseString, String collectionString, Logger logger, + String fullyQualifiedTestName) { + super(logger, fullyQualifiedTestName); + this.getManagerStore().put((MongoDriverManager.class).getCanonicalName(), + new MongoDriverManager(connectionString,databaseString,collectionString, this)); + } + + /** + * Gets the Mongo driver manager. + * @return the mongo driver manager + */ + public MongoDriverManager getMongoDBManager() { + return (MongoDriverManager) this.getManagerStore().get(MongoDriverManager.class.getCanonicalName()); + } + + /** + * Gets the Mongo driver. + * @return the stored mongoDB driver. + */ + public MongoDBDriver getMongoDBDriver() { + return this.getMongoDBManager().getMongoDriver(); + } + + /** + * Override the Mongo driver settings. + * @param connectionString Client connection string + * @param databaseString Database connection string + * @param collectionString Mongo collection string + */ + public void overrideMongoDBDriver(String connectionString, String databaseString, String collectionString) { + this.getMongoDBManager().overrideDriver(connectionString, databaseString, collectionString); + } + + /** + * Override the Mongo driver settings. + * @param driver New Mongo driver + */ + public void overrideMongoDBDriver(MongoDBDriver driver) { + this.getMongoDBManager().overrideDriver(driver); + } + + /** + * Override the Mongo driver a collection function. + * @param overrideCollectionConnection The collection function + */ + public void overrideMongoDBDriver(Supplier> overrideCollectionConnection) { + this.getMongoDBManager().overrideDriver(overrideCollectionConnection); + } +} diff --git a/jmaqs-mongoDB/src/test/java/com.magenic.jmaqs.mongoDB/MongoDBConfigUnitTests.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java similarity index 94% rename from jmaqs-mongoDB/src/test/java/com.magenic.jmaqs.mongoDB/MongoDBConfigUnitTests.java rename to jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java index 51ff6667a..393420f3d 100644 --- a/jmaqs-mongoDB/src/test/java/com.magenic.jmaqs.mongoDB/MongoDBConfigUnitTests.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java @@ -2,7 +2,7 @@ * Copyright 2020 (C) Magenic, All rights Reserved */ -package com.magenic.jmaqs.mongoDB; +package com.magenic.jmaqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; import org.testng.Assert; @@ -11,7 +11,7 @@ /** * Test class for database configurations. */ -public class MongoDBConfigUnitTests { +public class MongoDBConfigUnitTest { /** * Gets the connection string. */ diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBUnitTest.java new file mode 100644 index 000000000..58be252ad --- /dev/null +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBUnitTest.java @@ -0,0 +1,173 @@ +/* + * Copyright 2020 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.mongo; + +import com.magenic.jmaqs.utilities.helper.TestCategories; +import com.mongodb.client.MongoCollection; +import org.bson.BsonDocument; +import org.bson.Document; +import org.testng.Assert; +import org.testng.ITestResult; +import org.testng.annotations.Test; + +import java.util.List; +/// +/// Test basic mongo base test functionality +/// +public class MongoDBUnitTest extends BaseMongoTest { + /// + /// Is the collection override respected + /// + @Test(groups = TestCategories.MONGO) + public void OverrideCollectionFunction() { + MongoCollection collection = this.getMongoDBDriver().getCollection(); + MongoCollection newCollection = MongoFactory.getDefaultCollection(); + this.getTestObject().overrideMongoDBDriver(() -> newCollection); + + Assert.assertNotEquals(collection, this.getMongoDBDriver().getCollection()); + Assert.assertEquals(newCollection, this.getMongoDBDriver().getCollection()); + Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); + } + + /// + /// Are the connection string overrides respected + /// + @Test(groups = TestCategories.MONGO) + public void OverrideConnectionStrings() { + MongoCollection collection = this.getMongoDBDriver().getCollection(); + this.getTestObject().overrideMongoDBDriver(MongoDBConfig.getConnectionString(), + MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); + + Assert.assertNotEquals(collection, this.getMongoDBDriver().getCollection()); + Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); + } + + /// + /// Is the driver override respected + /// + @Test(groups = TestCategories.MONGO) + public void OverrideDriver() { + MongoDBDriver firstDriver = this.getMongoDBDriver(); + MongoDBDriver newDriver = new MongoDBDriver(MongoFactory.getDefaultCollection()); + this.getTestObject().overrideMongoDBDriver(newDriver); + + Assert.assertNotEquals(firstDriver, this.getMongoDBDriver()); + Assert.assertEquals(newDriver, this.getMongoDBDriver()); + Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); + } + + /// + /// Is the test over-ridable with a custom driver + /// + @Test(groups = TestCategories.MONGO) + public void OverrideWithCustomDriver() { + MongoDBDriver firstDriver = this.getMongoDBDriver(); + MongoDBDriver newDriver = new MongoDBDriver(MongoFactory.getCollection(MongoDBConfig.getConnectionString(), + MongoDBConfig.getDatabaseString(), null, MongoDBConfig.getCollectionString())); + this.getTestObject().overrideMongoDBDriver(newDriver); + + Assert.assertNotEquals(firstDriver, this.getMongoDBDriver()); + Assert.assertEquals(newDriver, this.getMongoDBDriver()); + Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); + } + + /// + /// Test the list all collection items helper function + /// + @Test(groups = TestCategories.MONGO) + public void TestMongoListAllCollectionItems() { + List collectionItems = this.getMongoDBDriver().listAllCollectionItems(); + for (Document bson : collectionItems){ + Assert.assertTrue(bson.containsKey("lid")); + } + + Assert.assertEquals(4, collectionItems.size()); + } + + /// + /// Test the count all collection items helper function + /// + @Test(groups = TestCategories.MONGO) + public void TestMongoCountItemsInCollection() { + Assert.assertEquals(4, this.getMongoDBDriver().countAllItemsInCollection()); + } + + /// + /// Test the collection works as expected + /// + @Test(groups = TestCategories.MONGO) + public void TestMongoGetLoginID() { + var filter = Builders.Filter.Eq("lid", "test3"); + + String value = this.getMongoDBDriver().getCollection().find(filter).ToList()[0]["lid"].ToString(); + Assert.assertEquals("test3", value); + } + + /// + /// Test the collection works as expected + /// + @Test(groups = TestCategories.MONGO) + public void TestMongoQueryAndReturnFirst() { + var filter = Builders.Filter.Eq("lid", "test3"); + MongoCollection document = this.getMongoDBDriver().getCollection().Find(filter).ToList().First(); + Assert.assertEquals("test3", document["lid"].ToString()); + } + + /// + /// Test the collection works as expected + /// + @Test(groups = TestCategories.MONGO) + public void TestMongoFindListWithKey() { + var filter = Builders.Filter.Exists("lid"); + List documentList = this.MongoDBDriver.Collection.Find(filter).ToList(); + foreach (BsonDocument documents in documentList) + { + Assert.AreNotEqual(documents["lid"].ToString(), string.Empty); + } + + Assert.AreEqual(4, documentList.Count); + } + + /// + /// Test the collection works as expected + /// + @Test(groups = TestCategories.MONGO) + public void TestMongoLinqQuery() { + MongoQueryable query = + from e in this.MongoDBDriver.Collection.AsQueryable() + where e["lid"] == "test1" + select e; + List retList = query.ToList(); + foreach (var value in retList) + { + Assert.AreEqual("test1", value["lid"]); + } + } + + /// + /// Make sure the test objects map properly + /// + @Test(groups = TestCategories.MONGO) + public void TestMongoDBTestObjectMapCorrectly() + { + Assert.AreEqual(this.TestObject.Log, this.Log, "Logs don't match"); + Assert.AreEqual(this.TestObject.SoftAssert, this.SoftAssert, "Soft asserts don't match"); + Assert.AreEqual(this.TestObject.PerfTimerCollection, this.PerfTimerCollection, "Soft asserts don't match"); + Assert.AreEqual(this.TestObject.MongoDBDriver, this.MongoDBDriver, "Web service driver don't match"); + } + + /** + * Steps to do before logging teardown results. + * + * @param resultType The test result + */ + @Override protected void beforeLoggingTeardown(ITestResult resultType) { + + } + + @Override protected void createNewTestObject() { + + } +} From 2d2dcef416eab73171f4682637c918889cebe750 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Tue, 11 Aug 2020 23:26:42 -0500 Subject: [PATCH 03/36] Working on tests --- .../magenic/jmaqs/mongo/BaseMongoTest.java | 100 ++++++----- .../magenic/jmaqs/mongo/MongoDBDriver.java | 76 +++++--- .../jmaqs/mongo/MongoDriverManager.java | 22 ++- .../magenic/jmaqs/mongo/MongoDBUnitTest.java | 166 +++++++++--------- 4 files changed, 208 insertions(+), 156 deletions(-) diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java index 5a747cb7d..7eb47488c 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java @@ -11,89 +11,93 @@ import java.util.function.Supplier; -/// -/// Generic base MongoDB test class -/// -/// The mongo collection type +/** + * Generic base MongoDB test class. + */ public class BaseMongoTest extends BaseExtendableTest { - /// - /// Initializes a new instance of the class. - /// Setup the database client for each test class - /// - public BaseMongoTest() { } - /** - * Steps to do before logging teardown results. - * - * @param resultType The test result + * Initializes a new instance of the BaseMongoTest class, + * Setup the database client for each test class. */ - @Override protected void beforeLoggingTeardown(ITestResult resultType) { - - } - - @Override protected void createNewTestObject() { - + public BaseMongoTest() { + // Currently not populated with any logic } - /// - /// Gets or sets the web service driver - /// + /** + * Gets the mongoDB driver. + * @return the mongoDB driver + */ public MongoDBDriver getMongoDBDriver() { return this.getTestObject().getMongoDBDriver(); } + /** + * Sets the MongoDB driver + * @param value the MongoDB driver to be set. + */ public void setMongoDBDriver(MongoDBDriver value) { this.getTestObject().overrideMongoDBDriver(value); } - /// - /// Override the Mongo driver - does not lazy load - /// - /// New Mongo driver + /** + * Override the Mongo driver - does not lazy load. + * @param driver New Mongo driver + */ public void overrideConnectionDriver(MongoDBDriver driver) { this.getTestObject().overrideMongoDBDriver(driver); } - /// - /// Override the Mongo driver - respects lazy loading - /// - /// The new collection connection + /** + * Override the Mongo driver - respects lazy loading. + * @param overrideCollectionConnection The new collection connection + */ public void overrideConnectionDriver( Supplier> overrideCollectionConnection) { this.getTestObject().overrideMongoDBDriver(overrideCollectionConnection); } - /// - /// Override the Mongo driver - respects lazy loading - /// - /// Client connection string - /// Database connection string - /// Mongo collection string + /** + * Override the Mongo driver - respects lazy loading. + * @param connectionString Client connection string + * @param databaseString Database connection string + * @param collectionString Mongo collection string + */ public void overrideConnectionDriver(String connectionString, String databaseString, String collectionString) { this.getTestObject().overrideMongoDBDriver(connectionString, databaseString, collectionString); } - /// - /// Get the base web service url - /// - /// The base web service url + /** + * Get the base web service url. + * @return The base web service url + */ protected String getBaseConnectionString() { return MongoDBConfig.getConnectionString(); } - /// - /// Get the base web service url - /// - /// The base web service url + /** + * Get the base web service url. + * @return The base web service url + */ protected String getBaseDatabaseString() { return MongoDBConfig.getDatabaseString(); } - /// - /// Get the base web service url - /// - /// The base web service url + /** + * Get the base web service url. + * @return The base web service url + */ protected String getBaseCollectionString() { return MongoDBConfig.getCollectionString(); } + + /** + * Steps to do before logging teardown results. + * @param resultType The test result + */ + @Override protected void beforeLoggingTeardown(ITestResult resultType) { + + } + + @Override protected void createNewTestObject() { + } } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java index 79e141cb0..b8af63785 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java @@ -5,6 +5,7 @@ package com.magenic.jmaqs.mongo; import com.mongodb.MongoClient; +import com.mongodb.MongoException; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import org.bson.Document; @@ -14,7 +15,7 @@ /** * Class to wrap the MongoCollection and related helper functions */ -public class MongoDBDriver { +public class MongoDBDriver implements AutoCloseable{ /** * Initializes a new instance of the MongoDBDriver class * @param collection The collection object @@ -49,23 +50,43 @@ public MongoDBDriver() { setCollection(MongoFactory.getDefaultCollection()); } + /** + * The Mongo DB client. + */ + private MongoClient client; + /** * Gets the client object. * @return the mongo client */ public MongoClient getMongoClient() { - return this.Database.Client; + return this.client; } + /** + * Sets the client object. + * @param newClient the new mongo Client to be set. + */ + public void setMongoClient(MongoClient newClient) { + this.client = newClient; + } + + /** + * The MongoDB Database. + */ private MongoDatabase database; - /// - /// Gets the database object - /// + /** + * Gets the database object. + * @return the MongoDB database object + */ public MongoDatabase getDatabase() { - return this.collection.Database; + return this.database; } + /** + * The MongoDB collection. + */ private MongoCollection collection; /** @@ -82,27 +103,40 @@ private void setCollection(MongoCollection newCollection) { this.collection = newCollection; } - /// - /// List all of the items in the collection - /// - /// List of the items in the collection + /** + * List all of the items in the collection + * @return List of the items in the collection + */ public List listAllCollectionItems() { - return this.getCollection().Find(_ => true).ToList(); + //return this.getCollection().Find(_ -> true).ToList(); + List collectionList = null; + try { + for (Document doc : this.getCollection().find()) { + collectionList.add(doc); + } + } catch (Exception e) { + throw new MongoException("Collection document is empty"); + } + return collectionList; } - /// - /// Checks if the collection contains any records - /// - /// True if the collection is empty, false otherwise + /** + * Checks if the collection contains any records. + * @return True if the collection is empty, false otherwise + */ public boolean isCollectionEmpty() { - return !this.getCollection().Find(_ => true).Any(); + return this.getCollection().find() == null; } - /// - /// Counts all of the items in the collection - /// - /// Number of items in the collection + /** + * Counts all of the items in the collection. + * @return Number of items in the collection + */ public int countAllItemsInCollection() { - return Integer.parseInt(this.getCollection().CountDocuments(_ => true).ToString()); + return (int) this.getCollection().count(); + } + + @Override public void close() throws Exception { + } } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java index b0b137533..2dd8bf161 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java @@ -60,7 +60,7 @@ public void overrideDriver(MongoDBDriver overrideDriver) { */ public void overrideDriver(String connectionString, String databaseString, String collectionString) { this.driver = null; - this.overrideDriver(() -> MongoFactory.getCollection(connectionString, databaseString, collectionString)); + this.overrideDriverGet(() -> MongoFactory.getCollection(connectionString, databaseString, collectionString)); } /** @@ -69,7 +69,7 @@ public void overrideDriver(String connectionString, String databaseString, Strin */ public void overrideDriver(Supplier> overrideCollectionConnection) { this.driver = null; - this.overrideDriver(overrideCollectionConnection); + this.overrideDriverGet(overrideCollectionConnection); } /** @@ -78,7 +78,8 @@ public void overrideDriver(Supplier> overrideCollectio */ public MongoDBDriver getMongoDriver() { if (this.driver == null) { - MongoCollection temp = (MongoCollection)getBase(); + // TODO: delete this if it works properly + MongoCollection temp = /*(MongoCollection)*/ getBase().getCollection(); if (LoggingConfig.getLoggingEnabledSetting() == LoggingEnabled.NO) { this.getLogger().logMessage(MessageType.INFORMATION, "Getting Mongo driver"); @@ -91,6 +92,19 @@ public MongoDBDriver getMongoDriver() { return this.driver; } + protected void overrideDriverGet(Supplier> driverGet) { + this.setBaseDriver((MongoDBDriver) driverGet); + } + + @Override - public void close() throws Exception { } + public void close() throws Exception { + if (!this.isDriverInitialized()) { + return; + } + + MongoDBDriver mongoDBDriver = this.getMongoDriver(); + mongoDBDriver.close(); + this.baseDriver = null; + } } diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBUnitTest.java index 58be252ad..f2776a07c 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBUnitTest.java @@ -5,21 +5,22 @@ package com.magenic.jmaqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; +import com.mongodb.QueryBuilder; import com.mongodb.client.MongoCollection; import org.bson.BsonDocument; import org.bson.Document; import org.testng.Assert; import org.testng.ITestResult; import org.testng.annotations.Test; - import java.util.List; -/// -/// Test basic mongo base test functionality -/// + +/** + * Test basic mongo base test functionality + */ public class MongoDBUnitTest extends BaseMongoTest { - /// - /// Is the collection override respected - /// + /** + * Is the collection override respected. + */ @Test(groups = TestCategories.MONGO) public void OverrideCollectionFunction() { MongoCollection collection = this.getMongoDBDriver().getCollection(); @@ -31,9 +32,9 @@ public void OverrideCollectionFunction() { Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); } - /// - /// Are the connection string overrides respected - /// + /** + * Are the connection string overrides respected. + */ @Test(groups = TestCategories.MONGO) public void OverrideConnectionStrings() { MongoCollection collection = this.getMongoDBDriver().getCollection(); @@ -44,9 +45,9 @@ public void OverrideConnectionStrings() { Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); } - /// - /// Is the driver override respected - /// + /** + * Is the driver override respected. + */ @Test(groups = TestCategories.MONGO) public void OverrideDriver() { MongoDBDriver firstDriver = this.getMongoDBDriver(); @@ -58,9 +59,9 @@ public void OverrideDriver() { Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); } - /// - /// Is the test over-ridable with a custom driver - /// + /** + * Is the test over-ridable with a custom driver. + */ @Test(groups = TestCategories.MONGO) public void OverrideWithCustomDriver() { MongoDBDriver firstDriver = this.getMongoDBDriver(); @@ -73,9 +74,9 @@ public void OverrideWithCustomDriver() { Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); } - /// - /// Test the list all collection items helper function - /// + /** + * Test the list all collection items helper function. + */ @Test(groups = TestCategories.MONGO) public void TestMongoListAllCollectionItems() { List collectionItems = this.getMongoDBDriver().listAllCollectionItems(); @@ -86,76 +87,73 @@ public void TestMongoListAllCollectionItems() { Assert.assertEquals(4, collectionItems.size()); } - /// - /// Test the count all collection items helper function - /// + /** + * Test the count all collection items helper function + */ @Test(groups = TestCategories.MONGO) public void TestMongoCountItemsInCollection() { Assert.assertEquals(4, this.getMongoDBDriver().countAllItemsInCollection()); } - /// - /// Test the collection works as expected - /// - @Test(groups = TestCategories.MONGO) - public void TestMongoGetLoginID() { - var filter = Builders.Filter.Eq("lid", "test3"); - String value = this.getMongoDBDriver().getCollection().find(filter).ToList()[0]["lid"].ToString(); - Assert.assertEquals("test3", value); - } - - /// - /// Test the collection works as expected - /// - @Test(groups = TestCategories.MONGO) - public void TestMongoQueryAndReturnFirst() { - var filter = Builders.Filter.Eq("lid", "test3"); - MongoCollection document = this.getMongoDBDriver().getCollection().Find(filter).ToList().First(); - Assert.assertEquals("test3", document["lid"].ToString()); - } + ///** + // * Test the collection works as expected. + // */ + //@Test(groups = TestCategories.MONGO) + //public void TestMongoGetLoginID() { + // var filter = Builders.Filter.Eq("lid", "test3"); +// + // String value = this.getMongoDBDriver().getCollection().find(filter).ToList()[0]["lid"].ToString(); + // Assert.assertEquals("test3", value); + //} +// + ///** + // * Test the collection works as expected. + // */ + //@Test(groups = TestCategories.MONGO) + //public void TestMongoQueryAndReturnFirst() { + // var filter = Builders.Filter.Eq("lid", "test3"); + // MongoCollection document = this.getMongoDBDriver().getCollection().Find(filter).ToList().First(); + // Assert.assertEquals("test3", document["lid"].ToString()); + //} +// + ///** + // * Test the collection works as expected + // */ + //@Test(groups = TestCategories.MONGO) + //public void TestMongoFindListWithKey() { + // var filter = Builders.Filter.Exists("lid"); + // List documentList = this.getMongoDBDriver().getCollection().find(filter); + // for (Document documents : documentList) { + // Assert.assertNotEquals(documents.get("lid").toString(), ""); + // } +// + // Assert.assertEquals(4, documentList.size()); + //} +// + ///** + // * Test the collection works as expected. + // */ + //@Test(groups = TestCategories.MONGO) + //public void TestMongoLinqQuery() { + // QueryBuilder query = + // from e in this.getMongoDBDriver().getCollection().Collection.AsQueryable() + // where e["lid"] == "test1" + // select e; + // List retList = query.ToList(); + // for (var value : retList) { + // Assert.assertEquals("test1", value["lid"]); + // } + //} - /// - /// Test the collection works as expected - /// - @Test(groups = TestCategories.MONGO) - public void TestMongoFindListWithKey() { - var filter = Builders.Filter.Exists("lid"); - List documentList = this.MongoDBDriver.Collection.Find(filter).ToList(); - foreach (BsonDocument documents in documentList) - { - Assert.AreNotEqual(documents["lid"].ToString(), string.Empty); - } - - Assert.AreEqual(4, documentList.Count); - } - - /// - /// Test the collection works as expected - /// - @Test(groups = TestCategories.MONGO) - public void TestMongoLinqQuery() { - MongoQueryable query = - from e in this.MongoDBDriver.Collection.AsQueryable() - where e["lid"] == "test1" - select e; - List retList = query.ToList(); - foreach (var value in retList) - { - Assert.AreEqual("test1", value["lid"]); - } - } - - /// - /// Make sure the test objects map properly - /// + /** + * Make sure the test objects map properly. + */ @Test(groups = TestCategories.MONGO) - public void TestMongoDBTestObjectMapCorrectly() - { - Assert.AreEqual(this.TestObject.Log, this.Log, "Logs don't match"); - Assert.AreEqual(this.TestObject.SoftAssert, this.SoftAssert, "Soft asserts don't match"); - Assert.AreEqual(this.TestObject.PerfTimerCollection, this.PerfTimerCollection, "Soft asserts don't match"); - Assert.AreEqual(this.TestObject.MongoDBDriver, this.MongoDBDriver, "Web service driver don't match"); + public void TestMongoDBTestObjectMapCorrectly() { + Assert.assertEquals(this.getTestObject().getLogger(), this.getLogger(), "Logs don't match"); + Assert.assertEquals(this.getTestObject().getPerfTimerCollection(), this.getPerfTimerCollection(), "Soft asserts don't match"); + Assert.assertEquals(this.getTestObject().getMongoDBDriver(), this.getMongoDBDriver(), "Web service driver don't match"); } /** @@ -163,11 +161,13 @@ public void TestMongoDBTestObjectMapCorrectly() * * @param resultType The test result */ - @Override protected void beforeLoggingTeardown(ITestResult resultType) { + @Override + protected void beforeLoggingTeardown(ITestResult resultType) { } - @Override protected void createNewTestObject() { + @Override + protected void createNewTestObject() { } } From ae19537054ba0a6cd7e05eff0aabd42555d10f21 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Thu, 3 Sep 2020 14:02:21 -0500 Subject: [PATCH 04/36] more work on unit tests --- .../magenic/jmaqs/mongo/BaseMongoTest.java | 28 ++++---- .../jmaqs/mongo/MongoDriverManager.java | 7 +- .../jmaqs/mongo/BaseMongoUnitTest.java | 66 +++++++++++++++++++ ...itTest.java => MongoDBDriverUnitTest.java} | 61 +---------------- .../jmaqs/mongo/MongoTestObjectUnitTest.java | 65 ++++++++++++++++++ 5 files changed, 147 insertions(+), 80 deletions(-) create mode 100644 jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java rename jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/{MongoDBUnitTest.java => MongoDBDriverUnitTest.java} (58%) create mode 100644 jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java index 7eb47488c..b7f1ff467 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java @@ -5,12 +5,11 @@ package com.magenic.jmaqs.mongo; import com.magenic.jmaqs.base.BaseExtendableTest; -import com.mongodb.client.MongoCollection; -import org.bson.Document; +import com.magenic.jmaqs.utilities.logging.FileLogger; +import com.magenic.jmaqs.utilities.logging.LoggingEnabled; +import com.magenic.jmaqs.utilities.logging.MessageType; import org.testng.ITestResult; -import java.util.function.Supplier; - /** * Generic base MongoDB test class. */ @@ -47,15 +46,6 @@ public void overrideConnectionDriver(MongoDBDriver driver) { this.getTestObject().overrideMongoDBDriver(driver); } - /** - * Override the Mongo driver - respects lazy loading. - * @param overrideCollectionConnection The new collection connection - */ - public void overrideConnectionDriver( - Supplier> overrideCollectionConnection) { - this.getTestObject().overrideMongoDBDriver(overrideCollectionConnection); - } - /** * Override the Mongo driver - respects lazy loading. * @param connectionString Client connection string @@ -94,10 +84,14 @@ protected String getBaseCollectionString() { * Steps to do before logging teardown results. * @param resultType The test result */ - @Override protected void beforeLoggingTeardown(ITestResult resultType) { - - } + @Override + protected void beforeLoggingTeardown(ITestResult resultType) { + // Currently not populated with any logic + } - @Override protected void createNewTestObject() { + @Override + protected void createNewTestObject() { + this.setTestObject(new MongoTestObject(this.getBaseConnectionString(), this.getBaseDatabaseString(), + this.getBaseCollectionString(), this.createLogger(), this.getFullyQualifiedTestClassName())); } } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java index 2dd8bf161..57750e9f2 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java @@ -77,9 +77,10 @@ public void overrideDriver(Supplier> overrideCollectio * @return The Mongo driver */ public MongoDBDriver getMongoDriver() { + /* if (this.driver == null) { // TODO: delete this if it works properly - MongoCollection temp = /*(MongoCollection)*/ getBase().getCollection(); + MongoCollection temp = (MongoCollection) getBase().getCollection(); if (LoggingConfig.getLoggingEnabledSetting() == LoggingEnabled.NO) { this.getLogger().logMessage(MessageType.INFORMATION, "Getting Mongo driver"); @@ -90,19 +91,19 @@ public MongoDBDriver getMongoDriver() { } return this.driver; + */ + return getBase(); } protected void overrideDriverGet(Supplier> driverGet) { this.setBaseDriver((MongoDBDriver) driverGet); } - @Override public void close() throws Exception { if (!this.isDriverInitialized()) { return; } - MongoDBDriver mongoDBDriver = this.getMongoDriver(); mongoDBDriver.close(); this.baseDriver = null; diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java new file mode 100644 index 000000000..7805ba3a7 --- /dev/null +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java @@ -0,0 +1,66 @@ +package com.magenic.jmaqs.mongo; + +import com.magenic.jmaqs.utilities.helper.TestCategories; +import org.testng.Assert; +import org.testng.annotations.Test; + +public class BaseMongoUnitTest extends BaseMongoTest { + @Test(groups = TestCategories.MONGO) + public void testGetMongoDBDriver() { + MongoDBDriver mongoDBDriver = getMongoDBDriver(); + Assert.assertNotNull(mongoDBDriver, + "Checking that MongoDB Driver is not null through BaseMongoTest"); + } + + @Test(groups = TestCategories.MONGO) + public void testSetMongoDBDriver() { + int hashCode = this.getMongoDBDriver().hashCode(); + try { + this.setMongoDBDriver(new MongoDBDriver()); + } catch (Exception e) { + e.printStackTrace(); + } + int hashCode1 = this.getMongoDBDriver().hashCode(); + Assert.assertNotEquals(hashCode, hashCode1); + } + + @Test(groups = TestCategories.MONGO) + public void testGetMongoTestObject() { + Assert.assertNotNull(this.getTestObject(), + "Checking that Selenium Test Object is not null through BaseSeleniumTest"); + } + + @Test(groups = TestCategories.MONGO) + public void testOverrideConnectionDriver() { + overrideConnectionDriver(this.getMongoDBDriver()); + overrideConnectionDriver(this.getBaseConnectionString(), this.getBaseDatabaseString(), this.getBaseCollectionString()); + Assert.assertNotNull(getMongoDBDriver()); + } + + /** + * Gets the connection string. + */ + @Test(groups = TestCategories.MONGO) + public void getDatabaseConnectionStringTest() { + String connection = this.getBaseConnectionString(); + Assert.assertEquals(connection, "mongodb://localhost:27017", "connection strings do not match"); + } + + /** + * Gets the connection string. + */ + @Test(groups = TestCategories.MONGO) + public void getDatabaseCollectionStringTest() { + String collection = this.getBaseCollectionString(); + Assert.assertEquals(collection, "MongoTestCollection", "collection strings do not match"); + } + + /** + * Gets the database string. + */ + @Test(groups = TestCategories.MONGO) + public void getDatabaseStringTest() { + String databaseString = this.getBaseDatabaseString(); + Assert.assertEquals(databaseString, "MongoDatabaseTest", "database string do not match"); + } +} diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java similarity index 58% rename from jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBUnitTest.java rename to jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java index f2776a07c..232af3646 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java @@ -5,9 +5,6 @@ package com.magenic.jmaqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; -import com.mongodb.QueryBuilder; -import com.mongodb.client.MongoCollection; -import org.bson.BsonDocument; import org.bson.Document; import org.testng.Assert; import org.testng.ITestResult; @@ -17,63 +14,7 @@ /** * Test basic mongo base test functionality */ -public class MongoDBUnitTest extends BaseMongoTest { - /** - * Is the collection override respected. - */ - @Test(groups = TestCategories.MONGO) - public void OverrideCollectionFunction() { - MongoCollection collection = this.getMongoDBDriver().getCollection(); - MongoCollection newCollection = MongoFactory.getDefaultCollection(); - this.getTestObject().overrideMongoDBDriver(() -> newCollection); - - Assert.assertNotEquals(collection, this.getMongoDBDriver().getCollection()); - Assert.assertEquals(newCollection, this.getMongoDBDriver().getCollection()); - Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); - } - - /** - * Are the connection string overrides respected. - */ - @Test(groups = TestCategories.MONGO) - public void OverrideConnectionStrings() { - MongoCollection collection = this.getMongoDBDriver().getCollection(); - this.getTestObject().overrideMongoDBDriver(MongoDBConfig.getConnectionString(), - MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); - - Assert.assertNotEquals(collection, this.getMongoDBDriver().getCollection()); - Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); - } - - /** - * Is the driver override respected. - */ - @Test(groups = TestCategories.MONGO) - public void OverrideDriver() { - MongoDBDriver firstDriver = this.getMongoDBDriver(); - MongoDBDriver newDriver = new MongoDBDriver(MongoFactory.getDefaultCollection()); - this.getTestObject().overrideMongoDBDriver(newDriver); - - Assert.assertNotEquals(firstDriver, this.getMongoDBDriver()); - Assert.assertEquals(newDriver, this.getMongoDBDriver()); - Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); - } - - /** - * Is the test over-ridable with a custom driver. - */ - @Test(groups = TestCategories.MONGO) - public void OverrideWithCustomDriver() { - MongoDBDriver firstDriver = this.getMongoDBDriver(); - MongoDBDriver newDriver = new MongoDBDriver(MongoFactory.getCollection(MongoDBConfig.getConnectionString(), - MongoDBConfig.getDatabaseString(), null, MongoDBConfig.getCollectionString())); - this.getTestObject().overrideMongoDBDriver(newDriver); - - Assert.assertNotEquals(firstDriver, this.getMongoDBDriver()); - Assert.assertEquals(newDriver, this.getMongoDBDriver()); - Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); - } - +public class MongoDBDriverUnitTest extends BaseMongoTest { /** * Test the list all collection items helper function. */ diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java new file mode 100644 index 000000000..6be73d97a --- /dev/null +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java @@ -0,0 +1,65 @@ +package com.magenic.jmaqs.mongo; + +import com.magenic.jmaqs.utilities.helper.TestCategories; +import com.mongodb.client.MongoCollection; +import org.bson.Document; +import org.testng.Assert; +import org.testng.annotations.Test; + +public class MongoTestObjectUnitTest extends BaseMongoTest{ + /** + * Is the collection override respected. + */ + @Test(groups = TestCategories.MONGO) + public void overrideCollectionFunction() { + MongoCollection collection = this.getMongoDBDriver().getCollection(); + MongoCollection newCollection = MongoFactory.getDefaultCollection(); + this.getTestObject().overrideMongoDBDriver(() -> newCollection); + + Assert.assertNotEquals(collection, this.getMongoDBDriver().getCollection()); + Assert.assertEquals(newCollection, this.getMongoDBDriver().getCollection()); + Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); + } + + /** + * Are the connection string overrides respected. + */ + @Test(groups = TestCategories.MONGO) + public void overrideConnectionStrings() { + MongoCollection collection = this.getMongoDBDriver().getCollection(); + this.getTestObject().overrideMongoDBDriver(MongoDBConfig.getConnectionString(), + MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); + + Assert.assertNotEquals(collection, this.getMongoDBDriver().getCollection()); + Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); + } + + /** + * Is the driver override respected. + */ + @Test(groups = TestCategories.MONGO) + public void overrideDriver() { + MongoDBDriver firstDriver = this.getMongoDBDriver(); + MongoDBDriver newDriver = new MongoDBDriver(MongoFactory.getDefaultCollection()); + this.getTestObject().overrideMongoDBDriver(newDriver); + + Assert.assertNotEquals(firstDriver, this.getMongoDBDriver()); + Assert.assertEquals(newDriver, this.getMongoDBDriver()); + Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); + } + + /** + * Is the test overridable with a custom driver. + */ + @Test(groups = TestCategories.MONGO) + public void overrideWithCustomDriver() { + MongoDBDriver firstDriver = this.getMongoDBDriver(); + MongoDBDriver newDriver = new MongoDBDriver(MongoFactory.getCollection(MongoDBConfig.getConnectionString(), + MongoDBConfig.getDatabaseString(), null, MongoDBConfig.getCollectionString())); + this.getTestObject().overrideMongoDBDriver(newDriver); + + Assert.assertNotEquals(firstDriver, this.getMongoDBDriver()); + Assert.assertEquals(newDriver, this.getMongoDBDriver()); + Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); + } +} From 29c0b1810db5e7697d884a2b85bd4f2bcbd4a352 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Fri, 18 Sep 2020 13:17:49 -0500 Subject: [PATCH 05/36] updates --- .../src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java | 3 --- .../main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java | 3 --- .../test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java | 2 +- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java index b7f1ff467..52e627fa3 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java @@ -5,9 +5,6 @@ package com.magenic.jmaqs.mongo; import com.magenic.jmaqs.base.BaseExtendableTest; -import com.magenic.jmaqs.utilities.logging.FileLogger; -import com.magenic.jmaqs.utilities.logging.LoggingEnabled; -import com.magenic.jmaqs.utilities.logging.MessageType; import org.testng.ITestResult; /** diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java index 57750e9f2..e6f1bdaa4 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java @@ -6,9 +6,6 @@ import com.magenic.jmaqs.base.BaseTestObject; import com.magenic.jmaqs.base.DriverManager; -import com.magenic.jmaqs.utilities.logging.LoggingConfig; -import com.magenic.jmaqs.utilities.logging.LoggingEnabled; -import com.magenic.jmaqs.utilities.logging.MessageType; import com.mongodb.client.MongoCollection; import org.bson.Document; diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java index 7805ba3a7..38c295142 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java @@ -7,7 +7,7 @@ public class BaseMongoUnitTest extends BaseMongoTest { @Test(groups = TestCategories.MONGO) public void testGetMongoDBDriver() { - MongoDBDriver mongoDBDriver = getMongoDBDriver(); + MongoDBDriver mongoDBDriver = this.getMongoDBDriver(); Assert.assertNotNull(mongoDBDriver, "Checking that MongoDB Driver is not null through BaseMongoTest"); } From 6d0fb621a230816f366d6edb82bdea5dc4170966 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Sat, 9 Jan 2021 19:27:26 -0600 Subject: [PATCH 06/36] continued working on MongoDB stuff, now to figure out why MongoDbDriver doesn't initialize --- .../magenic/jmaqs/mongo/BaseMongoTest.java | 8 +- .../magenic/jmaqs/mongo/MongoDBConfig.java | 2 +- .../magenic/jmaqs/mongo/MongoDBDriver.java | 2 +- .../jmaqs/mongo/MongoDriverManager.java | 17 +-- .../com/magenic/jmaqs/mongo/MongoFactory.java | 2 +- .../magenic/jmaqs/mongo/MongoTestObject.java | 2 +- .../jmaqs/mongo/BaseMongoUnitTest.java | 4 + .../jmaqs/mongo/MongoDBConfigUnitTest.java | 2 +- .../jmaqs/mongo/MongoDBDriverUnitTest.java | 125 ++++++++++-------- .../jmaqs/mongo/MongoTestObjectUnitTest.java | 10 +- 10 files changed, 92 insertions(+), 82 deletions(-) diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java index 52e627fa3..03e328a86 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 (C) Magenic, All rights Reserved + * Copyright 2021 (C) Magenic, All rights Reserved */ package com.magenic.jmaqs.mongo; @@ -29,10 +29,10 @@ public MongoDBDriver getMongoDBDriver() { /** * Sets the MongoDB driver - * @param value the MongoDB driver to be set. + * @param driver the MongoDB driver to be set. */ - public void setMongoDBDriver(MongoDBDriver value) { - this.getTestObject().overrideMongoDBDriver(value); + public void setMongoDBDriver(MongoDBDriver driver) { + this.getTestObject().overrideMongoDBDriver(driver); } /** diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java index ca4306303..f1c499d7d 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 (C) Magenic, All rights Reserved + * Copyright 2021 (C) Magenic, All rights Reserved */ package com.magenic.jmaqs.mongo; diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java index b8af63785..1f25dd235 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 (C) Magenic, All rights Reserved + * Copyright 2021 (C) Magenic, All rights Reserved */ package com.magenic.jmaqs.mongo; diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java index e6f1bdaa4..b52c17d59 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 (C) Magenic, All rights Reserved + * Copyright 2021 (C) Magenic, All rights Reserved */ package com.magenic.jmaqs.mongo; @@ -74,21 +74,6 @@ public void overrideDriver(Supplier> overrideCollectio * @return The Mongo driver */ public MongoDBDriver getMongoDriver() { - /* - if (this.driver == null) { - // TODO: delete this if it works properly - MongoCollection temp = (MongoCollection) getBase().getCollection(); - - if (LoggingConfig.getLoggingEnabledSetting() == LoggingEnabled.NO) { - this.getLogger().logMessage(MessageType.INFORMATION, "Getting Mongo driver"); - this.driver = new MongoDBDriver(temp); - } else { - this.getLogger().logMessage(MessageType.INFORMATION, "Getting event firing Mongo driver"); - } - } - - return this.driver; - */ return getBase(); } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java index 54cdc1e7d..1b1c1ebfd 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 (C) Magenic, All rights Reserved + * Copyright 2021 (C) Magenic, All rights Reserved */ package com.magenic.jmaqs.mongo; diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java index c64e947d8..ff96ed999 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 (C) Magenic, All rights Reserved + * Copyright 2021 (C) Magenic, All rights Reserved */ package com.magenic.jmaqs.mongo; diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java index 38c295142..22400cbb7 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java @@ -1,3 +1,7 @@ +/* + * Copyright 2021 (C) Magenic, All rights Reserved + */ + package com.magenic.jmaqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java index 393420f3d..2d2cd0fc6 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 (C) Magenic, All rights Reserved + * Copyright 2021 (C) Magenic, All rights Reserved */ package com.magenic.jmaqs.mongo; diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java index 232af3646..5f461002f 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java @@ -1,91 +1,108 @@ /* - * Copyright 2020 (C) Magenic, All rights Reserved + * Copyright 2021 (C) Magenic, All rights Reserved */ package com.magenic.jmaqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; +import com.mongodb.client.model.Filters; import org.bson.Document; +import org.bson.conversions.Bson; import org.testng.Assert; import org.testng.ITestResult; +import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; +import java.util.ArrayList; import java.util.List; /** * Test basic mongo base test functionality */ public class MongoDBDriverUnitTest extends BaseMongoTest { + + @BeforeTest + public void setup() { + + } + /** * Test the list all collection items helper function. */ @Test(groups = TestCategories.MONGO) - public void TestMongoListAllCollectionItems() { + public void testMongoListAllCollectionItems() { List collectionItems = this.getMongoDBDriver().listAllCollectionItems(); for (Document bson : collectionItems){ Assert.assertTrue(bson.containsKey("lid")); } - Assert.assertEquals(4, collectionItems.size()); + Assert.assertEquals(collectionItems.size(), 4); } /** * Test the count all collection items helper function */ @Test(groups = TestCategories.MONGO) - public void TestMongoCountItemsInCollection() { - Assert.assertEquals(4, this.getMongoDBDriver().countAllItemsInCollection()); + public void testMongoCountItemsInCollection() { + Assert.assertEquals(this.getMongoDBDriver().countAllItemsInCollection(), 4); + } + + + /** + * Test the collection works as expected. + */ + @Test(groups = TestCategories.MONGO) + public void TestMongoGetLoginID() { + Bson filter = Filters.eq("lid", "test3"); + //String value = this.getMongoDBDriver().getCollection().find(filter).ToList()[0]["lid"].ToString(); + List value = this.getMongoDBDriver().getCollection().find(filter).into(new ArrayList<>()); + Assert.assertEquals(value.get(0).toString(), "test3"); + } + + /** + * Test the collection works as expected. + */ + @Test(groups = TestCategories.MONGO) + public void TestMongoQueryAndReturnFirst() { + Bson filter = Filters.eq("lid", "test3"); + //MongoCollection document = this.getMongoDBDriver().getCollection().find(filter).ToList().First(); + Document document = this.getMongoDBDriver().getCollection().find(filter).first(); + Assert.assertEquals(document.get("lid").toString(), "test3"); + } + + /** + * Test the collection works as expected + */ + @Test(groups = TestCategories.MONGO) + public void TestMongoFindListWithKey() { + //var filter = Builders.Filter.Exists("lid"); + Bson filter = Filters.exists("lid"); + List documentList = this.getMongoDBDriver().getCollection().find(filter).into(new ArrayList<>()); + + for (Document documents : documentList) { + Assert.assertNotEquals(documents.get("lid").toString(), ""); + } + Assert.assertEquals(documentList.size(), 4); } + /** + * Test the collection works as expected. + */ + @Test(groups = TestCategories.MONGO) + public void TestMongoLinqQuery() { + /* + QueryBuilder querys = + from e in this.getMongoDBDriver().getCollection() + where e["lid"] == "test1" + select e; + */ - ///** - // * Test the collection works as expected. - // */ - //@Test(groups = TestCategories.MONGO) - //public void TestMongoGetLoginID() { - // var filter = Builders.Filter.Eq("lid", "test3"); -// - // String value = this.getMongoDBDriver().getCollection().find(filter).ToList()[0]["lid"].ToString(); - // Assert.assertEquals("test3", value); - //} -// - ///** - // * Test the collection works as expected. - // */ - //@Test(groups = TestCategories.MONGO) - //public void TestMongoQueryAndReturnFirst() { - // var filter = Builders.Filter.Eq("lid", "test3"); - // MongoCollection document = this.getMongoDBDriver().getCollection().Find(filter).ToList().First(); - // Assert.assertEquals("test3", document["lid"].ToString()); - //} -// - ///** - // * Test the collection works as expected - // */ - //@Test(groups = TestCategories.MONGO) - //public void TestMongoFindListWithKey() { - // var filter = Builders.Filter.Exists("lid"); - // List documentList = this.getMongoDBDriver().getCollection().find(filter); - // for (Document documents : documentList) { - // Assert.assertNotEquals(documents.get("lid").toString(), ""); - // } -// - // Assert.assertEquals(4, documentList.size()); - //} -// - ///** - // * Test the collection works as expected. - // */ - //@Test(groups = TestCategories.MONGO) - //public void TestMongoLinqQuery() { - // QueryBuilder query = - // from e in this.getMongoDBDriver().getCollection().Collection.AsQueryable() - // where e["lid"] == "test1" - // select e; - // List retList = query.ToList(); - // for (var value : retList) { - // Assert.assertEquals("test1", value["lid"]); - // } - //} + Bson filter = Filters.eq("lid", "test1"); + List retList = this.getMongoDBDriver().getCollection().find(filter).into(new ArrayList<>()); + + for (Document value : retList) { + Assert.assertEquals(value.get("lid"), "test1"); + } + } /** * Make sure the test objects map properly. diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java index 6be73d97a..f38e8d296 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java @@ -1,3 +1,7 @@ +/* + * Copyright 2021 (C) Magenic, All rights Reserved + */ + package com.magenic.jmaqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; @@ -7,13 +11,14 @@ import org.testng.annotations.Test; public class MongoTestObjectUnitTest extends BaseMongoTest{ + private final MongoCollection collection = this.getMongoDBDriver().getCollection(); + private final MongoCollection newCollection = MongoFactory.getDefaultCollection(); + /** * Is the collection override respected. */ @Test(groups = TestCategories.MONGO) public void overrideCollectionFunction() { - MongoCollection collection = this.getMongoDBDriver().getCollection(); - MongoCollection newCollection = MongoFactory.getDefaultCollection(); this.getTestObject().overrideMongoDBDriver(() -> newCollection); Assert.assertNotEquals(collection, this.getMongoDBDriver().getCollection()); @@ -26,7 +31,6 @@ public void overrideCollectionFunction() { */ @Test(groups = TestCategories.MONGO) public void overrideConnectionStrings() { - MongoCollection collection = this.getMongoDBDriver().getCollection(); this.getTestObject().overrideMongoDBDriver(MongoDBConfig.getConnectionString(), MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); From 77e965715a3ec3ce269fdb5c412e68c005819f54 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Mon, 11 Jan 2021 12:00:32 -0600 Subject: [PATCH 07/36] working on tests --- .../java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java index 5f461002f..a6acbffa8 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java @@ -19,12 +19,6 @@ * Test basic mongo base test functionality */ public class MongoDBDriverUnitTest extends BaseMongoTest { - - @BeforeTest - public void setup() { - - } - /** * Test the list all collection items helper function. */ From bb74e6f286721c34194d7dbd2cc1d686935ee0cd Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Thu, 14 Jan 2021 12:17:53 -0600 Subject: [PATCH 08/36] driver update --- .../java/com/magenic/jmaqs/mongo/MongoDBDriver.java | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java index 1f25dd235..240c1be5f 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java @@ -5,11 +5,11 @@ package com.magenic.jmaqs.mongo; import com.mongodb.MongoClient; -import com.mongodb.MongoException; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import org.bson.Document; +import java.util.ArrayList; import java.util.List; /** @@ -108,16 +108,7 @@ private void setCollection(MongoCollection newCollection) { * @return List of the items in the collection */ public List listAllCollectionItems() { - //return this.getCollection().Find(_ -> true).ToList(); - List collectionList = null; - try { - for (Document doc : this.getCollection().find()) { - collectionList.add(doc); - } - } catch (Exception e) { - throw new MongoException("Collection document is empty"); - } - return collectionList; + return this.getCollection().find().into(new ArrayList<>()); } /** From 2a9e9fc7959fbb6fd4b8ff82c5ebb42290e0f0b9 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Sat, 23 Jan 2021 13:05:24 -0600 Subject: [PATCH 09/36] more work on unit tests --- jmaqs-mongoDB/pom.xml | 12 +- .../magenic/jmaqs/mongo/BaseMongoTest.java | 12 +- .../magenic/jmaqs/mongo/MongoDBDriver.java | 5 +- .../jmaqs/mongo/MongoDriverManager.java | 12 +- .../magenic/jmaqs/mongo/MongoTestObject.java | 2 +- .../jmaqs/mongo/BaseMongoUnitTest.java | 27 ++-- .../jmaqs/mongo/MongoDBConfigUnitTest.java | 22 +-- .../jmaqs/mongo/MongoDBDriverUnitTest.java | 102 +++++--------- .../mongo/MongoDBFunctionalUnitTest.java | 85 ++++++++++++ .../mongo/MongoDriverManagerUnitTest.java | 128 ++++++++++++++++++ .../jmaqs/mongo/MongoTestObjectUnitTest.java | 13 +- 11 files changed, 304 insertions(+), 116 deletions(-) create mode 100644 jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java create mode 100644 jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java diff --git a/jmaqs-mongoDB/pom.xml b/jmaqs-mongoDB/pom.xml index 83eb27314..2dc1b97c9 100644 --- a/jmaqs-mongoDB/pom.xml +++ b/jmaqs-mongoDB/pom.xml @@ -1,13 +1,12 @@ - - + 4.0.0 + com.magenic.jmaqs jmaqs-framework ${revision} + com.magenic.jmaqs.mongoDB jmaqs-mongoDB JMAQS MongoDB Database Testing Module @@ -34,5 +33,10 @@ org.testng testng + + com.magenic.jmaqs.webservices + jmaqs-webservices-jdk8 + test + diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java index 03e328a86..a62b3f524 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java @@ -77,6 +77,12 @@ protected String getBaseCollectionString() { return MongoDBConfig.getCollectionString(); } + @Override + protected void createNewTestObject() { + this.setTestObject(new MongoTestObject(this.getBaseConnectionString(), this.getBaseDatabaseString(), + this.getBaseCollectionString(), this.createLogger(), this.getFullyQualifiedTestClassName())); + } + /** * Steps to do before logging teardown results. * @param resultType The test result @@ -84,11 +90,5 @@ protected String getBaseCollectionString() { @Override protected void beforeLoggingTeardown(ITestResult resultType) { // Currently not populated with any logic - } - - @Override - protected void createNewTestObject() { - this.setTestObject(new MongoTestObject(this.getBaseConnectionString(), this.getBaseDatabaseString(), - this.getBaseCollectionString(), this.createLogger(), this.getFullyQualifiedTestClassName())); } } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java index 240c1be5f..19ed1a2b5 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java @@ -7,10 +7,9 @@ import com.mongodb.MongoClient; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; -import org.bson.Document; - import java.util.ArrayList; import java.util.List; +import org.bson.Document; /** * Class to wrap the MongoCollection and related helper functions @@ -127,7 +126,7 @@ public int countAllItemsInCollection() { return (int) this.getCollection().count(); } - @Override public void close() throws Exception { + @Override public void close() { } } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java index b52c17d59..8ce717eec 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java @@ -28,17 +28,19 @@ public class MongoDriverManager extends DriverManager { * @param testObject Test object this driver is getting added to */ public MongoDriverManager(String connectionString, String databaseString, String collectionString, BaseTestObject testObject) { - super(() -> (MongoDBDriver) MongoFactory.getCollection(connectionString, databaseString, collectionString), testObject); + super(() -> new MongoDBDriver(MongoFactory.getCollection(connectionString, databaseString, collectionString)), testObject); } - /** + /* + /* TODO: is this needed? * Initializes a new instance of the MongoDriverManager class. * @param getCollection Function for getting a Mongo collection connection * @param testObject Test object this driver is getting added to - */ + * public MongoDriverManager(Supplier getCollection, BaseTestObject testObject) { super(getCollection, testObject); } + */ /** * Override the Mongo driver. @@ -46,7 +48,7 @@ public MongoDriverManager(Supplier getCollection, BaseTestObject */ public void overrideDriver(MongoDBDriver overrideDriver) { this.driver = overrideDriver; - this.setBaseDriver((MongoDBDriver) overrideDriver.getCollection()); + this.setBaseDriver(new MongoDBDriver(overrideDriver.getCollection())); } /** @@ -78,7 +80,7 @@ public MongoDBDriver getMongoDriver() { } protected void overrideDriverGet(Supplier> driverGet) { - this.setBaseDriver((MongoDBDriver) driverGet); + this.setBaseDriver(new MongoDBDriver(driverGet.get())); } @Override diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java index ff96ed999..98b4ebd81 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java @@ -35,7 +35,7 @@ public MongoTestObject(String connectionString, String databaseString, String co * @return the mongo driver manager */ public MongoDriverManager getMongoDBManager() { - return (MongoDriverManager) this.getManagerStore().get(MongoDriverManager.class.getCanonicalName()); + return this.getManagerStore().getDriver(MongoDriverManager.class.getCanonicalName()); } /** diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java index 22400cbb7..bd8750fb5 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java @@ -29,14 +29,9 @@ public void testSetMongoDBDriver() { } @Test(groups = TestCategories.MONGO) - public void testGetMongoTestObject() { - Assert.assertNotNull(this.getTestObject(), - "Checking that Selenium Test Object is not null through BaseSeleniumTest"); - } - - @Test(groups = TestCategories.MONGO) - public void testOverrideConnectionDriver() { + public void testOverrideConnectionDriverWithMongoDBDriver() { overrideConnectionDriver(this.getMongoDBDriver()); + Assert.assertNotNull(getMongoDBDriver()); overrideConnectionDriver(this.getBaseConnectionString(), this.getBaseDatabaseString(), this.getBaseCollectionString()); Assert.assertNotNull(getMongoDBDriver()); } @@ -45,26 +40,26 @@ public void testOverrideConnectionDriver() { * Gets the connection string. */ @Test(groups = TestCategories.MONGO) - public void getDatabaseConnectionStringTest() { + public void testGetBaseMongoConnectionStringTest() { String connection = this.getBaseConnectionString(); Assert.assertEquals(connection, "mongodb://localhost:27017", "connection strings do not match"); } /** - * Gets the connection string. + * Gets the database string. */ @Test(groups = TestCategories.MONGO) - public void getDatabaseCollectionStringTest() { - String collection = this.getBaseCollectionString(); - Assert.assertEquals(collection, "MongoTestCollection", "collection strings do not match"); + public void testGetBaseMongoStringTest() { + String databaseString = this.getBaseDatabaseString(); + Assert.assertEquals(databaseString, "MongoDatabaseTest", "database string do not match"); } /** - * Gets the database string. + * Gets the connection string. */ @Test(groups = TestCategories.MONGO) - public void getDatabaseStringTest() { - String databaseString = this.getBaseDatabaseString(); - Assert.assertEquals(databaseString, "MongoDatabaseTest", "database string do not match"); + public void testGetBaseMongoCollectionStringTest() { + String collection = this.getBaseCollectionString(); + Assert.assertEquals(collection, "MongoTestCollection", "collection strings do not match"); } } diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java index 2d2cd0fc6..5a019ba5c 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java @@ -11,39 +11,39 @@ /** * Test class for database configurations. */ -public class MongoDBConfigUnitTest { +public class MongoDBConfigUnitTest extends BaseMongoTest{ /** * Gets the connection string. */ @Test(groups = TestCategories.MONGO) - public void getDatabaseConnectionStringTest() { + public void testGetMongoDBConnectionStringTest() { String connection = MongoDBConfig.getConnectionString(); Assert.assertEquals(connection, "mongodb://localhost:27017", "connection strings do not match"); } /** - * Gets the connection string. + * Gets the database string. */ @Test(groups = TestCategories.MONGO) - public void getDatabaseCollectionStringTest() { - String collection = MongoDBConfig.getCollectionString(); - Assert.assertEquals(collection, "MongoTestCollection", "collection strings do not match"); + public void testGetMongoDBDatabaseStringTest() { + String databaseString = MongoDBConfig.getDatabaseString(); + Assert.assertEquals(databaseString, "MongoDatabaseTest", "database string do not match"); } /** - * Gets the database string. + * Gets the connection string. */ @Test(groups = TestCategories.MONGO) - public void getDatabaseStringTest() { - String databaseString = MongoDBConfig.getDatabaseString(); - Assert.assertEquals(databaseString, "MongoDatabaseTest", "database string do not match"); + public void testGetMongoDBCollectionStringTest() { + String collection = MongoDBConfig.getCollectionString(); + Assert.assertEquals(collection, "MongoTestCollection", "collection strings do not match"); } /** * Gets the timeout value. */ @Test(groups = TestCategories.MONGO) - public void getDatabaseQueryTimeout() { + public void testGetMongoDBQueryTimeout() { int databaseTimeout = MongoDBConfig.getQueryTimeout(); Assert.assertEquals(databaseTimeout, 30, "Timeout is incorrect"); } diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java index a6acbffa8..1ad3825ce 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java @@ -5,107 +5,73 @@ package com.magenic.jmaqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; -import com.mongodb.client.model.Filters; +import com.mongodb.MongoClient; +import com.mongodb.client.MongoCollection; import org.bson.Document; -import org.bson.conversions.Bson; import org.testng.Assert; import org.testng.ITestResult; -import org.testng.annotations.BeforeTest; import org.testng.annotations.Test; -import java.util.ArrayList; import java.util.List; /** * Test basic mongo base test functionality */ public class MongoDBDriverUnitTest extends BaseMongoTest { - /** - * Test the list all collection items helper function. - */ + @Test(groups = TestCategories.MONGO) - public void testMongoListAllCollectionItems() { - List collectionItems = this.getMongoDBDriver().listAllCollectionItems(); - for (Document bson : collectionItems){ - Assert.assertTrue(bson.containsKey("lid")); - } + public void testMongoDBDriver() { + MongoCollection collection = MongoFactory.getDefaultCollection(); + MongoDBDriver driver = new MongoDBDriver(collection); + Assert.assertNotNull(driver); - Assert.assertEquals(collectionItems.size(), 4); - } + driver = new MongoDBDriver(MongoDBConfig.getConnectionString(), + MongoDBConfig.getDatabaseString(), MongoDBConfig.getConnectionString()); + Assert.assertNotNull(driver); - /** - * Test the count all collection items helper function - */ - @Test(groups = TestCategories.MONGO) - public void testMongoCountItemsInCollection() { - Assert.assertEquals(this.getMongoDBDriver().countAllItemsInCollection(), 4); + driver = new MongoDBDriver(MongoDBConfig.getCollectionString()); + Assert.assertNotNull(driver); } - - /** - * Test the collection works as expected. - */ @Test(groups = TestCategories.MONGO) - public void TestMongoGetLoginID() { - Bson filter = Filters.eq("lid", "test3"); - //String value = this.getMongoDBDriver().getCollection().find(filter).ToList()[0]["lid"].ToString(); - List value = this.getMongoDBDriver().getCollection().find(filter).into(new ArrayList<>()); - Assert.assertEquals(value.get(0).toString(), "test3"); + public void testGetMongoClient() { + this.setMongoDBDriver(new MongoDBDriver()); + MongoClient client = this.getMongoDBDriver().getMongoClient(); + Assert.assertNotNull(client); } - /** - * Test the collection works as expected. - */ @Test(groups = TestCategories.MONGO) - public void TestMongoQueryAndReturnFirst() { - Bson filter = Filters.eq("lid", "test3"); - //MongoCollection document = this.getMongoDBDriver().getCollection().find(filter).ToList().First(); - Document document = this.getMongoDBDriver().getCollection().find(filter).first(); - Assert.assertEquals(document.get("lid").toString(), "test3"); + public void testSetMongoClient() { + this.setMongoDBDriver(new MongoDBDriver()); + this.getMongoDBDriver().setMongoClient(new MongoClient()); + Assert.assertNotNull(this.getMongoDBDriver().getMongoClient()); } /** - * Test the collection works as expected + * Test the list all collection items helper function. */ @Test(groups = TestCategories.MONGO) - public void TestMongoFindListWithKey() { - //var filter = Builders.Filter.Exists("lid"); - Bson filter = Filters.exists("lid"); - List documentList = this.getMongoDBDriver().getCollection().find(filter).into(new ArrayList<>()); - - for (Document documents : documentList) { - Assert.assertNotEquals(documents.get("lid").toString(), ""); + public void testListAllCollectionItems() { + this.setMongoDBDriver(new MongoDBDriver()); + List collectionItems = this.getMongoDBDriver().listAllCollectionItems(); + for (Document bson : collectionItems){ + Assert.assertTrue(bson.containsKey("lid")); } - Assert.assertEquals(documentList.size(), 4); + + Assert.assertEquals(collectionItems.size(), 4); } - /** - * Test the collection works as expected. - */ @Test(groups = TestCategories.MONGO) - public void TestMongoLinqQuery() { - /* - QueryBuilder querys = - from e in this.getMongoDBDriver().getCollection() - where e["lid"] == "test1" - select e; - */ - - Bson filter = Filters.eq("lid", "test1"); - List retList = this.getMongoDBDriver().getCollection().find(filter).into(new ArrayList<>()); - - for (Document value : retList) { - Assert.assertEquals(value.get("lid"), "test1"); - } + public void testIsCollectionEmpty() { + boolean collection = this.getMongoDBDriver().isCollectionEmpty(); + Assert.assertTrue(collection); } /** - * Make sure the test objects map properly. + * Test the count all collection items helper function */ @Test(groups = TestCategories.MONGO) - public void TestMongoDBTestObjectMapCorrectly() { - Assert.assertEquals(this.getTestObject().getLogger(), this.getLogger(), "Logs don't match"); - Assert.assertEquals(this.getTestObject().getPerfTimerCollection(), this.getPerfTimerCollection(), "Soft asserts don't match"); - Assert.assertEquals(this.getTestObject().getMongoDBDriver(), this.getMongoDBDriver(), "Web service driver don't match"); + public void testMongoCountAllItemsInCollection() { + Assert.assertEquals(this.getMongoDBDriver().countAllItemsInCollection(), 4); } /** diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java new file mode 100644 index 000000000..8182da16d --- /dev/null +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java @@ -0,0 +1,85 @@ +/* + * Copyright 2021 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.mongo; + +import com.magenic.jmaqs.utilities.helper.TestCategories; +import com.mongodb.client.model.Filters; +import org.bson.Document; +import org.bson.conversions.Bson; +import org.testng.Assert; +import org.testng.annotations.Test; + +import java.util.ArrayList; +import java.util.List; + +public class MongoDBFunctionalUnitTest extends BaseMongoTest{ + + /** + * Test the collection works as expected. + */ + @Test(groups = TestCategories.MONGO) + public void testMongoGetLoginID() { + Bson filter = Filters.eq("lid", "test3"); + //String value = this.getMongoDBDriver().getCollection().find(filter).ToList()[0]["lid"].ToString(); + List value = this.getMongoDBDriver().getCollection().find(filter).into(new ArrayList<>()); + Assert.assertEquals(value.get(0).toString(), "test3"); + } + + /** + * Test the collection works as expected. + */ + @Test(groups = TestCategories.MONGO) + public void testMongoQueryAndReturnFirst() { + Bson filter = Filters.eq("lid", "test3"); + //MongoCollection document = this.getMongoDBDriver().getCollection().find(filter).ToList().First(); + Document document = this.getMongoDBDriver().getCollection().find(filter).first(); + Assert.assertEquals(document.get("lid").toString(), "test3"); + } + + /** + * Test the collection works as expected + */ + @Test(groups = TestCategories.MONGO) + public void testMongoFindListWithKey() { + //var filter = Builders.Filter.Exists("lid"); + Bson filter = Filters.exists("lid"); + List documentList = this.getMongoDBDriver().getCollection().find(filter).into(new ArrayList<>()); + + for (Document documents : documentList) { + Assert.assertNotEquals(documents.get("lid").toString(), ""); + } + Assert.assertEquals(documentList.size(), 4); + } + + /** + * Test the collection works as expected. + */ + @Test(groups = TestCategories.MONGO) + public void testMongoLinqQuery() { + /* + QueryBuilder querys = + from e in this.getMongoDBDriver().getCollection() + where e["lid"] == "test1" + select e; + */ + + Bson filter = Filters.eq("lid", "test1"); + List retList = this.getMongoDBDriver().getCollection().find(filter).into(new ArrayList<>()); + + for (Document value : retList) { + Assert.assertEquals(value.get("lid"), "test1"); + } + } + + /** + * Make sure the test objects map properly. + */ + @Test(groups = TestCategories.MONGO) + public void testMongoDBTestObjectMapCorrectly() { + Assert.assertEquals(this.getTestObject().getLogger(), this.getLogger(), "Logs don't match"); + Assert.assertEquals(this.getTestObject().getPerfTimerCollection(), this.getPerfTimerCollection(), "Soft asserts don't match"); + Assert.assertEquals(this.getTestObject().getMongoDBDriver(), this.getMongoDBDriver(), "Web service driver don't match"); + } +} diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java new file mode 100644 index 000000000..91131594f --- /dev/null +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java @@ -0,0 +1,128 @@ +/* + * Copyright 2021 (C) Magenic, All rights Reserved + */ + +package com.magenic.jmaqs.mongo; + +import com.magenic.jmaqs.utilities.helper.TestCategories; +import com.mongodb.client.MongoCollection; +import org.bson.Document; +import org.testng.Assert; +import org.testng.annotations.Test; + +public class MongoDriverManagerUnitTest extends BaseMongoTest{ + + @Test(groups = TestCategories.MONGO) + public void testMongoDriverManager() { + MongoDriverManager manager = new MongoDriverManager(MongoDBConfig.getConnectionString(), + MongoDBConfig.getDatabaseString(),MongoDBConfig.getCollectionString(), this.getTestObject()); + Assert.assertNotNull(manager); + } + + /// + /// Override driver with collection string + /// + @Test(groups = TestCategories.MONGO) + public void respectCollectionDriverOverride() { + //MongoDBConfig.GetConnectionString(), MongoDBConfig.GetDatabaseString(), collectionString + MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getCollectionString()); + this.getTestObject().getMongoDBManager().overrideDriver(mongoDriver); + Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); + } + + /// + /// Override drive with all 3 connection strings + /// + @Test(groups = TestCategories.MONGO) + public void respectDriverConnectionsOverride() { + MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getConnectionString(), + MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); + this.getTestObject().getMongoDBManager().overrideDriver(mongoDriver); + Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); + } + + /// + /// Override driver directly + /// + @Test(groups = TestCategories.MONGO) + public void respectDirectDriverOverride() { + MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getCollectionString()); + this.setMongoDBDriver(mongoDriver); + Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); + } + + /// + /// Override driver with new driver + /// + @Test(groups = TestCategories.MONGO) + public void respectNewDriverOverride() { + MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getCollectionString()); + this.getTestObject().overrideMongoDBDriver(mongoDriver); + Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); + } + + /// + /// Override drive with collection function + /// + @Test(groups = TestCategories.MONGO) + public void respectCollectionOverride() { + MongoCollection collection = MongoFactory.getDefaultCollection(); + this.getTestObject().overrideMongoDBDriver(() -> collection); + Assert.assertEquals(collection, this.getMongoDBDriver().getCollection()); + } + + /// + /// Override drive with all 3 connection strings + /// + @Test(groups = TestCategories.MONGO) + public void respectDriverConnectionStingsOverride() { + MongoCollection collection = this.getMongoDBDriver().getCollection(); + this.getTestObject().overrideMongoDBDriver(MongoDBConfig.getConnectionString(), + MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); + Assert.assertNotEquals(collection, this.getMongoDBDriver().getCollection()); + } + + /// + /// Override in base with collection function + /// + @Test(groups = TestCategories.MONGO) + public void respectCollectionOverrideInBase() { + MongoCollection collection = MongoFactory.getDefaultCollection(); + this.overrideConnectionDriver(new MongoDBDriver(collection)); + Assert.assertEquals(collection, this.getMongoDBDriver().getCollection()); + } + + /// + /// Override in base with new driver + /// + @Test(groups = TestCategories.MONGO) + public void respectDriverOverrideInBase() { + MongoCollection collection = MongoFactory.getDefaultCollection(); + this.overrideConnectionDriver(new MongoDBDriver(collection)); + Assert.assertEquals(collection, this.getMongoDBDriver().getCollection()); + } + + /// + /// Override drive with strings in base + /// + @Test(groups = TestCategories.MONGO) + public void testRespectConnectionStingsOverrideInBase() { + MongoCollection collection = this.getMongoDBDriver().getCollection(); + this.overrideConnectionDriver(MongoDBConfig.getConnectionString(), + MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); + Assert.assertNotEquals(collection, this.getMongoDBDriver().getCollection()); + } + + /** + * Override with default driver + */ + @Test(groups = TestCategories.MONGO) + public void respectDefaultDriverOverride() { + MongoDBDriver mongoDriver = new MongoDBDriver(); + this.getTestObject().getMongoDBManager().overrideDriver(mongoDriver); + + Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); + Assert.assertEquals(mongoDriver.getDatabase(), this.getMongoDBDriver().getDatabase()); + Assert.assertEquals(mongoDriver.getMongoClient(), this.getMongoDBDriver().getMongoClient()); + } +} diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java index f38e8d296..165513312 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java @@ -10,7 +10,7 @@ import org.testng.Assert; import org.testng.annotations.Test; -public class MongoTestObjectUnitTest extends BaseMongoTest{ +public class MongoTestObjectUnitTest extends BaseMongoTest { private final MongoCollection collection = this.getMongoDBDriver().getCollection(); private final MongoCollection newCollection = MongoFactory.getDefaultCollection(); @@ -20,7 +20,6 @@ public class MongoTestObjectUnitTest extends BaseMongoTest{ @Test(groups = TestCategories.MONGO) public void overrideCollectionFunction() { this.getTestObject().overrideMongoDBDriver(() -> newCollection); - Assert.assertNotEquals(collection, this.getMongoDBDriver().getCollection()); Assert.assertEquals(newCollection, this.getMongoDBDriver().getCollection()); Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); @@ -66,4 +65,14 @@ public void overrideWithCustomDriver() { Assert.assertEquals(newDriver, this.getMongoDBDriver()); Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); } + + /// + /// Make sure the test objects map properly + /// + @Test(groups = TestCategories.MONGO) + public void testMongoDBTestObjectMapCorrectly() { + Assert.assertEquals(this.getTestObject().getLogger(), this.getLogger(), "Logs don't match"); + Assert.assertEquals(this.getTestObject().getPerfTimerCollection(), this.getPerfTimerCollection(), "The Perf timers don't match"); + Assert.assertEquals(this.getTestObject().getMongoDBDriver(), this.getMongoDBDriver(), "MongoDB drivers don't match"); + } } From d307ede98d03d7296023b51892a3edff2955d824 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Thu, 28 Jan 2021 13:48:00 -0600 Subject: [PATCH 10/36] Changed to actual mongoDB repo --- jmaqs-mongoDB/pom.xml | 4 +- .../magenic/jmaqs/mongo/BaseMongoTest.java | 18 ++++++-- .../magenic/jmaqs/mongo/MongoDBDriver.java | 44 +++++++++++++++--- .../jmaqs/mongo/MongoDriverManager.java | 13 +++--- .../com/magenic/jmaqs/mongo/MongoFactory.java | 41 ++++++++++------- .../jmaqs/mongo/MongoDBDriverUnitTest.java | 6 +-- .../mongo/MongoDBFunctionalUnitTest.java | 10 ----- .../mongo/MongoDriverManagerUnitTest.java | 45 ++++++++----------- .../jmaqs/mongo/MongoTestObjectUnitTest.java | 24 +++++++--- 9 files changed, 122 insertions(+), 83 deletions(-) diff --git a/jmaqs-mongoDB/pom.xml b/jmaqs-mongoDB/pom.xml index 2dc1b97c9..49328056f 100644 --- a/jmaqs-mongoDB/pom.xml +++ b/jmaqs-mongoDB/pom.xml @@ -26,8 +26,8 @@ org.mongodb - mongo-java-driver - 3.4.1 + mongodb-driver-sync + 4.2.0 org.testng diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java index a62b3f524..4482c047e 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java @@ -5,8 +5,12 @@ package com.magenic.jmaqs.mongo; import com.magenic.jmaqs.base.BaseExtendableTest; +import com.mongodb.client.MongoCollection; +import org.bson.Document; import org.testng.ITestResult; +import java.util.function.Supplier; + /** * Generic base MongoDB test class. */ @@ -45,10 +49,18 @@ public void overrideConnectionDriver(MongoDBDriver driver) { /** * Override the Mongo driver - respects lazy loading. - * @param connectionString Client connection string - * @param databaseString Database connection string - * @param collectionString Mongo collection string + * @param overrideCollectionConnection The collection function */ + public void overrideConnectionDriver(Supplier> overrideCollectionConnection) { + this.getTestObject().overrideMongoDBDriver(overrideCollectionConnection); + } + + /** + * Override the Mongo driver - respects lazy loading. + * @param connectionString Client connection string + * @param databaseString Database connection string + * @param collectionString Mongo collection string + */ public void overrideConnectionDriver(String connectionString, String databaseString, String collectionString) { this.getTestObject().overrideMongoDBDriver(connectionString, databaseString, collectionString); } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java index 19ed1a2b5..f64c6856f 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java @@ -4,11 +4,14 @@ package com.magenic.jmaqs.mongo; -import com.mongodb.MongoClient; +import com.mongodb.MongoClientSettings; +import com.mongodb.client.MongoClient; +import com.mongodb.client.MongoClients; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import java.util.ArrayList; import java.util.List; + import org.bson.Document; /** @@ -30,7 +33,9 @@ public MongoDBDriver(MongoCollection collection) { * @param collectionString Name of the collection */ public MongoDBDriver(String connectionString, String databaseString, String collectionString) { - setCollection(MongoFactory.getCollection(connectionString, databaseString, collectionString)); + setMongoClient(connectionString); + setDatabase(this.getMongoClient(), databaseString); + setCollection(this.getDatabase(), collectionString); } /** @@ -42,6 +47,15 @@ public MongoDBDriver(String collectionString) { MongoDBConfig.getDatabaseString(), collectionString)); } + /** + * Initializes a new instance of the MongoDBDriver class. + * @param collectionString Name of the collection + */ + public MongoDBDriver(MongoClientSettings clientSettings, String databaseString, String collectionString) { + this.setMongoClient(clientSettings); + setCollection(this.getMongoClient().getDatabase(databaseString).getCollection(collectionString)); + } + /** * Initializes a new instance of the MongoDBDriver class. */ @@ -64,10 +78,14 @@ public MongoClient getMongoClient() { /** * Sets the client object. - * @param newClient the new mongo Client to be set. + * @param connectionString the new mongo Client to be set. */ - public void setMongoClient(MongoClient newClient) { - this.client = newClient; + public void setMongoClient(String connectionString) { + this.client = MongoClients.create(connectionString); + } + + public void setMongoClient(MongoClientSettings mongoClientSettings) { + this.client = MongoClients.create(mongoClientSettings); } /** @@ -83,6 +101,14 @@ public MongoDatabase getDatabase() { return this.database; } + public void setDatabase(MongoClient mongoClient, String mongoDatabase) { + this.database = mongoClient.getDatabase(mongoDatabase); + } + + public void setDatabase(String mongoDatabase) { + this.database = this.getMongoClient().getDatabase(mongoDatabase); + } + /** * The MongoDB collection. */ @@ -102,6 +128,10 @@ private void setCollection(MongoCollection newCollection) { this.collection = newCollection; } + private void setCollection(MongoDatabase database, String collection) { + this.collection = database.getCollection(collection); + } + /** * List all of the items in the collection * @return List of the items in the collection @@ -115,7 +145,7 @@ public List listAllCollectionItems() { * @return True if the collection is empty, false otherwise */ public boolean isCollectionEmpty() { - return this.getCollection().find() == null; + return this.getCollection() == null; } /** @@ -123,7 +153,7 @@ public boolean isCollectionEmpty() { * @return Number of items in the collection */ public int countAllItemsInCollection() { - return (int) this.getCollection().count(); + return (int) this.getCollection().countDocuments(); } @Override public void close() { diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java index 8ce717eec..fed7f6847 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java @@ -8,7 +8,6 @@ import com.magenic.jmaqs.base.DriverManager; import com.mongodb.client.MongoCollection; import org.bson.Document; - import java.util.function.Supplier; /** @@ -31,16 +30,15 @@ public MongoDriverManager(String connectionString, String databaseString, String super(() -> new MongoDBDriver(MongoFactory.getCollection(connectionString, databaseString, collectionString)), testObject); } - /* - /* TODO: is this needed? + /** TODO: is this needed? * Initializes a new instance of the MongoDriverManager class. * @param getCollection Function for getting a Mongo collection connection * @param testObject Test object this driver is getting added to - * + */ public MongoDriverManager(Supplier getCollection, BaseTestObject testObject) { super(getCollection, testObject); } - */ + /** * Override the Mongo driver. @@ -60,6 +58,7 @@ public void overrideDriver(MongoDBDriver overrideDriver) { public void overrideDriver(String connectionString, String databaseString, String collectionString) { this.driver = null; this.overrideDriverGet(() -> MongoFactory.getCollection(connectionString, databaseString, collectionString)); + this.overrideDriverGet(() -> MongoFactory.getCollection(connectionString, databaseString, collectionString)); } /** @@ -76,7 +75,7 @@ public void overrideDriver(Supplier> overrideCollectio * @return The Mongo driver */ public MongoDBDriver getMongoDriver() { - return getBase(); + return this.getBase(); } protected void overrideDriverGet(Supplier> driverGet) { @@ -84,7 +83,7 @@ protected void overrideDriverGet(Supplier> driverGet) } @Override - public void close() throws Exception { + public void close() { if (!this.isDriverInitialized()) { return; } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java index 1b1c1ebfd..15ac52377 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java @@ -4,10 +4,11 @@ package com.magenic.jmaqs.mongo; -import com.mongodb.MongoClient; -import com.mongodb.MongoClientOptions; -import com.mongodb.MongoClientURI; +import com.mongodb.MongoClientException; +import com.mongodb.MongoClientSettings; import com.mongodb.MongoException; +import com.mongodb.client.MongoClient; +import com.mongodb.client.MongoClients; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import org.bson.Document; @@ -36,31 +37,37 @@ public static MongoCollection getDefaultCollection(){ * @return The email connection */ public static MongoCollection getCollection(String connectionString, String databaseString, String collectionString) { + MongoClient mongoClient; MongoDatabase database; - try (MongoClient connection = new MongoClient(new MongoClientURI(connectionString))) { - database = connection.getDatabase(databaseString); - } catch (Exception e) { - throw new MongoException("connection was not created"); - } + + try { + mongoClient = MongoClients.create(connectionString); + database = mongoClient.getDatabase(databaseString); + } catch (MongoClientException e) { + throw new MongoClientException("connection was not created"); + } catch (MongoException e) { + throw new MongoException("database does not exist"); + } + return database.getCollection(collectionString); } /** * Get the email client using connection information from the test run configuration. - * @param connectionString the connection string * @param databaseString the database string * @param settings the mongoDB settings to be set * @param collectionString the collection string * @return The email connection */ - public static MongoCollection getCollection(String connectionString, String databaseString, - MongoClientOptions settings, String collectionString) { - MongoDatabase database; - try (MongoClient connection = new MongoClient(connectionString, settings)) { - database = connection.getDatabase(databaseString); - } catch (Exception e) { - throw new MongoException("connection was not created"); - } + public static MongoCollection getCollection(String databaseString, + String collectionString, MongoClientSettings settings) { + MongoClient mongoClient = MongoClients.create(settings); + + MongoDatabase database = mongoClient.getDatabase(databaseString); + + if (database.getName() == null) { + throw new MongoException("connection was not created"); + } return database.getCollection(collectionString); } } diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java index 1ad3825ce..f92961775 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java @@ -5,7 +5,7 @@ package com.magenic.jmaqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; -import com.mongodb.MongoClient; +import com.mongodb.client.MongoClient; import com.mongodb.client.MongoCollection; import org.bson.Document; import org.testng.Assert; @@ -42,7 +42,7 @@ public void testGetMongoClient() { @Test(groups = TestCategories.MONGO) public void testSetMongoClient() { this.setMongoDBDriver(new MongoDBDriver()); - this.getMongoDBDriver().setMongoClient(new MongoClient()); + this.getMongoDBDriver().setMongoClient(MongoDBConfig.getConnectionString()); Assert.assertNotNull(this.getMongoDBDriver().getMongoClient()); } @@ -70,7 +70,7 @@ public void testIsCollectionEmpty() { * Test the count all collection items helper function */ @Test(groups = TestCategories.MONGO) - public void testMongoCountAllItemsInCollection() { + public void testCountAllItemsInCollection() { Assert.assertEquals(this.getMongoDBDriver().countAllItemsInCollection(), 4); } diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java index 8182da16d..39640cff7 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java @@ -72,14 +72,4 @@ public void testMongoLinqQuery() { Assert.assertEquals(value.get("lid"), "test1"); } } - - /** - * Make sure the test objects map properly. - */ - @Test(groups = TestCategories.MONGO) - public void testMongoDBTestObjectMapCorrectly() { - Assert.assertEquals(this.getTestObject().getLogger(), this.getLogger(), "Logs don't match"); - Assert.assertEquals(this.getTestObject().getPerfTimerCollection(), this.getPerfTimerCollection(), "Soft asserts don't match"); - Assert.assertEquals(this.getTestObject().getMongoDBDriver(), this.getMongoDBDriver(), "Web service driver don't match"); - } } diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java index 91131594f..e70b31864 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java @@ -11,12 +11,16 @@ import org.testng.annotations.Test; public class MongoDriverManagerUnitTest extends BaseMongoTest{ - + /// + /// Override with default driver + /// @Test(groups = TestCategories.MONGO) - public void testMongoDriverManager() { - MongoDriverManager manager = new MongoDriverManager(MongoDBConfig.getConnectionString(), - MongoDBConfig.getDatabaseString(),MongoDBConfig.getCollectionString(), this.getTestObject()); - Assert.assertNotNull(manager); + public void respectDefaultDriverOverride() { + MongoDBDriver mongoDriver = new MongoDBDriver(); + this.getTestObject().getMongoDBManager().overrideDriver(mongoDriver); + Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); + Assert.assertEquals(mongoDriver.getDatabase(), this.getMongoDBDriver().getDatabase()); + Assert.assertEquals(mongoDriver.getMongoClient(), this.getMongoDBDriver().getMongoClient()); } /// @@ -34,7 +38,7 @@ public void respectCollectionDriverOverride() { /// Override drive with all 3 connection strings /// @Test(groups = TestCategories.MONGO) - public void respectDriverConnectionsOverride() { + public void RespectDriverConnectionsOverride() { MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getConnectionString(), MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); this.getTestObject().getMongoDBManager().overrideDriver(mongoDriver); @@ -45,7 +49,7 @@ public void respectDriverConnectionsOverride() { /// Override driver directly /// @Test(groups = TestCategories.MONGO) - public void respectDirectDriverOverride() { + public void RespectDirectDriverOverride() { MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getCollectionString()); this.setMongoDBDriver(mongoDriver); Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); @@ -55,7 +59,7 @@ public void respectDirectDriverOverride() { /// Override driver with new driver /// @Test(groups = TestCategories.MONGO) - public void respectNewDriverOverride() { + public void RespectNewDriverOverride() { MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getCollectionString()); this.getTestObject().overrideMongoDBDriver(mongoDriver); Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); @@ -65,7 +69,7 @@ public void respectNewDriverOverride() { /// Override drive with collection function /// @Test(groups = TestCategories.MONGO) - public void respectCollectionOverride() { + public void RespectCollectionOverride() { MongoCollection collection = MongoFactory.getDefaultCollection(); this.getTestObject().overrideMongoDBDriver(() -> collection); Assert.assertEquals(collection, this.getMongoDBDriver().getCollection()); @@ -75,7 +79,7 @@ public void respectCollectionOverride() { /// Override drive with all 3 connection strings /// @Test(groups = TestCategories.MONGO) - public void respectDriverConnectionStingsOverride() { + public void RespectDriverConnectionStingsOverride() { MongoCollection collection = this.getMongoDBDriver().getCollection(); this.getTestObject().overrideMongoDBDriver(MongoDBConfig.getConnectionString(), MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); @@ -86,9 +90,9 @@ public void respectDriverConnectionStingsOverride() { /// Override in base with collection function /// @Test(groups = TestCategories.MONGO) - public void respectCollectionOverrideInBase() { + public void RespectCollectionOverrideInBase() { MongoCollection collection = MongoFactory.getDefaultCollection(); - this.overrideConnectionDriver(new MongoDBDriver(collection)); + this.overrideConnectionDriver(() -> collection); Assert.assertEquals(collection, this.getMongoDBDriver().getCollection()); } @@ -96,7 +100,7 @@ public void respectCollectionOverrideInBase() { /// Override in base with new driver /// @Test(groups = TestCategories.MONGO) - public void respectDriverOverrideInBase() { + public void RespectDriverOverrideInBase() { MongoCollection collection = MongoFactory.getDefaultCollection(); this.overrideConnectionDriver(new MongoDBDriver(collection)); Assert.assertEquals(collection, this.getMongoDBDriver().getCollection()); @@ -106,23 +110,10 @@ public void respectDriverOverrideInBase() { /// Override drive with strings in base /// @Test(groups = TestCategories.MONGO) - public void testRespectConnectionStingsOverrideInBase() { + public void RespectConnectionStingsOverrideInBase() { MongoCollection collection = this.getMongoDBDriver().getCollection(); this.overrideConnectionDriver(MongoDBConfig.getConnectionString(), MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); Assert.assertNotEquals(collection, this.getMongoDBDriver().getCollection()); } - - /** - * Override with default driver - */ - @Test(groups = TestCategories.MONGO) - public void respectDefaultDriverOverride() { - MongoDBDriver mongoDriver = new MongoDBDriver(); - this.getTestObject().getMongoDBManager().overrideDriver(mongoDriver); - - Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); - Assert.assertEquals(mongoDriver.getDatabase(), this.getMongoDBDriver().getDatabase()); - Assert.assertEquals(mongoDriver.getMongoClient(), this.getMongoDBDriver().getMongoClient()); - } } diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java index 165513312..3de3868cf 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java @@ -5,20 +5,24 @@ package com.magenic.jmaqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; +import com.mongodb.ConnectionString; +import com.mongodb.MongoClientSettings; import com.mongodb.client.MongoCollection; import org.bson.Document; import org.testng.Assert; import org.testng.annotations.Test; public class MongoTestObjectUnitTest extends BaseMongoTest { - private final MongoCollection collection = this.getMongoDBDriver().getCollection(); - private final MongoCollection newCollection = MongoFactory.getDefaultCollection(); + /** * Is the collection override respected. */ @Test(groups = TestCategories.MONGO) public void overrideCollectionFunction() { + MongoCollection collection = this.getMongoDBDriver().getCollection(); + MongoCollection newCollection = MongoFactory.getDefaultCollection(); + this.getTestObject().overrideMongoDBDriver(() -> newCollection); Assert.assertNotEquals(collection, this.getMongoDBDriver().getCollection()); Assert.assertEquals(newCollection, this.getMongoDBDriver().getCollection()); @@ -30,6 +34,7 @@ public void overrideCollectionFunction() { */ @Test(groups = TestCategories.MONGO) public void overrideConnectionStrings() { + MongoCollection collection = this.getMongoDBDriver().getCollection(); this.getTestObject().overrideMongoDBDriver(MongoDBConfig.getConnectionString(), MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); @@ -57,8 +62,13 @@ public void overrideDriver() { @Test(groups = TestCategories.MONGO) public void overrideWithCustomDriver() { MongoDBDriver firstDriver = this.getMongoDBDriver(); - MongoDBDriver newDriver = new MongoDBDriver(MongoFactory.getCollection(MongoDBConfig.getConnectionString(), - MongoDBConfig.getDatabaseString(), null, MongoDBConfig.getCollectionString())); + + MongoClientSettings settings = MongoClientSettings.builder() + .applyConnectionString(new ConnectionString(MongoDBConfig.getConnectionString())) + .build(); + + MongoDBDriver newDriver = new MongoDBDriver(settings, + MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); this.getTestObject().overrideMongoDBDriver(newDriver); Assert.assertNotEquals(firstDriver, this.getMongoDBDriver()); @@ -70,9 +80,9 @@ public void overrideWithCustomDriver() { /// Make sure the test objects map properly /// @Test(groups = TestCategories.MONGO) - public void testMongoDBTestObjectMapCorrectly() { + public void TestMongoDBTestObjectMapCorrectly() { Assert.assertEquals(this.getTestObject().getLogger(), this.getLogger(), "Logs don't match"); - Assert.assertEquals(this.getTestObject().getPerfTimerCollection(), this.getPerfTimerCollection(), "The Perf timers don't match"); - Assert.assertEquals(this.getTestObject().getMongoDBDriver(), this.getMongoDBDriver(), "MongoDB drivers don't match"); + Assert.assertEquals(this.getTestObject().getPerfTimerCollection(), this.getPerfTimerCollection(), "Perf Timer Collections don't match"); + Assert.assertEquals(this.getTestObject().getMongoDBDriver(), this.getMongoDBDriver(), "Web service driver don't match"); } } From 389b376e25c4dac28e890e34a22d7bb081ec63c1 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Thu, 28 Jan 2021 13:50:58 -0600 Subject: [PATCH 11/36] updated pom --- jmaqs-mongoDB/pom.xml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jmaqs-mongoDB/pom.xml b/jmaqs-mongoDB/pom.xml index 49328056f..ab8c030f0 100644 --- a/jmaqs-mongoDB/pom.xml +++ b/jmaqs-mongoDB/pom.xml @@ -1,15 +1,16 @@ - + + 4.0.0 - com.magenic.jmaqs jmaqs-framework ${revision} - com.magenic.jmaqs.mongoDB jmaqs-mongoDB - JMAQS MongoDB Database Testing Module + JMAQS MongoDB Testing Module From caf6cce0b8fa5de2bffd2fc0b986f8951911f204 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Fri, 4 Jun 2021 10:16:55 -0500 Subject: [PATCH 12/36] checkstyle changes --- .../magenic/jmaqs/mongo/BaseMongoTest.java | 15 ++++--- .../magenic/jmaqs/mongo/MongoDBConfig.java | 5 ++- .../magenic/jmaqs/mongo/MongoDBDriver.java | 39 +++++++++++++------ .../jmaqs/mongo/MongoDriverManager.java | 13 ++++--- .../com/magenic/jmaqs/mongo/MongoFactory.java | 24 ++++++++---- .../magenic/jmaqs/mongo/MongoTestObject.java | 9 ++--- .../jmaqs/mongo/MongoDBDriverUnitTest.java | 16 -------- 7 files changed, 65 insertions(+), 56 deletions(-) diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java index 4482c047e..56b3cc078 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java @@ -6,11 +6,10 @@ import com.magenic.jmaqs.base.BaseExtendableTest; import com.mongodb.client.MongoCollection; +import java.util.function.Supplier; import org.bson.Document; import org.testng.ITestResult; -import java.util.function.Supplier; - /** * Generic base MongoDB test class. */ @@ -55,12 +54,12 @@ public void overrideConnectionDriver(Supplier> overrid this.getTestObject().overrideMongoDBDriver(overrideCollectionConnection); } - /** - * Override the Mongo driver - respects lazy loading. - * @param connectionString Client connection string - * @param databaseString Database connection string - * @param collectionString Mongo collection string - */ + /** + * Override the Mongo driver - respects lazy loading. + * @param connectionString Client connection string + * @param databaseString Database connection string + * @param collectionString Mongo collection string + */ public void overrideConnectionDriver(String connectionString, String databaseString, String collectionString) { this.getTestObject().overrideMongoDBDriver(connectionString, databaseString, collectionString); } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java index f1c499d7d..d1fe1b2f8 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java @@ -12,7 +12,8 @@ */ public class MongoDBConfig { - private MongoDBConfig() {} + private MongoDBConfig() { + } /** * The MongoDB configuration section. @@ -46,7 +47,7 @@ public static String getCollectionString() { /** * Get the database timeout in seconds * @return The timeout in seconds from the config file or default - * of 30 seconds when no config.xml key is found + * of 30 seconds when no config.xml key is found */ public static int getQueryTimeout() { return Integer.parseInt(Config.getValueForSection(MONGO_SECTION, "MongoTimeout", "30")); diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java index f64c6856f..fd64dee52 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java @@ -11,15 +11,14 @@ import com.mongodb.client.MongoDatabase; import java.util.ArrayList; import java.util.List; - import org.bson.Document; /** - * Class to wrap the MongoCollection and related helper functions + * Class to wrap the MongoCollection and related helper functions. */ -public class MongoDBDriver implements AutoCloseable{ +public class MongoDBDriver implements AutoCloseable { /** - * Initializes a new instance of the MongoDBDriver class + * Initializes a new instance of the MongoDBDriver class. * @param collection The collection object */ public MongoDBDriver(MongoCollection collection) { @@ -27,7 +26,7 @@ public MongoDBDriver(MongoCollection collection) { } /** - * Initializes a new instance of the MongoDBDriver class + * Initializes a new instance of the MongoDBDriver class. * @param connectionString Server address * @param databaseString Name of the database * @param collectionString Name of the collection @@ -73,7 +72,7 @@ public MongoDBDriver() { * @return the mongo client */ public MongoClient getMongoClient() { - return this.client; + return this.client; } /** @@ -98,13 +97,22 @@ public void setMongoClient(MongoClientSettings mongoClientSettings) { * @return the MongoDB database object */ public MongoDatabase getDatabase() { - return this.database; + return this.database; } + /** + * Sets the database object. + * @param mongoClient the mongo DB client of the database + * @param mongoDatabase the name of the mongo database + */ public void setDatabase(MongoClient mongoClient, String mongoDatabase) { this.database = mongoClient.getDatabase(mongoDatabase); } + /** + * Sets the database object. + * @param mongoDatabase the name of the mongo database + */ public void setDatabase(String mongoDatabase) { this.database = this.getMongoClient().getDatabase(mongoDatabase); } @@ -118,7 +126,9 @@ public void setDatabase(String mongoDatabase) { * Gets the collection object. * @return a mongo collection */ - public MongoCollection getCollection() { return collection; } + public MongoCollection getCollection() { + return collection; + } /** * Sets the Mongo Collection object. @@ -128,12 +138,17 @@ private void setCollection(MongoCollection newCollection) { this.collection = newCollection; } + /** + * Sets the Mongo Collection object. + * @param database the mongo DB database of the collection + * @param collection the string value of the collection + */ private void setCollection(MongoDatabase database, String collection) { this.collection = database.getCollection(collection); } /** - * List all of the items in the collection + * List all of the items in the collection. * @return List of the items in the collection */ public List listAllCollectionItems() { @@ -145,7 +160,7 @@ public List listAllCollectionItems() { * @return True if the collection is empty, false otherwise */ public boolean isCollectionEmpty() { - return this.getCollection() == null; + return this.getCollection().countDocuments() == 0; } /** @@ -156,7 +171,7 @@ public int countAllItemsInCollection() { return (int) this.getCollection().countDocuments(); } - @Override public void close() { - + @Override + public void close() { } } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java index fed7f6847..715805667 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java @@ -7,8 +7,8 @@ import com.magenic.jmaqs.base.BaseTestObject; import com.magenic.jmaqs.base.DriverManager; import com.mongodb.client.MongoCollection; -import org.bson.Document; import java.util.function.Supplier; +import org.bson.Document; /** * Mongo database driver. @@ -26,8 +26,10 @@ public class MongoDriverManager extends DriverManager { * @param collectionString Mongo collection string * @param testObject Test object this driver is getting added to */ - public MongoDriverManager(String connectionString, String databaseString, String collectionString, BaseTestObject testObject) { - super(() -> new MongoDBDriver(MongoFactory.getCollection(connectionString, databaseString, collectionString)), testObject); + public MongoDriverManager(String connectionString, String databaseString, + String collectionString, BaseTestObject testObject) { + super(() -> new MongoDBDriver( + MongoFactory.getCollection(connectionString, databaseString, collectionString)), testObject); } /** TODO: is this needed? @@ -71,13 +73,14 @@ public void overrideDriver(Supplier> overrideCollectio } /** - * Get the Mongo driver + * Get the Mongo driver. * @return The Mongo driver */ public MongoDBDriver getMongoDriver() { return this.getBase(); } + protected void overrideDriverGet(Supplier> driverGet) { this.setBaseDriver(new MongoDBDriver(driverGet.get())); } @@ -88,7 +91,7 @@ public void close() { return; } MongoDBDriver mongoDBDriver = this.getMongoDriver(); - mongoDBDriver.close(); + mongoDBDriver.getMongoClient().close(); this.baseDriver = null; } } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java index 15ac52377..5f99a087a 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java @@ -18,13 +18,14 @@ */ public class MongoFactory { - private MongoFactory() {} + private MongoFactory() { + } /** * Get the email client using connection information from the test run configuration. * @return The email connection */ - public static MongoCollection getDefaultCollection(){ + public static MongoCollection getDefaultCollection() { return getCollection(MongoDBConfig.getConnectionString(), MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); } @@ -36,7 +37,8 @@ public static MongoCollection getDefaultCollection(){ * @param collectionString the collection string * @return The email connection */ - public static MongoCollection getCollection(String connectionString, String databaseString, String collectionString) { + public static MongoCollection getCollection( + String connectionString, String databaseString, String collectionString) { MongoClient mongoClient; MongoDatabase database; @@ -63,11 +65,17 @@ public static MongoCollection getCollection(String databaseString, String collectionString, MongoClientSettings settings) { MongoClient mongoClient = MongoClients.create(settings); - MongoDatabase database = mongoClient.getDatabase(databaseString); + MongoDatabase database; + + try { + database = mongoClient.getDatabase(databaseString); + } catch (Exception e) { + throw new MongoException("connection was not created: " + e); + } - if (database.getName() == null) { - throw new MongoException("connection was not created"); - } - return database.getCollection(collectionString); + if (database.getName() == null) { + throw new MongoException("connection was not created"); + } + return database.getCollection(collectionString); } } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java index 98b4ebd81..6bb8b55dc 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java @@ -7,16 +7,15 @@ import com.magenic.jmaqs.base.BaseTestObject; import com.magenic.jmaqs.utilities.logging.Logger; import com.mongodb.client.MongoCollection; -import org.bson.Document; - import java.util.function.Supplier; +import org.bson.Document; /** * Mongo test context data. */ public class MongoTestObject extends BaseTestObject { /** - * Initializes a new instance of the MongoTestObject class + * Initializes a new instance of the MongoTestObject class. * @param connectionString Client connection string * @param databaseString Database connection string * @param collectionString Mongo collection string @@ -24,7 +23,7 @@ public class MongoTestObject extends BaseTestObject { * @param fullyQualifiedTestName The test's fully qualified test name */ public MongoTestObject(String connectionString, String databaseString, String collectionString, Logger logger, - String fullyQualifiedTestName) { + String fullyQualifiedTestName) { super(logger, fullyQualifiedTestName); this.getManagerStore().put((MongoDriverManager.class).getCanonicalName(), new MongoDriverManager(connectionString,databaseString,collectionString, this)); @@ -43,7 +42,7 @@ public MongoDriverManager getMongoDBManager() { * @return the stored mongoDB driver. */ public MongoDBDriver getMongoDBDriver() { - return this.getMongoDBManager().getMongoDriver(); + return this.getMongoDBManager().getMongoDriver(); } /** diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java index f92961775..b17b6a801 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java @@ -9,7 +9,6 @@ import com.mongodb.client.MongoCollection; import org.bson.Document; import org.testng.Assert; -import org.testng.ITestResult; import org.testng.annotations.Test; import java.util.List; @@ -73,19 +72,4 @@ public void testIsCollectionEmpty() { public void testCountAllItemsInCollection() { Assert.assertEquals(this.getMongoDBDriver().countAllItemsInCollection(), 4); } - - /** - * Steps to do before logging teardown results. - * - * @param resultType The test result - */ - @Override - protected void beforeLoggingTeardown(ITestResult resultType) { - - } - - @Override - protected void createNewTestObject() { - - } } From b881d0148398e8f8771d1662141bd143652bb639 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Wed, 9 Jun 2021 11:11:17 -0500 Subject: [PATCH 13/36] added MongoDB as dependency in framework .pom --- pom.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pom.xml b/pom.xml index 42691c3b7..16f928a9b 100644 --- a/pom.xml +++ b/pom.xml @@ -309,6 +309,11 @@ jmaqs-cucumber ${project.version} + + com.magenic.jmaqs.mongoDB + jmaqs-mongoDB + ${project.version} + From 63eb864b76b10d41efd0bb642719245d531d6034 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Wed, 9 Jun 2021 12:19:14 -0500 Subject: [PATCH 14/36] checkstyle updates --- .../main/java/com/magenic/jmaqs/mongo/MongoTestObject.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java index 6bb8b55dc..90ff18a28 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java @@ -22,8 +22,8 @@ public class MongoTestObject extends BaseTestObject { * @param logger The test's logger * @param fullyQualifiedTestName The test's fully qualified test name */ - public MongoTestObject(String connectionString, String databaseString, String collectionString, Logger logger, - String fullyQualifiedTestName) { + public MongoTestObject(String connectionString, String databaseString, String collectionString, + Logger logger, String fullyQualifiedTestName) { super(logger, fullyQualifiedTestName); this.getManagerStore().put((MongoDriverManager.class).getCanonicalName(), new MongoDriverManager(connectionString,databaseString,collectionString, this)); From 8663ef46d8b95e516744ccc294cbb97c247a12ad Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Wed, 9 Jun 2021 12:23:19 -0500 Subject: [PATCH 15/36] checkstyle updates --- .../main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java | 2 +- .../main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java | 8 ++++---- .../java/com/magenic/jmaqs/mongo/MongoDriverManager.java | 1 - .../main/java/com/magenic/jmaqs/mongo/MongoFactory.java | 4 ++-- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java index 56b3cc078..f7afd73da 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java @@ -31,7 +31,7 @@ public MongoDBDriver getMongoDBDriver() { } /** - * Sets the MongoDB driver + * Sets the MongoDB driver. * @param driver the MongoDB driver to be set. */ public void setMongoDBDriver(MongoDBDriver driver) { diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java index d1fe1b2f8..47e88385e 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java @@ -8,7 +8,7 @@ import com.magenic.jmaqs.utilities.helper.ConfigSection; /** - * MongoDB config class + * MongoDB config class. */ public class MongoDBConfig { @@ -29,7 +29,7 @@ public static String getConnectionString() { } /** - * Get the database connection string + * Get the database connection string. * @return The database name */ public static String getDatabaseString() { @@ -37,7 +37,7 @@ public static String getDatabaseString() { } /** - * Get the mongo collection string + * Get the mongo collection string. * @return The mongo collection string */ public static String getCollectionString() { @@ -45,7 +45,7 @@ public static String getCollectionString() { } /** - * Get the database timeout in seconds + * Get the database timeout in seconds. * @return The timeout in seconds from the config file or default * of 30 seconds when no config.xml key is found */ diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java index 715805667..b4de22a3d 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java @@ -85,7 +85,6 @@ protected void overrideDriverGet(Supplier> driverGet) this.setBaseDriver(new MongoDBDriver(driverGet.get())); } - @Override public void close() { if (!this.isDriverInitialized()) { return; diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java index 5f99a087a..abcf2bb46 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java @@ -50,7 +50,6 @@ public static MongoCollection getCollection( } catch (MongoException e) { throw new MongoException("database does not exist"); } - return database.getCollection(collectionString); } @@ -63,11 +62,12 @@ public static MongoCollection getCollection( */ public static MongoCollection getCollection(String databaseString, String collectionString, MongoClientSettings settings) { - MongoClient mongoClient = MongoClients.create(settings); + MongoClient mongoClient; MongoDatabase database; try { + mongoClient = MongoClients.create(settings); database = mongoClient.getDatabase(databaseString); } catch (Exception e) { throw new MongoException("connection was not created: " + e); From b1572c919e33ef3c2f5f87f1a408d9eba5df0202 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Fri, 11 Jun 2021 13:01:24 -0500 Subject: [PATCH 16/36] updated mongodb driver version --- jmaqs-mongoDB/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jmaqs-mongoDB/pom.xml b/jmaqs-mongoDB/pom.xml index ab8c030f0..d1038358c 100644 --- a/jmaqs-mongoDB/pom.xml +++ b/jmaqs-mongoDB/pom.xml @@ -28,7 +28,7 @@ org.mongodb mongodb-driver-sync - 4.2.0 + 4.2.3 org.testng From a7e7df81f0b0e2d45c011780bfef9243f5f9a822 Mon Sep 17 00:00:00 2001 From: Jon Reding Date: Mon, 18 Oct 2021 14:26:37 -0500 Subject: [PATCH 17/36] added comments formatting --- .../magenic/jmaqs/mongo/BaseMongoTest.java | 3 +- .../magenic/jmaqs/mongo/MongoDBDriver.java | 1 + .../jmaqs/mongo/MongoDriverManager.java | 2 +- .../magenic/jmaqs/mongo/MongoTestObject.java | 1 + .../jmaqs/mongo/BaseMongoUnitTest.java | 3 + .../jmaqs/mongo/MongoDBConfigUnitTest.java | 1 + .../jmaqs/mongo/MongoDBDriverUnitTest.java | 2 +- .../mongo/MongoDBFunctionalUnitTest.java | 4 +- .../mongo/MongoDriverManagerUnitTest.java | 66 ++++++++++--------- .../jmaqs/mongo/MongoTestObjectUnitTest.java | 4 +- 10 files changed, 51 insertions(+), 36 deletions(-) diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java index f7afd73da..773342eff 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java @@ -14,12 +14,13 @@ * Generic base MongoDB test class. */ public class BaseMongoTest extends BaseExtendableTest { + /** * Initializes a new instance of the BaseMongoTest class, * Setup the database client for each test class. */ public BaseMongoTest() { - // Currently not populated with any logic + // Currently, not populated with any logic } /** diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java index fd64dee52..7b0811e8d 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java @@ -17,6 +17,7 @@ * Class to wrap the MongoCollection and related helper functions. */ public class MongoDBDriver implements AutoCloseable { + /** * Initializes a new instance of the MongoDBDriver class. * @param collection The collection object diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java index b4de22a3d..7c4e148d7 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java @@ -14,6 +14,7 @@ * Mongo database driver. */ public class MongoDriverManager extends DriverManager { + /** * Cached copy of the connection driver. */ @@ -80,7 +81,6 @@ public MongoDBDriver getMongoDriver() { return this.getBase(); } - protected void overrideDriverGet(Supplier> driverGet) { this.setBaseDriver(new MongoDBDriver(driverGet.get())); } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java index 90ff18a28..fa89ade9d 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java +++ b/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java @@ -14,6 +14,7 @@ * Mongo test context data. */ public class MongoTestObject extends BaseTestObject { + /** * Initializes a new instance of the MongoTestObject class. * @param connectionString Client connection string diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java index bd8750fb5..85132c761 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java @@ -8,6 +8,9 @@ import org.testng.Assert; import org.testng.annotations.Test; +/** + * Test the Base Mongo Test functionality. + */ public class BaseMongoUnitTest extends BaseMongoTest { @Test(groups = TestCategories.MONGO) public void testGetMongoDBDriver() { diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java index 5a019ba5c..4c69dfcd2 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java @@ -12,6 +12,7 @@ * Test class for database configurations. */ public class MongoDBConfigUnitTest extends BaseMongoTest{ + /** * Gets the connection string. */ diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java index b17b6a801..8ab8baa5c 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java @@ -13,7 +13,7 @@ import java.util.List; /** - * Test basic mongo base test functionality + * Test mongo base test functionality */ public class MongoDBDriverUnitTest extends BaseMongoTest { diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java index 39640cff7..c619368be 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java @@ -10,10 +10,12 @@ import org.bson.conversions.Bson; import org.testng.Assert; import org.testng.annotations.Test; - import java.util.ArrayList; import java.util.List; +/** + * Test Mongo Functionality. + */ public class MongoDBFunctionalUnitTest extends BaseMongoTest{ /** diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java index e70b31864..c5bd97e11 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java @@ -10,10 +10,14 @@ import org.testng.Assert; import org.testng.annotations.Test; +/** + * Test the mongo driver manager functionality. + */ public class MongoDriverManagerUnitTest extends BaseMongoTest{ - /// - /// Override with default driver - /// + + /** + * Override with default driver. + */ @Test(groups = TestCategories.MONGO) public void respectDefaultDriverOverride() { MongoDBDriver mongoDriver = new MongoDBDriver(); @@ -23,20 +27,20 @@ public void respectDefaultDriverOverride() { Assert.assertEquals(mongoDriver.getMongoClient(), this.getMongoDBDriver().getMongoClient()); } - /// - /// Override driver with collection string - /// + /** + * Override driver with collection string. + */ @Test(groups = TestCategories.MONGO) public void respectCollectionDriverOverride() { - //MongoDBConfig.GetConnectionString(), MongoDBConfig.GetDatabaseString(), collectionString + // MongoDBConfig.GetConnectionString(), MongoDBConfig.GetDatabaseString(), collectionString MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getCollectionString()); this.getTestObject().getMongoDBManager().overrideDriver(mongoDriver); Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); } - /// - /// Override drive with all 3 connection strings - /// + /** + * Override drive with all 3 connection strings. + */ @Test(groups = TestCategories.MONGO) public void RespectDriverConnectionsOverride() { MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getConnectionString(), @@ -45,9 +49,9 @@ public void RespectDriverConnectionsOverride() { Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); } - /// - /// Override driver directly - /// + /** + * Override driver directly. + */ @Test(groups = TestCategories.MONGO) public void RespectDirectDriverOverride() { MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getCollectionString()); @@ -55,9 +59,9 @@ public void RespectDirectDriverOverride() { Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); } - /// - /// Override driver with new driver - /// + /** + * Override driver with new driver. + */ @Test(groups = TestCategories.MONGO) public void RespectNewDriverOverride() { MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getCollectionString()); @@ -65,9 +69,9 @@ public void RespectNewDriverOverride() { Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); } - /// - /// Override drive with collection function - /// + /** + * Override drive with collection function. + */ @Test(groups = TestCategories.MONGO) public void RespectCollectionOverride() { MongoCollection collection = MongoFactory.getDefaultCollection(); @@ -75,9 +79,9 @@ public void RespectCollectionOverride() { Assert.assertEquals(collection, this.getMongoDBDriver().getCollection()); } - /// - /// Override drive with all 3 connection strings - /// + /** + * Override drive with all 3 connection strings. + */ @Test(groups = TestCategories.MONGO) public void RespectDriverConnectionStingsOverride() { MongoCollection collection = this.getMongoDBDriver().getCollection(); @@ -86,9 +90,9 @@ public void RespectDriverConnectionStingsOverride() { Assert.assertNotEquals(collection, this.getMongoDBDriver().getCollection()); } - /// - /// Override in base with collection function - /// + /** + * Override in base with collection function. + */ @Test(groups = TestCategories.MONGO) public void RespectCollectionOverrideInBase() { MongoCollection collection = MongoFactory.getDefaultCollection(); @@ -96,9 +100,9 @@ public void RespectCollectionOverrideInBase() { Assert.assertEquals(collection, this.getMongoDBDriver().getCollection()); } - /// - /// Override in base with new driver - /// + /** + * Override in base with new driver. + */ @Test(groups = TestCategories.MONGO) public void RespectDriverOverrideInBase() { MongoCollection collection = MongoFactory.getDefaultCollection(); @@ -106,9 +110,9 @@ public void RespectDriverOverrideInBase() { Assert.assertEquals(collection, this.getMongoDBDriver().getCollection()); } - /// - /// Override drive with strings in base - /// + /** + * Override drive with strings in base. + */ @Test(groups = TestCategories.MONGO) public void RespectConnectionStingsOverrideInBase() { MongoCollection collection = this.getMongoDBDriver().getCollection(); diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java index 3de3868cf..4ca1e61ff 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java +++ b/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java @@ -12,9 +12,11 @@ import org.testng.Assert; import org.testng.annotations.Test; +/** + * Test the mongo test object functionality. + */ public class MongoTestObjectUnitTest extends BaseMongoTest { - /** * Is the collection override respected. */ From 245bb189c9f505c57b62671a07c701eec3be70f5 Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Sat, 22 Jan 2022 19:12:22 -0600 Subject: [PATCH 18/36] add docker stuff for mongo db --- Docker/MAQSMongoDB/docker-compose.yml | 20 ++++++++++++++++++++ Docker/MAQSMongoDB/seed/seed.js | 22 ++++++++++++++++++++++ Docker/docker-compose.yml | 15 +++++++++++++++ 3 files changed, 57 insertions(+) create mode 100644 Docker/MAQSMongoDB/docker-compose.yml create mode 100644 Docker/MAQSMongoDB/seed/seed.js create mode 100644 Docker/docker-compose.yml diff --git a/Docker/MAQSMongoDB/docker-compose.yml b/Docker/MAQSMongoDB/docker-compose.yml new file mode 100644 index 000000000..3f4517b9a --- /dev/null +++ b/Docker/MAQSMongoDB/docker-compose.yml @@ -0,0 +1,20 @@ +version: '2' + +services: + mongo: + image: mongo + restart: always + ports: + - "27017:27017" + volumes: + - ./seed/seed.js:/docker-entrypoint-initdb.d/seed.js + mongo-express: + image: mongo-express + restart: always + ports: + - 8081:8081 + links: + - mongo + environment: + ME_CONFIG_MONGODB_ADMINUSERNAME: + ME_CONFIG_MONGODB_ADMINPASSWORD: \ No newline at end of file diff --git a/Docker/MAQSMongoDB/seed/seed.js b/Docker/MAQSMongoDB/seed/seed.js new file mode 100644 index 000000000..badfaf331 --- /dev/null +++ b/Docker/MAQSMongoDB/seed/seed.js @@ -0,0 +1,22 @@ +db = db.getSiblingDB('MongoDatabaseTest') +db.MongoTestCollection.drop(); +db.MongoTestCollection.insertMany([ + { + "lid": "test1", + "isChanged": true, + "order": 1 + }, + { + "lid": "test2", + "isChanged": false, + "order": 2 + }, + { + "lid": "test3", + "isChanged": false + }, + { + "lid": "test4", + "isChanged": false + } +]) \ No newline at end of file diff --git a/Docker/docker-compose.yml b/Docker/docker-compose.yml new file mode 100644 index 000000000..44c3c95f1 --- /dev/null +++ b/Docker/docker-compose.yml @@ -0,0 +1,15 @@ +# The extends functionality is not yet available in +# Docker config files versioned 3 and higher. +# If the version is bumped, this config file will have to change. +# See https://github.com/moby/moby/issues/31101. +version: '2' + +services: + mssql: + extends: + file: ./MAQSSQLServer/docker-compose.yml + service: mssql + mongo: + extends: + file: ./MAQSMongoDB/docker-compose.yml + service: mongo \ No newline at end of file From 141c4eb2781743022f3978052c4ca5eadd557479 Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Sat, 22 Jan 2022 20:49:14 -0600 Subject: [PATCH 19/36] more edits for mongo db --- {jmaqs-mongoDB => maqs-mongoDB}/config.xml | 4 ++-- {jmaqs-mongoDB => maqs-mongoDB}/pom.xml | 12 ++++-------- .../java/com/magenic/maqs}/mongo/BaseMongoTest.java | 10 +++++----- .../java/com/magenic/maqs}/mongo/MongoDBConfig.java | 4 ++-- .../java/com/magenic/maqs}/mongo/MongoDBDriver.java | 8 ++++---- .../com/magenic/maqs}/mongo/MongoDriverManager.java | 4 ++-- .../java/com/magenic/maqs}/mongo/MongoFactory.java | 6 +++--- .../com/magenic/maqs}/mongo/MongoTestObject.java | 4 ++-- .../com/magenic/maqs}/mongo/BaseMongoUnitTest.java | 4 ++-- .../magenic/maqs}/mongo/MongoDBConfigUnitTest.java | 4 ++-- .../magenic/maqs}/mongo/MongoDBDriverUnitTest.java | 4 ++-- .../maqs}/mongo/MongoDBFunctionalUnitTest.java | 4 ++-- .../maqs}/mongo/MongoDriverManagerUnitTest.java | 4 ++-- .../magenic/maqs}/mongo/MongoTestObjectUnitTest.java | 4 ++-- pom.xml | 6 +++--- 15 files changed, 39 insertions(+), 43 deletions(-) rename {jmaqs-mongoDB => maqs-mongoDB}/config.xml (97%) rename {jmaqs-mongoDB => maqs-mongoDB}/pom.xml (79%) rename {jmaqs-mongoDB/src/main/java/com/magenic/jmaqs => maqs-mongoDB/src/main/java/com/magenic/maqs}/mongo/BaseMongoTest.java (92%) rename {jmaqs-mongoDB/src/main/java/com/magenic/jmaqs => maqs-mongoDB/src/main/java/com/magenic/maqs}/mongo/MongoDBConfig.java (93%) rename {jmaqs-mongoDB/src/main/java/com/magenic/jmaqs => maqs-mongoDB/src/main/java/com/magenic/maqs}/mongo/MongoDBDriver.java (96%) rename {jmaqs-mongoDB/src/main/java/com/magenic/jmaqs => maqs-mongoDB/src/main/java/com/magenic/maqs}/mongo/MongoDriverManager.java (97%) rename {jmaqs-mongoDB/src/main/java/com/magenic/jmaqs => maqs-mongoDB/src/main/java/com/magenic/maqs}/mongo/MongoFactory.java (95%) rename {jmaqs-mongoDB/src/main/java/com/magenic/jmaqs => maqs-mongoDB/src/main/java/com/magenic/maqs}/mongo/MongoTestObject.java (96%) rename {jmaqs-mongoDB/src/test/java/com/magenic/jmaqs => maqs-mongoDB/src/test/java/com/magenic/maqs}/mongo/BaseMongoUnitTest.java (96%) rename {jmaqs-mongoDB/src/test/java/com/magenic/jmaqs => maqs-mongoDB/src/test/java/com/magenic/maqs}/mongo/MongoDBConfigUnitTest.java (94%) rename {jmaqs-mongoDB/src/test/java/com/magenic/jmaqs => maqs-mongoDB/src/test/java/com/magenic/maqs}/mongo/MongoDBDriverUnitTest.java (96%) rename {jmaqs-mongoDB/src/test/java/com/magenic/jmaqs => maqs-mongoDB/src/test/java/com/magenic/maqs}/mongo/MongoDBFunctionalUnitTest.java (96%) rename {jmaqs-mongoDB/src/test/java/com/magenic/jmaqs => maqs-mongoDB/src/test/java/com/magenic/maqs}/mongo/MongoDriverManagerUnitTest.java (98%) rename {jmaqs-mongoDB/src/test/java/com/magenic/jmaqs => maqs-mongoDB/src/test/java/com/magenic/maqs}/mongo/MongoTestObjectUnitTest.java (97%) diff --git a/jmaqs-mongoDB/config.xml b/maqs-mongoDB/config.xml similarity index 97% rename from jmaqs-mongoDB/config.xml rename to maqs-mongoDB/config.xml index 8a3179607..54da3ca88 100644 --- a/jmaqs-mongoDB/config.xml +++ b/maqs-mongoDB/config.xml @@ -1,7 +1,7 @@ - + 100 @@ -31,7 +31,7 @@ ./target/logs - + mongodb://localhost:27017 MongoDatabaseTest diff --git a/jmaqs-mongoDB/pom.xml b/maqs-mongoDB/pom.xml similarity index 79% rename from jmaqs-mongoDB/pom.xml rename to maqs-mongoDB/pom.xml index d1038358c..be58b06d4 100644 --- a/jmaqs-mongoDB/pom.xml +++ b/maqs-mongoDB/pom.xml @@ -8,9 +8,9 @@ jmaqs-framework ${revision} - com.magenic.jmaqs.mongoDB + com.magenic.maqs.mongoDB jmaqs-mongoDB - JMAQS MongoDB Testing Module + MAQS MongoDB Testing Module @@ -28,16 +28,12 @@ org.mongodb mongodb-driver-sync - 4.2.3 + 4.4.1 org.testng testng - - com.magenic.jmaqs.webservices - jmaqs-webservices-jdk8 - test - + diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java b/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/BaseMongoTest.java similarity index 92% rename from jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java rename to maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/BaseMongoTest.java index 773342eff..677ef6dfe 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/BaseMongoTest.java +++ b/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/BaseMongoTest.java @@ -1,8 +1,8 @@ /* - * Copyright 2021 (C) Magenic, All rights Reserved + * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.jmaqs.mongo; +package com.magenic.maqs.mongo; import com.magenic.jmaqs.base.BaseExtendableTest; import com.mongodb.client.MongoCollection; @@ -17,7 +17,7 @@ public class BaseMongoTest extends BaseExtendableTest { /** * Initializes a new instance of the BaseMongoTest class, - * Setup the database client for each test class. + * Set up the database client for each test class. */ public BaseMongoTest() { // Currently, not populated with any logic @@ -96,11 +96,11 @@ protected void createNewTestObject() { } /** - * Steps to do before logging teardown results. + * Steps to take before logging teardown results. * @param resultType The test result */ @Override protected void beforeLoggingTeardown(ITestResult resultType) { - // Currently not populated with any logic + // Currently, not populated with any logic } } diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java b/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDBConfig.java similarity index 93% rename from jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java rename to maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDBConfig.java index 47e88385e..8fb55afc2 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBConfig.java +++ b/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDBConfig.java @@ -1,8 +1,8 @@ /* - * Copyright 2021 (C) Magenic, All rights Reserved + * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.jmaqs.mongo; +package com.magenic.maqs.mongo; import com.magenic.jmaqs.utilities.helper.Config; import com.magenic.jmaqs.utilities.helper.ConfigSection; diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java b/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDBDriver.java similarity index 96% rename from jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java rename to maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDBDriver.java index 7b0811e8d..82ef5d3fb 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDBDriver.java +++ b/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDBDriver.java @@ -1,8 +1,8 @@ /* - * Copyright 2021 (C) Magenic, All rights Reserved + * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.jmaqs.mongo; +package com.magenic.maqs.mongo; import com.mongodb.MongoClientSettings; import com.mongodb.client.MongoClient; @@ -149,7 +149,7 @@ private void setCollection(MongoDatabase database, String collection) { } /** - * List all of the items in the collection. + * List all the items in the collection. * @return List of the items in the collection */ public List listAllCollectionItems() { @@ -165,7 +165,7 @@ public boolean isCollectionEmpty() { } /** - * Counts all of the items in the collection. + * Counts all the items in the collection. * @return Number of items in the collection */ public int countAllItemsInCollection() { diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java b/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDriverManager.java similarity index 97% rename from jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java rename to maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDriverManager.java index 7c4e148d7..b7459a9e2 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoDriverManager.java +++ b/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDriverManager.java @@ -1,8 +1,8 @@ /* - * Copyright 2021 (C) Magenic, All rights Reserved + * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.jmaqs.mongo; +package com.magenic.maqs.mongo; import com.magenic.jmaqs.base.BaseTestObject; import com.magenic.jmaqs.base.DriverManager; diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java b/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoFactory.java similarity index 95% rename from jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java rename to maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoFactory.java index abcf2bb46..aaf7f2108 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoFactory.java +++ b/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoFactory.java @@ -1,8 +1,8 @@ /* - * Copyright 2021 (C) Magenic, All rights Reserved + * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.jmaqs.mongo; +package com.magenic.maqs.mongo; import com.mongodb.MongoClientException; import com.mongodb.MongoClientSettings; @@ -73,7 +73,7 @@ public static MongoCollection getCollection(String databaseString, throw new MongoException("connection was not created: " + e); } - if (database.getName() == null) { + if (database.getName().isEmpty()) { throw new MongoException("connection was not created"); } return database.getCollection(collectionString); diff --git a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java b/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoTestObject.java similarity index 96% rename from jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java rename to maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoTestObject.java index fa89ade9d..2769d3e30 100644 --- a/jmaqs-mongoDB/src/main/java/com/magenic/jmaqs/mongo/MongoTestObject.java +++ b/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoTestObject.java @@ -1,8 +1,8 @@ /* - * Copyright 2021 (C) Magenic, All rights Reserved + * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.jmaqs.mongo; +package com.magenic.maqs.mongo; import com.magenic.jmaqs.base.BaseTestObject; import com.magenic.jmaqs.utilities.logging.Logger; diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java b/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/BaseMongoUnitTest.java similarity index 96% rename from jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java rename to maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/BaseMongoUnitTest.java index 85132c761..96dc32467 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/BaseMongoUnitTest.java +++ b/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/BaseMongoUnitTest.java @@ -1,8 +1,8 @@ /* - * Copyright 2021 (C) Magenic, All rights Reserved + * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.jmaqs.mongo; +package com.magenic.maqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; import org.testng.Assert; diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java b/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBConfigUnitTest.java similarity index 94% rename from jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java rename to maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBConfigUnitTest.java index 4c69dfcd2..c4a55baba 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBConfigUnitTest.java +++ b/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBConfigUnitTest.java @@ -1,8 +1,8 @@ /* - * Copyright 2021 (C) Magenic, All rights Reserved + * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.jmaqs.mongo; +package com.magenic.maqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; import org.testng.Assert; diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java b/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBDriverUnitTest.java similarity index 96% rename from jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java rename to maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBDriverUnitTest.java index 8ab8baa5c..f7e2a8260 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBDriverUnitTest.java +++ b/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBDriverUnitTest.java @@ -1,8 +1,8 @@ /* - * Copyright 2021 (C) Magenic, All rights Reserved + * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.jmaqs.mongo; +package com.magenic.maqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; import com.mongodb.client.MongoClient; diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java b/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBFunctionalUnitTest.java similarity index 96% rename from jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java rename to maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBFunctionalUnitTest.java index c619368be..53b350c6d 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDBFunctionalUnitTest.java +++ b/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBFunctionalUnitTest.java @@ -1,8 +1,8 @@ /* - * Copyright 2021 (C) Magenic, All rights Reserved + * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.jmaqs.mongo; +package com.magenic.maqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; import com.mongodb.client.model.Filters; diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java b/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDriverManagerUnitTest.java similarity index 98% rename from jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java rename to maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDriverManagerUnitTest.java index c5bd97e11..9cbc0be52 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoDriverManagerUnitTest.java +++ b/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDriverManagerUnitTest.java @@ -1,8 +1,8 @@ /* - * Copyright 2021 (C) Magenic, All rights Reserved + * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.jmaqs.mongo; +package com.magenic.maqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; import com.mongodb.client.MongoCollection; diff --git a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java b/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoTestObjectUnitTest.java similarity index 97% rename from jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java rename to maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoTestObjectUnitTest.java index 4ca1e61ff..f3c426a7a 100644 --- a/jmaqs-mongoDB/src/test/java/com/magenic/jmaqs/mongo/MongoTestObjectUnitTest.java +++ b/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoTestObjectUnitTest.java @@ -1,8 +1,8 @@ /* - * Copyright 2021 (C) Magenic, All rights Reserved + * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.jmaqs.mongo; +package com.magenic.maqs.mongo; import com.magenic.jmaqs.utilities.helper.TestCategories; import com.mongodb.ConnectionString; diff --git a/pom.xml b/pom.xml index 10e2a42d1..24913bb23 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ jmaqs-database jmaqs-cucumber jmaqs-accessibility - jmaqs-mongoDB + maqs-mongoDB @@ -332,8 +332,8 @@ ${project.version} - com.magenic.jmaqs.mongoDB - jmaqs-mongoDB + com.magenic.maqs.mongoDB + maqs-mongoDB ${project.version} From 8a3b8a7408132ab536533d61dbfeaf2d09ef29e7 Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Sat, 22 Jan 2022 21:07:33 -0600 Subject: [PATCH 20/36] added content for mongo db --- {maqs-mongoDB => maqs-noSQL}/config.xml | 0 {maqs-mongoDB => maqs-noSQL}/pom.xml | 15 ++++++++++----- .../maqs/noSQL}/BaseMongoTest.java | 2 +- .../maqs/noSQL}/MongoDBConfig.java | 2 +- .../maqs/noSQL}/MongoDBDriver.java | 2 +- .../maqs/noSQL}/MongoDriverManager.java | 2 +- .../maqs/noSQL}/MongoFactory.java | 2 +- .../maqs/noSQL}/MongoTestObject.java | 2 +- .../maqs/noSQL}/BaseMongoUnitTest.java | 2 +- .../maqs/noSQL}/MongoDBConfigUnitTest.java | 2 +- .../maqs/noSQL}/MongoDBDriverUnitTest.java | 2 +- .../maqs/noSQL}/MongoDBFunctionalUnitTest.java | 2 +- .../maqs/noSQL}/MongoDriverManagerUnitTest.java | 2 +- .../maqs/noSQL}/MongoTestObjectUnitTest.java | 2 +- pom.xml | 6 +++--- 15 files changed, 25 insertions(+), 20 deletions(-) rename {maqs-mongoDB => maqs-noSQL}/config.xml (100%) rename {maqs-mongoDB => maqs-noSQL}/pom.xml (81%) rename {maqs-mongoDB/src/main/java/com/magenic/maqs/mongo => maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL}/BaseMongoTest.java (98%) rename {maqs-mongoDB/src/main/java/com/magenic/maqs/mongo => maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL}/MongoDBConfig.java (96%) rename {maqs-mongoDB/src/main/java/com/magenic/maqs/mongo => maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL}/MongoDBDriver.java (99%) rename {maqs-mongoDB/src/main/java/com/magenic/maqs/mongo => maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL}/MongoDriverManager.java (98%) rename {maqs-mongoDB/src/main/java/com/magenic/maqs/mongo => maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL}/MongoFactory.java (98%) rename {maqs-mongoDB/src/main/java/com/magenic/maqs/mongo => maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL}/MongoTestObject.java (98%) rename {maqs-mongoDB/src/test/java/com/magenic/maqs/mongo => maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL}/BaseMongoUnitTest.java (98%) rename {maqs-mongoDB/src/test/java/com/magenic/maqs/mongo => maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL}/MongoDBConfigUnitTest.java (97%) rename {maqs-mongoDB/src/test/java/com/magenic/maqs/mongo => maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL}/MongoDBDriverUnitTest.java (98%) rename {maqs-mongoDB/src/test/java/com/magenic/maqs/mongo => maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL}/MongoDBFunctionalUnitTest.java (98%) rename {maqs-mongoDB/src/test/java/com/magenic/maqs/mongo => maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL}/MongoDriverManagerUnitTest.java (99%) rename {maqs-mongoDB/src/test/java/com/magenic/maqs/mongo => maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL}/MongoTestObjectUnitTest.java (98%) diff --git a/maqs-mongoDB/config.xml b/maqs-noSQL/config.xml similarity index 100% rename from maqs-mongoDB/config.xml rename to maqs-noSQL/config.xml diff --git a/maqs-mongoDB/pom.xml b/maqs-noSQL/pom.xml similarity index 81% rename from maqs-mongoDB/pom.xml rename to maqs-noSQL/pom.xml index be58b06d4..448ac29a4 100644 --- a/maqs-mongoDB/pom.xml +++ b/maqs-noSQL/pom.xml @@ -3,16 +3,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + com.magenic.jmaqs jmaqs-framework ${revision} - com.magenic.maqs.mongoDB - jmaqs-mongoDB - MAQS MongoDB Testing Module + + com.cognizantsoftvision.maqs.noSQL + maqs-noSQL + MAQS NoSQL Testing Module + ${revision} + + 4.4.1 + com.magenic.jmaqs.base @@ -28,12 +34,11 @@ org.mongodb mongodb-driver-sync - 4.4.1 + ${mongoDB.version} org.testng testng - diff --git a/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/BaseMongoTest.java b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/BaseMongoTest.java similarity index 98% rename from maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/BaseMongoTest.java rename to maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/BaseMongoTest.java index 677ef6dfe..b5820f044 100644 --- a/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/BaseMongoTest.java +++ b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/BaseMongoTest.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.maqs.mongo; +package com.cognizantsoftvision.maqs.noSQL; import com.magenic.jmaqs.base.BaseExtendableTest; import com.mongodb.client.MongoCollection; diff --git a/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDBConfig.java b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBConfig.java similarity index 96% rename from maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDBConfig.java rename to maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBConfig.java index 8fb55afc2..c6c2dcc68 100644 --- a/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDBConfig.java +++ b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBConfig.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.maqs.mongo; +package com.cognizantsoftvision.maqs.noSQL; import com.magenic.jmaqs.utilities.helper.Config; import com.magenic.jmaqs.utilities.helper.ConfigSection; diff --git a/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDBDriver.java b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriver.java similarity index 99% rename from maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDBDriver.java rename to maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriver.java index 82ef5d3fb..b9ecb816b 100644 --- a/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDBDriver.java +++ b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriver.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.maqs.mongo; +package com.cognizantsoftvision.maqs.noSQL; import com.mongodb.MongoClientSettings; import com.mongodb.client.MongoClient; diff --git a/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDriverManager.java b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManager.java similarity index 98% rename from maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDriverManager.java rename to maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManager.java index b7459a9e2..141450214 100644 --- a/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoDriverManager.java +++ b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManager.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.maqs.mongo; +package com.cognizantsoftvision.maqs.noSQL; import com.magenic.jmaqs.base.BaseTestObject; import com.magenic.jmaqs.base.DriverManager; diff --git a/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoFactory.java b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoFactory.java similarity index 98% rename from maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoFactory.java rename to maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoFactory.java index aaf7f2108..8765f1107 100644 --- a/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoFactory.java +++ b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoFactory.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.maqs.mongo; +package com.cognizantsoftvision.maqs.noSQL; import com.mongodb.MongoClientException; import com.mongodb.MongoClientSettings; diff --git a/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoTestObject.java b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoTestObject.java similarity index 98% rename from maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoTestObject.java rename to maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoTestObject.java index 2769d3e30..a07452e82 100644 --- a/maqs-mongoDB/src/main/java/com/magenic/maqs/mongo/MongoTestObject.java +++ b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoTestObject.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.maqs.mongo; +package com.cognizantsoftvision.maqs.noSQL; import com.magenic.jmaqs.base.BaseTestObject; import com.magenic.jmaqs.utilities.logging.Logger; diff --git a/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/BaseMongoUnitTest.java b/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/BaseMongoUnitTest.java similarity index 98% rename from maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/BaseMongoUnitTest.java rename to maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/BaseMongoUnitTest.java index 96dc32467..eefade948 100644 --- a/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/BaseMongoUnitTest.java +++ b/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/BaseMongoUnitTest.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.maqs.mongo; +package com.cognizantsoftvision.maqs.noSQL; import com.magenic.jmaqs.utilities.helper.TestCategories; import org.testng.Assert; diff --git a/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBConfigUnitTest.java b/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBConfigUnitTest.java similarity index 97% rename from maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBConfigUnitTest.java rename to maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBConfigUnitTest.java index c4a55baba..02e6644d1 100644 --- a/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBConfigUnitTest.java +++ b/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBConfigUnitTest.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.maqs.mongo; +package com.cognizantsoftvision.maqs.noSQL; import com.magenic.jmaqs.utilities.helper.TestCategories; import org.testng.Assert; diff --git a/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBDriverUnitTest.java b/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriverUnitTest.java similarity index 98% rename from maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBDriverUnitTest.java rename to maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriverUnitTest.java index f7e2a8260..9ee2180b8 100644 --- a/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBDriverUnitTest.java +++ b/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriverUnitTest.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.maqs.mongo; +package com.cognizantsoftvision.maqs.noSQL; import com.magenic.jmaqs.utilities.helper.TestCategories; import com.mongodb.client.MongoClient; diff --git a/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBFunctionalUnitTest.java b/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBFunctionalUnitTest.java similarity index 98% rename from maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBFunctionalUnitTest.java rename to maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBFunctionalUnitTest.java index 53b350c6d..d3c403a68 100644 --- a/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDBFunctionalUnitTest.java +++ b/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBFunctionalUnitTest.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.maqs.mongo; +package com.cognizantsoftvision.maqs.noSQL; import com.magenic.jmaqs.utilities.helper.TestCategories; import com.mongodb.client.model.Filters; diff --git a/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDriverManagerUnitTest.java b/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManagerUnitTest.java similarity index 99% rename from maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDriverManagerUnitTest.java rename to maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManagerUnitTest.java index 9cbc0be52..1f7410517 100644 --- a/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoDriverManagerUnitTest.java +++ b/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManagerUnitTest.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.maqs.mongo; +package com.cognizantsoftvision.maqs.noSQL; import com.magenic.jmaqs.utilities.helper.TestCategories; import com.mongodb.client.MongoCollection; diff --git a/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoTestObjectUnitTest.java b/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoTestObjectUnitTest.java similarity index 98% rename from maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoTestObjectUnitTest.java rename to maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoTestObjectUnitTest.java index f3c426a7a..c78bad478 100644 --- a/maqs-mongoDB/src/test/java/com/magenic/maqs/mongo/MongoTestObjectUnitTest.java +++ b/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoTestObjectUnitTest.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.magenic.maqs.mongo; +package com.cognizantsoftvision.maqs.noSQL; import com.magenic.jmaqs.utilities.helper.TestCategories; import com.mongodb.ConnectionString; diff --git a/pom.xml b/pom.xml index 24913bb23..ddec80f50 100644 --- a/pom.xml +++ b/pom.xml @@ -56,7 +56,7 @@ jmaqs-database jmaqs-cucumber jmaqs-accessibility - maqs-mongoDB + maqs-noSQL @@ -332,8 +332,8 @@ ${project.version} - com.magenic.maqs.mongoDB - maqs-mongoDB + com.cognizantsoftvision.maqs.noSQL + maqs-noSQL ${project.version} From 6be5f127024a9efbeba0d4ffcb96ea8b71b78d49 Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Mon, 24 Jan 2022 14:33:02 -0600 Subject: [PATCH 21/36] added content for mongo db --- Docker/MAQSMongoDB/docker-compose.yml | 5 +++- maqs-noSQL/pom.xml | 28 +++++++++++++++++++ .../maqs/noSQL/MongoDBDriver.java | 3 +- .../maqs/noSQL/MongoDriverManager.java | 6 ++-- .../maqs/noSQL/MongoFactory.java | 1 - 5 files changed, 37 insertions(+), 6 deletions(-) diff --git a/Docker/MAQSMongoDB/docker-compose.yml b/Docker/MAQSMongoDB/docker-compose.yml index 3f4517b9a..10479a005 100644 --- a/Docker/MAQSMongoDB/docker-compose.yml +++ b/Docker/MAQSMongoDB/docker-compose.yml @@ -17,4 +17,7 @@ services: - mongo environment: ME_CONFIG_MONGODB_ADMINUSERNAME: - ME_CONFIG_MONGODB_ADMINPASSWORD: \ No newline at end of file + ME_CONFIG_MONGODB_ADMINPASSWORD: + + # Run a custom bash script that bootstraps the database after it is started. + command: [ '/bin/bash', '/mnt/host/initialize_and_start_sqlserver.sh' ] \ No newline at end of file diff --git a/maqs-noSQL/pom.xml b/maqs-noSQL/pom.xml index 448ac29a4..896e473f5 100644 --- a/maqs-noSQL/pom.xml +++ b/maqs-noSQL/pom.xml @@ -41,4 +41,32 @@ testng + + + + io.fabric8 + docker-maven-plugin + 0.37.0 + + + + mongoDB + + compose + ../Docker/MAQSMongoDB/ + docker-compose.yml + + + + + setup-database + process-test-resources + + start + + + + + + diff --git a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriver.java b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriver.java index b9ecb816b..538884c55 100644 --- a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriver.java +++ b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriver.java @@ -107,7 +107,8 @@ public MongoDatabase getDatabase() { * @param mongoDatabase the name of the mongo database */ public void setDatabase(MongoClient mongoClient, String mongoDatabase) { - this.database = mongoClient.getDatabase(mongoDatabase); + this.client = mongoClient; + setDatabase(mongoDatabase); } /** diff --git a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManager.java b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManager.java index 141450214..d5447e90e 100644 --- a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManager.java +++ b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManager.java @@ -48,7 +48,7 @@ public MongoDriverManager(Supplier getCollection, BaseTestObject * @param overrideDriver The new Mongo driver */ public void overrideDriver(MongoDBDriver overrideDriver) { - this.driver = overrideDriver; + driver = overrideDriver; this.setBaseDriver(new MongoDBDriver(overrideDriver.getCollection())); } @@ -59,7 +59,7 @@ public void overrideDriver(MongoDBDriver overrideDriver) { * @param collectionString Collection string to use */ public void overrideDriver(String connectionString, String databaseString, String collectionString) { - this.driver = null; + driver = null; this.overrideDriverGet(() -> MongoFactory.getCollection(connectionString, databaseString, collectionString)); this.overrideDriverGet(() -> MongoFactory.getCollection(connectionString, databaseString, collectionString)); } @@ -69,7 +69,7 @@ public void overrideDriver(String connectionString, String databaseString, Strin * @param overrideCollectionConnection The new collection connection */ public void overrideDriver(Supplier> overrideCollectionConnection) { - this.driver = null; + driver = null; this.overrideDriverGet(overrideCollectionConnection); } diff --git a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoFactory.java b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoFactory.java index 8765f1107..31e4117af 100644 --- a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoFactory.java +++ b/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoFactory.java @@ -63,7 +63,6 @@ public static MongoCollection getCollection( public static MongoCollection getCollection(String databaseString, String collectionString, MongoClientSettings settings) { MongoClient mongoClient; - MongoDatabase database; try { From 82aeca5a1fdb9dd45e416a5a5ae172a202a9182c Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Fri, 18 Feb 2022 16:36:59 -0600 Subject: [PATCH 22/36] import updates new MAQS naming updates --- docker/MAQSMongoDB/docker-compose.yml | 13 ++++++++----- docker/MAQSMongoDB/seed/seed.js | 2 +- docker/docker-compose.yml | 18 +++++++----------- {maqs-noSQL => maqs-nosql}/config.xml | 0 {maqs-noSQL => maqs-nosql}/pom.xml | 12 ++++++------ .../maqs/nosql}/BaseMongoTest.java | 4 ++-- .../maqs/nosql}/MongoDBConfig.java | 6 +++--- .../maqs/nosql}/MongoDBDriver.java | 2 +- .../maqs/nosql}/MongoDriverManager.java | 7 ++++--- .../maqs/nosql}/MongoFactory.java | 2 +- .../maqs/nosql}/MongoTestObject.java | 6 +++--- .../maqs/nosql}/BaseMongoUnitTest.java | 4 ++-- .../maqs/nosql}/MongoDBConfigUnitTest.java | 4 ++-- .../maqs/nosql}/MongoDBDriverUnitTest.java | 4 ++-- .../maqs/nosql}/MongoDBFunctionalUnitTest.java | 4 ++-- .../nosql}/MongoDriverManagerUnitTest.java | 4 ++-- .../maqs/nosql}/MongoTestObjectUnitTest.java | 4 ++-- 17 files changed, 48 insertions(+), 48 deletions(-) rename {maqs-noSQL => maqs-nosql}/config.xml (100%) rename {maqs-noSQL => maqs-nosql}/pom.xml (87%) rename {maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL => maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql}/BaseMongoTest.java (96%) rename {maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL => maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql}/MongoDBConfig.java (87%) rename {maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL => maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql}/MongoDBDriver.java (99%) rename {maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL => maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql}/MongoDriverManager.java (94%) rename {maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL => maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql}/MongoFactory.java (98%) rename {maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL => maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql}/MongoTestObject.java (93%) rename {maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL => maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql}/BaseMongoUnitTest.java (94%) rename {maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL => maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql}/MongoDBConfigUnitTest.java (92%) rename {maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL => maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql}/MongoDBDriverUnitTest.java (95%) rename {maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL => maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql}/MongoDBFunctionalUnitTest.java (95%) rename {maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL => maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql}/MongoDriverManagerUnitTest.java (97%) rename {maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL => maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql}/MongoTestObjectUnitTest.java (96%) diff --git a/docker/MAQSMongoDB/docker-compose.yml b/docker/MAQSMongoDB/docker-compose.yml index 5be3b1e86..10479a005 100644 --- a/docker/MAQSMongoDB/docker-compose.yml +++ b/docker/MAQSMongoDB/docker-compose.yml @@ -3,11 +3,11 @@ version: '2' services: mongo: image: mongo - restart: always + restart: always ports: - - "27017:27017" + - "27017:27017" volumes: - - ./seed/seed.js:/docker-entrypoint-initdb.d/seed.js + - ./seed/seed.js:/docker-entrypoint-initdb.d/seed.js mongo-express: image: mongo-express restart: always @@ -16,5 +16,8 @@ services: links: - mongo environment: - ME_CONFIG_MONGODB_ADMINUSERNAME: - ME_CONFIG_MONGODB_ADMINPASSWORD: \ No newline at end of file + ME_CONFIG_MONGODB_ADMINUSERNAME: + ME_CONFIG_MONGODB_ADMINPASSWORD: + + # Run a custom bash script that bootstraps the database after it is started. + command: [ '/bin/bash', '/mnt/host/initialize_and_start_sqlserver.sh' ] \ No newline at end of file diff --git a/docker/MAQSMongoDB/seed/seed.js b/docker/MAQSMongoDB/seed/seed.js index 81d443938..badfaf331 100644 --- a/docker/MAQSMongoDB/seed/seed.js +++ b/docker/MAQSMongoDB/seed/seed.js @@ -19,4 +19,4 @@ db.MongoTestCollection.insertMany([ "lid": "test4", "isChanged": false } -]) +]) \ No newline at end of file diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index c83d21672..44c3c95f1 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -1,4 +1,4 @@ -# The extends functionality is not yet avaliable in +# The extends functionality is not yet available in # Docker config files versioned 3 and higher. # If the version is bumped, this config file will have to change. # See https://github.com/moby/moby/issues/31101. @@ -6,14 +6,10 @@ version: '2' services: mssql: - extends: + extends: file: ./MAQSSQLServer/docker-compose.yml - service: mssql -# mongo: -# extends: -# file: ./MAQSMongoDB/docker-compose.yml -# service: mongo -# imap: -# extends: -# file: ./MAQSEmail/docker-compose.yml -# service: imap + service: mssql + mongo: + extends: + file: ./MAQSMongoDB/docker-compose.yml + service: mongo \ No newline at end of file diff --git a/maqs-noSQL/config.xml b/maqs-nosql/config.xml similarity index 100% rename from maqs-noSQL/config.xml rename to maqs-nosql/config.xml diff --git a/maqs-noSQL/pom.xml b/maqs-nosql/pom.xml similarity index 87% rename from maqs-noSQL/pom.xml rename to maqs-nosql/pom.xml index 896e473f5..690a2499b 100644 --- a/maqs-noSQL/pom.xml +++ b/maqs-nosql/pom.xml @@ -5,8 +5,8 @@ 4.0.0 - com.magenic.jmaqs - jmaqs-framework + com.cognizantsoftvision.maqs + maqs-java ${revision} @@ -21,13 +21,13 @@ - com.magenic.jmaqs.base - jmaqs-base + com.cognizantsoftvision.maqs.base + maqs-base ${project.version} - com.magenic.jmaqs.utilities - jmaqs-utilities + com.cognizantsoftvision.maqs.utilities + maqs-utilities ${project.version} compile diff --git a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/BaseMongoTest.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java similarity index 96% rename from maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/BaseMongoTest.java rename to maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java index b5820f044..cdc3a63ba 100644 --- a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/BaseMongoTest.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java @@ -2,9 +2,9 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.cognizantsoftvision.maqs.noSQL; +package com.cognizantsoftvision.maqs.nosql; -import com.magenic.jmaqs.base.BaseExtendableTest; +import com.cognizantsoftvision.maqs.base.BaseExtendableTest; import com.mongodb.client.MongoCollection; import java.util.function.Supplier; import org.bson.Document; diff --git a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBConfig.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java similarity index 87% rename from maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBConfig.java rename to maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java index c6c2dcc68..9af916d3a 100644 --- a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBConfig.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java @@ -2,10 +2,10 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.cognizantsoftvision.maqs.noSQL; +package com.cognizantsoftvision.maqs.nosql; -import com.magenic.jmaqs.utilities.helper.Config; -import com.magenic.jmaqs.utilities.helper.ConfigSection; +import com.cognizantsoftvision.maqs.utilities.helper.Config; +import com.cognizantsoftvision.maqs.utilities.helper.ConfigSection; /** * MongoDB config class. diff --git a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriver.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java similarity index 99% rename from maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriver.java rename to maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java index 538884c55..d95ae90dd 100644 --- a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriver.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.cognizantsoftvision.maqs.noSQL; +package com.cognizantsoftvision.maqs.nosql; import com.mongodb.MongoClientSettings; import com.mongodb.client.MongoClient; diff --git a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManager.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java similarity index 94% rename from maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManager.java rename to maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java index d5447e90e..546e53eba 100644 --- a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManager.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java @@ -2,10 +2,11 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.cognizantsoftvision.maqs.noSQL; +package com.cognizantsoftvision.maqs.nosql; -import com.magenic.jmaqs.base.BaseTestObject; -import com.magenic.jmaqs.base.DriverManager; + +import com.cognizantsoftvision.maqs.base.BaseTestObject; +import com.cognizantsoftvision.maqs.base.DriverManager; import com.mongodb.client.MongoCollection; import java.util.function.Supplier; import org.bson.Document; diff --git a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoFactory.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java similarity index 98% rename from maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoFactory.java rename to maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java index 31e4117af..e06c198dc 100644 --- a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoFactory.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java @@ -2,7 +2,7 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.cognizantsoftvision.maqs.noSQL; +package com.cognizantsoftvision.maqs.nosql; import com.mongodb.MongoClientException; import com.mongodb.MongoClientSettings; diff --git a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoTestObject.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java similarity index 93% rename from maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoTestObject.java rename to maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java index a07452e82..4d598d976 100644 --- a/maqs-noSQL/src/main/java/com/cognizantsoftvision/maqs/noSQL/MongoTestObject.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java @@ -2,10 +2,10 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.cognizantsoftvision.maqs.noSQL; +package com.cognizantsoftvision.maqs.nosql; -import com.magenic.jmaqs.base.BaseTestObject; -import com.magenic.jmaqs.utilities.logging.Logger; +import com.cognizantsoftvision.maqs.utilities.logging.Logger; +import com.cognizantsoftvision.maqs.base.BaseTestObject; import com.mongodb.client.MongoCollection; import java.util.function.Supplier; import org.bson.Document; diff --git a/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/BaseMongoUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java similarity index 94% rename from maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/BaseMongoUnitTest.java rename to maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java index eefade948..4ae9f6cf1 100644 --- a/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/BaseMongoUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java @@ -2,9 +2,9 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.cognizantsoftvision.maqs.noSQL; +package com.cognizantsoftvision.maqs.nosql; -import com.magenic.jmaqs.utilities.helper.TestCategories; +import com.cognizantsoftvision.maqs.utilities.helper.TestCategories; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBConfigUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java similarity index 92% rename from maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBConfigUnitTest.java rename to maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java index 02e6644d1..3b0b20276 100644 --- a/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBConfigUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java @@ -2,9 +2,9 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.cognizantsoftvision.maqs.noSQL; +package com.cognizantsoftvision.maqs.nosql; -import com.magenic.jmaqs.utilities.helper.TestCategories; +import com.cognizantsoftvision.maqs.utilities.helper.TestCategories; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriverUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java similarity index 95% rename from maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriverUnitTest.java rename to maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java index 9ee2180b8..4aa68fd95 100644 --- a/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBDriverUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java @@ -2,9 +2,9 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.cognizantsoftvision.maqs.noSQL; +package com.cognizantsoftvision.maqs.nosql; -import com.magenic.jmaqs.utilities.helper.TestCategories; +import com.cognizantsoftvision.maqs.utilities.helper.TestCategories; import com.mongodb.client.MongoClient; import com.mongodb.client.MongoCollection; import org.bson.Document; diff --git a/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBFunctionalUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java similarity index 95% rename from maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBFunctionalUnitTest.java rename to maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java index d3c403a68..28ae1ebf8 100644 --- a/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDBFunctionalUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java @@ -2,9 +2,9 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.cognizantsoftvision.maqs.noSQL; +package com.cognizantsoftvision.maqs.nosql; -import com.magenic.jmaqs.utilities.helper.TestCategories; +import com.cognizantsoftvision.maqs.utilities.helper.TestCategories; import com.mongodb.client.model.Filters; import org.bson.Document; import org.bson.conversions.Bson; diff --git a/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManagerUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java similarity index 97% rename from maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManagerUnitTest.java rename to maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java index 1f7410517..9388d498c 100644 --- a/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoDriverManagerUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java @@ -2,9 +2,9 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.cognizantsoftvision.maqs.noSQL; +package com.cognizantsoftvision.maqs.nosql; -import com.magenic.jmaqs.utilities.helper.TestCategories; +import com.cognizantsoftvision.maqs.utilities.helper.TestCategories; import com.mongodb.client.MongoCollection; import org.bson.Document; import org.testng.Assert; diff --git a/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoTestObjectUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java similarity index 96% rename from maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoTestObjectUnitTest.java rename to maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java index c78bad478..654a365f5 100644 --- a/maqs-noSQL/src/test/java/com/cognizantsoftvision/maqs/noSQL/MongoTestObjectUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java @@ -2,9 +2,9 @@ * Copyright 2022 Cognizant, All rights Reserved */ -package com.cognizantsoftvision.maqs.noSQL; +package com.cognizantsoftvision.maqs.nosql; -import com.magenic.jmaqs.utilities.helper.TestCategories; +import com.cognizantsoftvision.maqs.utilities.helper.TestCategories; import com.mongodb.ConnectionString; import com.mongodb.MongoClientSettings; import com.mongodb.client.MongoCollection; From 645d65c44cc11f1ffa7ed09b2759213b7f6c5e98 Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Mon, 7 Mar 2022 12:45:05 -0600 Subject: [PATCH 23/36] updated nosql comments --- .../maqs/nosql/BaseMongoTest.java | 2 +- .../maqs/nosql/MongoDBConfig.java | 2 +- .../maqs/nosql/MongoDBDriver.java | 4 +++- .../maqs/nosql/MongoDriverManager.java | 2 +- .../maqs/nosql/MongoFactory.java | 2 +- .../maqs/nosql/MongoTestObject.java | 2 +- .../maqs/nosql/BaseMongoUnitTest.java | 18 +++++++++++++---- .../maqs/nosql/MongoDBConfigUnitTest.java | 10 +++++----- .../maqs/nosql/MongoDBDriverUnitTest.java | 11 +++++++++- .../maqs/nosql/MongoDBFunctionalUnitTest.java | 15 +++++++------- .../nosql/MongoDriverManagerUnitTest.java | 20 +++++++++---------- .../maqs/nosql/MongoTestObjectUnitTest.java | 16 +++++++-------- pom.xml | 6 ++++++ 13 files changed, 69 insertions(+), 41 deletions(-) diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java index cdc3a63ba..07ac74e02 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java @@ -11,7 +11,7 @@ import org.testng.ITestResult; /** - * Generic base MongoDB test class. + * The Base Mongo Test class. */ public class BaseMongoTest extends BaseExtendableTest { diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java index 9af916d3a..326a128a4 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java @@ -8,7 +8,7 @@ import com.cognizantsoftvision.maqs.utilities.helper.ConfigSection; /** - * MongoDB config class. + * The MongoDB Config class. */ public class MongoDBConfig { diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java index d95ae90dd..92f797dd1 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java @@ -14,7 +14,8 @@ import org.bson.Document; /** - * Class to wrap the MongoCollection and related helper functions. + * The MongoDB Driver class. + * Wraps the MongoCollection and related helper functions. */ public class MongoDBDriver implements AutoCloseable { @@ -175,5 +176,6 @@ public int countAllItemsInCollection() { @Override public void close() { + this.getMongoClient().close(); } } diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java index 546e53eba..bb902fdd2 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java @@ -12,7 +12,7 @@ import org.bson.Document; /** - * Mongo database driver. + * The Mongo Driver Manager class. */ public class MongoDriverManager extends DriverManager { diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java index e06c198dc..98afc9cd5 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java @@ -14,7 +14,7 @@ import org.bson.Document; /** - * Mongo database factory. + * The Mongo Factory Class. */ public class MongoFactory { diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java index 4d598d976..5c4bb3df2 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java @@ -11,7 +11,7 @@ import org.bson.Document; /** - * Mongo test context data. + * The Mongo Test Object class. */ public class MongoTestObject extends BaseTestObject { diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java index 4ae9f6cf1..6ff20ea8a 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java @@ -9,9 +9,13 @@ import org.testng.annotations.Test; /** - * Test the Base Mongo Test functionality. + * The Base Mongo unit test class. */ public class BaseMongoUnitTest extends BaseMongoTest { + + /** + * Test the get mongo db driver. + */ @Test(groups = TestCategories.MONGO) public void testGetMongoDBDriver() { MongoDBDriver mongoDBDriver = this.getMongoDBDriver(); @@ -19,6 +23,9 @@ public void testGetMongoDBDriver() { "Checking that MongoDB Driver is not null through BaseMongoTest"); } + /** + * Test the set mongo db driver. + */ @Test(groups = TestCategories.MONGO) public void testSetMongoDBDriver() { int hashCode = this.getMongoDBDriver().hashCode(); @@ -31,6 +38,9 @@ public void testSetMongoDBDriver() { Assert.assertNotEquals(hashCode, hashCode1); } + /** + * Test the override connection driver with the mongo db driver. + */ @Test(groups = TestCategories.MONGO) public void testOverrideConnectionDriverWithMongoDBDriver() { overrideConnectionDriver(this.getMongoDBDriver()); @@ -40,7 +50,7 @@ public void testOverrideConnectionDriverWithMongoDBDriver() { } /** - * Gets the connection string. + * Test getting the connection string. */ @Test(groups = TestCategories.MONGO) public void testGetBaseMongoConnectionStringTest() { @@ -49,7 +59,7 @@ public void testGetBaseMongoConnectionStringTest() { } /** - * Gets the database string. + * Test getting the database string. */ @Test(groups = TestCategories.MONGO) public void testGetBaseMongoStringTest() { @@ -58,7 +68,7 @@ public void testGetBaseMongoStringTest() { } /** - * Gets the connection string. + * Test getting the connection string. */ @Test(groups = TestCategories.MONGO) public void testGetBaseMongoCollectionStringTest() { diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java index 3b0b20276..794db8a9b 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java @@ -9,12 +9,12 @@ import org.testng.annotations.Test; /** - * Test class for database configurations. + * The Mongo Database Config unit test class. */ public class MongoDBConfigUnitTest extends BaseMongoTest{ /** - * Gets the connection string. + * Test getting the connection string. */ @Test(groups = TestCategories.MONGO) public void testGetMongoDBConnectionStringTest() { @@ -23,7 +23,7 @@ public void testGetMongoDBConnectionStringTest() { } /** - * Gets the database string. + * Test getting the database string. */ @Test(groups = TestCategories.MONGO) public void testGetMongoDBDatabaseStringTest() { @@ -32,7 +32,7 @@ public void testGetMongoDBDatabaseStringTest() { } /** - * Gets the connection string. + * Test getting the connection string. */ @Test(groups = TestCategories.MONGO) public void testGetMongoDBCollectionStringTest() { @@ -41,7 +41,7 @@ public void testGetMongoDBCollectionStringTest() { } /** - * Gets the timeout value. + * Test getting the timeout value. */ @Test(groups = TestCategories.MONGO) public void testGetMongoDBQueryTimeout() { diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java index 4aa68fd95..f6440afd9 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java @@ -13,10 +13,13 @@ import java.util.List; /** - * Test mongo base test functionality + * The Mongo Database Driver unit test class. */ public class MongoDBDriverUnitTest extends BaseMongoTest { + /** + * Test setting up the mongo db driver. + */ @Test(groups = TestCategories.MONGO) public void testMongoDBDriver() { MongoCollection collection = MongoFactory.getDefaultCollection(); @@ -31,6 +34,9 @@ public void testMongoDBDriver() { Assert.assertNotNull(driver); } + /** + * Test getting the mongo client. + */ @Test(groups = TestCategories.MONGO) public void testGetMongoClient() { this.setMongoDBDriver(new MongoDBDriver()); @@ -38,6 +44,9 @@ public void testGetMongoClient() { Assert.assertNotNull(client); } + /** + * Test setting the mongo client. + */ @Test(groups = TestCategories.MONGO) public void testSetMongoClient() { this.setMongoDBDriver(new MongoDBDriver()); diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java index 28ae1ebf8..c52fb7b59 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java @@ -12,14 +12,15 @@ import org.testng.annotations.Test; import java.util.ArrayList; import java.util.List; +import java.util.Objects; /** - * Test Mongo Functionality. + * The Mongo Database Functional unit test class. */ public class MongoDBFunctionalUnitTest extends BaseMongoTest{ /** - * Test the collection works as expected. + * Test the collection works as expected when getting the login id. */ @Test(groups = TestCategories.MONGO) public void testMongoGetLoginID() { @@ -30,18 +31,18 @@ public void testMongoGetLoginID() { } /** - * Test the collection works as expected. + * Test the collection works as expected when running a query and returning the first result. */ @Test(groups = TestCategories.MONGO) public void testMongoQueryAndReturnFirst() { Bson filter = Filters.eq("lid", "test3"); - //MongoCollection document = this.getMongoDBDriver().getCollection().find(filter).ToList().First(); + // MongoCollection document = this.getMongoDBDriver().getCollection().find(filter).ToList().First(); Document document = this.getMongoDBDriver().getCollection().find(filter).first(); - Assert.assertEquals(document.get("lid").toString(), "test3"); + Assert.assertEquals(Objects.requireNonNull(document).get("lid").toString(), "test3"); } /** - * Test the collection works as expected + * Test the collection works as expected when finding a list with a key. */ @Test(groups = TestCategories.MONGO) public void testMongoFindListWithKey() { @@ -61,7 +62,7 @@ public void testMongoFindListWithKey() { @Test(groups = TestCategories.MONGO) public void testMongoLinqQuery() { /* - QueryBuilder querys = + QueryBuilder queries = from e in this.getMongoDBDriver().getCollection() where e["lid"] == "test1" select e; diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java index 9388d498c..c433f3033 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java @@ -11,12 +11,12 @@ import org.testng.annotations.Test; /** - * Test the mongo driver manager functionality. + * The Mongo Driver Manager unit test class. */ public class MongoDriverManagerUnitTest extends BaseMongoTest{ /** - * Override with default driver. + * Test overriding the default driver. */ @Test(groups = TestCategories.MONGO) public void respectDefaultDriverOverride() { @@ -28,7 +28,7 @@ public void respectDefaultDriverOverride() { } /** - * Override driver with collection string. + * Override driver with the collection string. */ @Test(groups = TestCategories.MONGO) public void respectCollectionDriverOverride() { @@ -39,10 +39,10 @@ public void respectCollectionDriverOverride() { } /** - * Override drive with all 3 connection strings. + * Override drive with all 3 connection parameters. */ @Test(groups = TestCategories.MONGO) - public void RespectDriverConnectionsOverride() { + public void respectDriverConnectionsOverride() { MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getConnectionString(), MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); this.getTestObject().getMongoDBManager().overrideDriver(mongoDriver); @@ -53,7 +53,7 @@ public void RespectDriverConnectionsOverride() { * Override driver directly. */ @Test(groups = TestCategories.MONGO) - public void RespectDirectDriverOverride() { + public void respectDirectDriverOverride() { MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getCollectionString()); this.setMongoDBDriver(mongoDriver); Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); @@ -63,7 +63,7 @@ public void RespectDirectDriverOverride() { * Override driver with new driver. */ @Test(groups = TestCategories.MONGO) - public void RespectNewDriverOverride() { + public void respectNewDriverOverride() { MongoDBDriver mongoDriver = new MongoDBDriver(MongoDBConfig.getCollectionString()); this.getTestObject().overrideMongoDBDriver(mongoDriver); Assert.assertEquals(mongoDriver.getCollection(), this.getMongoDBDriver().getCollection()); @@ -73,7 +73,7 @@ public void RespectNewDriverOverride() { * Override drive with collection function. */ @Test(groups = TestCategories.MONGO) - public void RespectCollectionOverride() { + public void respectCollectionOverride() { MongoCollection collection = MongoFactory.getDefaultCollection(); this.getTestObject().overrideMongoDBDriver(() -> collection); Assert.assertEquals(collection, this.getMongoDBDriver().getCollection()); @@ -83,7 +83,7 @@ public void RespectCollectionOverride() { * Override drive with all 3 connection strings. */ @Test(groups = TestCategories.MONGO) - public void RespectDriverConnectionStingsOverride() { + public void respectDriverConnectionStingsOverride() { MongoCollection collection = this.getMongoDBDriver().getCollection(); this.getTestObject().overrideMongoDBDriver(MongoDBConfig.getConnectionString(), MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString()); @@ -94,7 +94,7 @@ public void RespectDriverConnectionStingsOverride() { * Override in base with collection function. */ @Test(groups = TestCategories.MONGO) - public void RespectCollectionOverrideInBase() { + public void respectCollectionOverrideInBase() { MongoCollection collection = MongoFactory.getDefaultCollection(); this.overrideConnectionDriver(() -> collection); Assert.assertEquals(collection, this.getMongoDBDriver().getCollection()); diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java index 654a365f5..ac2c3a358 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java @@ -13,12 +13,12 @@ import org.testng.annotations.Test; /** - * Test the mongo test object functionality. + * The Mongo Test Object unit test class. */ public class MongoTestObjectUnitTest extends BaseMongoTest { /** - * Is the collection override respected. + * Tests if the collection override is respected. */ @Test(groups = TestCategories.MONGO) public void overrideCollectionFunction() { @@ -32,7 +32,7 @@ public void overrideCollectionFunction() { } /** - * Are the connection string overrides respected. + * Tests if the connection string overrides respected. */ @Test(groups = TestCategories.MONGO) public void overrideConnectionStrings() { @@ -45,7 +45,7 @@ public void overrideConnectionStrings() { } /** - * Is the driver override respected. + * Tests if the driver override respected. */ @Test(groups = TestCategories.MONGO) public void overrideDriver() { @@ -59,7 +59,7 @@ public void overrideDriver() { } /** - * Is the test overridable with a custom driver. + * Tests if the custom driver is overridable. */ @Test(groups = TestCategories.MONGO) public void overrideWithCustomDriver() { @@ -78,9 +78,9 @@ public void overrideWithCustomDriver() { Assert.assertFalse(this.getMongoDBDriver().isCollectionEmpty()); } - /// - /// Make sure the test objects map properly - /// + /** + * Make sure the test objects map properly. + */ @Test(groups = TestCategories.MONGO) public void TestMongoDBTestObjectMapCorrectly() { Assert.assertEquals(this.getTestObject().getLogger(), this.getLogger(), "Logs don't match"); diff --git a/pom.xml b/pom.xml index e006228fd..0e60d2a05 100644 --- a/pom.xml +++ b/pom.xml @@ -53,6 +53,7 @@ maqs-appium maqs-webservices maqs-database + maqs-nosql maqs-cucumber maqs-accessibility @@ -318,6 +319,11 @@ maqs-webservices ${project.version} + + com.cognizantsoftvision.maqs.nosql + maqs-nosql + ${project.version} + From 6b511ae6c21c6b6b533e00ca26db6298cc849c38 Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:07:55 -0600 Subject: [PATCH 24/36] copyright update --- .../java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java | 2 +- .../java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java | 2 +- .../java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java | 2 +- .../com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java | 2 +- .../java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java | 2 +- .../com/cognizantsoftvision/maqs/nosql/MongoTestObject.java | 2 +- .../com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java | 2 +- .../cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java | 2 +- .../cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java | 2 +- .../maqs/nosql/MongoDBFunctionalUnitTest.java | 2 +- .../maqs/nosql/MongoDriverManagerUnitTest.java | 2 +- .../cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java index 07ac74e02..e6d7cda9f 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant, All rights Reserved + * Copyright 2022 Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java index 326a128a4..71d2e104a 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant, All rights Reserved + * Copyright 2022 Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java index 92f797dd1..48e4e9dda 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant, All rights Reserved + * Copyright 2022 Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java index bb902fdd2..9d9a22de6 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant, All rights Reserved + * Copyright 2022 Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java index 98afc9cd5..0179969b4 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant, All rights Reserved + * Copyright 2022 Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java index 5c4bb3df2..468078c52 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant, All rights Reserved + * Copyright 2022 Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java index 6ff20ea8a..68337b9fe 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant, All rights Reserved + * Copyright 2022 Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java index 794db8a9b..ff0178477 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant, All rights Reserved + * Copyright 2022 Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java index f6440afd9..caab8d723 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant, All rights Reserved + * Copyright 2022 Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java index c52fb7b59..643f4526b 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant, All rights Reserved + * Copyright 2022 Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java index c433f3033..35370bf3e 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant, All rights Reserved + * Copyright 2022 Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java index ac2c3a358..0fad3ee52 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant, All rights Reserved + * Copyright 2022 Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; From 4b3698c69caa4dcb2dff8e530b48186b7e535026 Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Tue, 8 Mar 2022 16:28:28 -0600 Subject: [PATCH 25/36] copyright update --- .../com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java | 2 +- .../com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java | 2 +- .../com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java | 2 +- .../cognizantsoftvision/maqs/nosql/MongoDriverManager.java | 4 ++-- .../java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java | 2 +- .../com/cognizantsoftvision/maqs/nosql/MongoTestObject.java | 4 ++-- .../com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java | 2 +- .../cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java | 2 +- .../cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java | 2 +- .../maqs/nosql/MongoDBFunctionalUnitTest.java | 2 +- .../maqs/nosql/MongoDriverManagerUnitTest.java | 2 +- .../maqs/nosql/MongoTestObjectUnitTest.java | 2 +- 12 files changed, 14 insertions(+), 14 deletions(-) diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java index e6d7cda9f..50ea6fc89 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/BaseMongoTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant SoftVision, All rights Reserved + * Copyright 2022 (C) Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java index 71d2e104a..5aa790599 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfig.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant SoftVision, All rights Reserved + * Copyright 2022 (C) Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java index 48e4e9dda..91500c3b5 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant SoftVision, All rights Reserved + * Copyright 2022 (C) Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java index 9d9a22de6..60a66b36c 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant SoftVision, All rights Reserved + * Copyright 2022 (C) Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; @@ -34,7 +34,7 @@ public MongoDriverManager(String connectionString, String databaseString, MongoFactory.getCollection(connectionString, databaseString, collectionString)), testObject); } - /** TODO: is this needed? + /** * Initializes a new instance of the MongoDriverManager class. * @param getCollection Function for getting a Mongo collection connection * @param testObject Test object this driver is getting added to diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java index 0179969b4..04ce3c4fd 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant SoftVision, All rights Reserved + * Copyright 2022 (C) Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java index 468078c52..6c121488f 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java @@ -1,11 +1,11 @@ /* - * Copyright 2022 Cognizant SoftVision, All rights Reserved + * Copyright 2022 (C) Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; -import com.cognizantsoftvision.maqs.utilities.logging.Logger; import com.cognizantsoftvision.maqs.base.BaseTestObject; +import com.cognizantsoftvision.maqs.utilities.logging.Logger; import com.mongodb.client.MongoCollection; import java.util.function.Supplier; import org.bson.Document; diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java index 68337b9fe..e564cb64d 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant SoftVision, All rights Reserved + * Copyright 2022 (C) Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java index ff0178477..acb1ed3e1 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant SoftVision, All rights Reserved + * Copyright 2022 (C) Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java index caab8d723..86acfc16c 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriverUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant SoftVision, All rights Reserved + * Copyright 2022 (C) Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java index 643f4526b..e2b6a7b6f 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant SoftVision, All rights Reserved + * Copyright 2022 (C) Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java index 35370bf3e..9bcdfd457 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManagerUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant SoftVision, All rights Reserved + * Copyright 2022 (C) Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java index 0fad3ee52..d31890e62 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2022 Cognizant SoftVision, All rights Reserved + * Copyright 2022 (C) Cognizant SoftVision, All rights Reserved */ package com.cognizantsoftvision.maqs.nosql; From 44373fa9d0d02925be0a76ead2521aaf2bea4905 Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Thu, 10 Mar 2022 12:33:08 -0600 Subject: [PATCH 26/36] updated to set up mongo docker --- .github/workflows/pullrequest.yml | 2 +- maqs-nosql/pom.xml | 30 +----------------------------- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/.github/workflows/pullrequest.yml b/.github/workflows/pullrequest.yml index e2002e70b..61229e56c 100644 --- a/.github/workflows/pullrequest.yml +++ b/.github/workflows/pullrequest.yml @@ -24,7 +24,7 @@ jobs: path: ~/.m2 key: ${{runner.os}}-m2 - name: Build the docker-compose stack - run: docker-compose -f docker/MAQSSQLServer/docker-compose.yml -p CognizantOpenSource/maqs-java up -d + run: docker-compose -f docker/docker-compose.yml -p CognizantOpenSource/maqs-java up -d - name: Create settings file uses: InstaCode/maven-settings-xml-action@v9 with: diff --git a/maqs-nosql/pom.xml b/maqs-nosql/pom.xml index 690a2499b..4eb7307ca 100644 --- a/maqs-nosql/pom.xml +++ b/maqs-nosql/pom.xml @@ -16,7 +16,7 @@ ${revision} - 4.4.1 + 4.5.0 @@ -41,32 +41,4 @@ testng - - - - io.fabric8 - docker-maven-plugin - 0.37.0 - - - - mongoDB - - compose - ../Docker/MAQSMongoDB/ - docker-compose.yml - - - - - setup-database - process-test-resources - - start - - - - - - From d31d46d4240c7fce5c5dd481c268d6a71d1c79fb Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:40:53 -0500 Subject: [PATCH 27/36] small edits --- docker/MAQSMongoDB/docker-compose.yml | 2 +- .../maqs/nosql/IMongoTestObject.java | 46 +++++++++++++++++++ .../maqs/nosql/MongoDriverManager.java | 18 ++++---- .../maqs/nosql/MongoTestObject.java | 6 ++- .../maqs/nosql/BaseMongoUnitTest.java | 3 +- .../maqs/nosql/MongoDBConfigUnitTest.java | 2 +- 6 files changed, 64 insertions(+), 13 deletions(-) create mode 100644 maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/IMongoTestObject.java diff --git a/docker/MAQSMongoDB/docker-compose.yml b/docker/MAQSMongoDB/docker-compose.yml index 10479a005..bf458412c 100644 --- a/docker/MAQSMongoDB/docker-compose.yml +++ b/docker/MAQSMongoDB/docker-compose.yml @@ -12,7 +12,7 @@ services: image: mongo-express restart: always ports: - - 8081:8081 + - "8081:8081" links: - mongo environment: diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/IMongoTestObject.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/IMongoTestObject.java new file mode 100644 index 000000000..d87f234b3 --- /dev/null +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/IMongoTestObject.java @@ -0,0 +1,46 @@ +/* + * Copyright 2022 (C) Cognizant SoftVision, All rights Reserved + */ + +package com.cognizantsoftvision.maqs.nosql; + +import com.cognizantsoftvision.maqs.base.ITestObject; +import com.mongodb.client.MongoCollection; +import java.util.function.Supplier; +import org.bson.Document; + +/// +/// Mongo test object interface +/// +public interface IMongoTestObject extends ITestObject { + + /// + /// Gets the Mongo driver + /// + MongoDBDriver getMongoDBDriver(); + + /// + /// Gets the Mongo driver manager + /// + MongoDriverManager getMongoDBManager(); + + /// + /// Override the Mongo driver a collection function + /// + /// The collection function + void overrideMongoDBDriver(Supplier> overrideCollectionConnection); + + /// + /// Override the Mongo driver settings + /// + /// New Mongo driver + void overrideMongoDBDriver(MongoDBDriver driver); + + /// + /// Override the Mongo driver settings + /// + /// Client connection string + /// Database connection string + /// Mongo collection string + void overrideMongoDBDriver(String connectionString, String databaseString, String collectionString); +} diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java index 60a66b36c..6bb61b984 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java @@ -19,7 +19,7 @@ public class MongoDriverManager extends DriverManager { /** * Cached copy of the connection driver. */ - private MongoDBDriver driver; + private MongoDBDriver mongoDBDriver; /** * Initializes a new instance of the MongoDriverManager class. @@ -43,13 +43,12 @@ public MongoDriverManager(Supplier getCollection, BaseTestObject super(getCollection, testObject); } - /** * Override the Mongo driver. * @param overrideDriver The new Mongo driver */ public void overrideDriver(MongoDBDriver overrideDriver) { - driver = overrideDriver; + mongoDBDriver = overrideDriver; this.setBaseDriver(new MongoDBDriver(overrideDriver.getCollection())); } @@ -60,8 +59,7 @@ public void overrideDriver(MongoDBDriver overrideDriver) { * @param collectionString Collection string to use */ public void overrideDriver(String connectionString, String databaseString, String collectionString) { - driver = null; - this.overrideDriverGet(() -> MongoFactory.getCollection(connectionString, databaseString, collectionString)); + mongoDBDriver = null; this.overrideDriverGet(() -> MongoFactory.getCollection(connectionString, databaseString, collectionString)); } @@ -70,7 +68,7 @@ public void overrideDriver(String connectionString, String databaseString, Strin * @param overrideCollectionConnection The new collection connection */ public void overrideDriver(Supplier> overrideCollectionConnection) { - driver = null; + mongoDBDriver = null; this.overrideDriverGet(overrideCollectionConnection); } @@ -79,7 +77,11 @@ public void overrideDriver(Supplier> overrideCollectio * @return The Mongo driver */ public MongoDBDriver getMongoDriver() { - return this.getBase(); + // Create default Web Service Driver if null. + if (this.mongoDBDriver == null) { + this.mongoDBDriver = new MongoDBDriver(getBase().getCollection()); + } + return this.mongoDBDriver; } protected void overrideDriverGet(Supplier> driverGet) { @@ -90,7 +92,7 @@ public void close() { if (!this.isDriverInitialized()) { return; } - MongoDBDriver mongoDBDriver = this.getMongoDriver(); + mongoDBDriver.getMongoClient().close(); this.baseDriver = null; } diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java index 6c121488f..384c31e1a 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java @@ -13,7 +13,7 @@ /** * The Mongo Test Object class. */ -public class MongoTestObject extends BaseTestObject { +public class MongoTestObject extends BaseTestObject implements IMongoTestObject { /** * Initializes a new instance of the MongoTestObject class. @@ -61,13 +61,15 @@ public void overrideMongoDBDriver(String connectionString, String databaseString * @param driver New Mongo driver */ public void overrideMongoDBDriver(MongoDBDriver driver) { - this.getMongoDBManager().overrideDriver(driver); + this.getManagerStore().put(MongoDriverManager.class.getCanonicalName(), + new MongoDriverManager(() -> driver, this)); } /** * Override the Mongo driver a collection function. * @param overrideCollectionConnection The collection function */ + @Override public void overrideMongoDBDriver(Supplier> overrideCollectionConnection) { this.getMongoDBManager().overrideDriver(overrideCollectionConnection); } diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java index e564cb64d..ed029a31e 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java @@ -45,7 +45,8 @@ public void testSetMongoDBDriver() { public void testOverrideConnectionDriverWithMongoDBDriver() { overrideConnectionDriver(this.getMongoDBDriver()); Assert.assertNotNull(getMongoDBDriver()); - overrideConnectionDriver(this.getBaseConnectionString(), this.getBaseDatabaseString(), this.getBaseCollectionString()); + overrideConnectionDriver(this.getBaseConnectionString(), + this.getBaseDatabaseString(), this.getBaseCollectionString()); Assert.assertNotNull(getMongoDBDriver()); } diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java index acb1ed3e1..eb571855b 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java @@ -11,7 +11,7 @@ /** * The Mongo Database Config unit test class. */ -public class MongoDBConfigUnitTest extends BaseMongoTest{ +public class MongoDBConfigUnitTest extends BaseMongoTest { /** * Test getting the connection string. From 6e53965985ad362d3c23948ea539eb75960d077f Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:43:05 -0500 Subject: [PATCH 28/36] small edits --- docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 0dd41e694..1b2f749d0 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -6,7 +6,7 @@ version: '2' services: mssql: - extends: + extends: file: ./MAQSSQLServer/docker-compose.yml service: mssql mongo: From c565353f1bf4e9cc431bb7194888d9e6f986e8ff Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:46:50 -0500 Subject: [PATCH 29/36] small edits --- docker/docker-compose.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 1b2f749d0..44c3c95f1 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -12,8 +12,4 @@ services: mongo: extends: file: ./MAQSMongoDB/docker-compose.yml - service: mongo -# imap: -# extends: -# file: ./MAQSEmail/docker-compose.yml -# service: imap + service: mongo \ No newline at end of file From a647e932114d16ccfd1325e9c3683c014f468492 Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Wed, 13 Apr 2022 09:48:02 -0500 Subject: [PATCH 30/36] small edits --- docker/MAQSMongoDB/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/MAQSMongoDB/docker-compose.yml b/docker/MAQSMongoDB/docker-compose.yml index bf458412c..10479a005 100644 --- a/docker/MAQSMongoDB/docker-compose.yml +++ b/docker/MAQSMongoDB/docker-compose.yml @@ -12,7 +12,7 @@ services: image: mongo-express restart: always ports: - - "8081:8081" + - 8081:8081 links: - mongo environment: From a894a01776b68232601c8c31d0abb7acb235ea20 Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Thu, 14 Apr 2022 08:49:26 -0500 Subject: [PATCH 31/36] update docker --- docker/docker-compose.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 2b04f0b3c..44c3c95f1 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -6,18 +6,10 @@ version: '2' services: mssql: - extends: + extends: file: ./MAQSSQLServer/docker-compose.yml service: mssql mongo: extends: file: ./MAQSMongoDB/docker-compose.yml - service: mongo - imap: - extends: - file: ./MAQSEmail/docker-compose.yml - service: imap - webservice: - extends: - service: webservice - file: ./MAQSService/docker-compose.yml + service: mongo \ No newline at end of file From 04344318a5143ea8273b78a896a7a21a2351b355 Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Fri, 15 Apr 2022 16:55:49 -0500 Subject: [PATCH 32/36] updated some stuff --- .github/labeler.yml | 4 ++ .../maqs/nosql/IMongoTestObject.java | 48 ++++++++++--------- .../maqs/nosql/MongoTestObject.java | 25 ++++------ .../maqs/nosql/MongoDBConfigUnitTest.java | 2 +- .../maqs/nosql/MongoDBFunctionalUnitTest.java | 2 +- 5 files changed, 40 insertions(+), 41 deletions(-) diff --git a/.github/labeler.yml b/.github/labeler.yml index 01febd985..880d4df3f 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -33,3 +33,7 @@ devops: accessibility: - maqs-accessibility/* - maqs-accessibility/**/* + +noSQL: + -maqs-nosql/* + -maqs-nosql/**/* diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/IMongoTestObject.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/IMongoTestObject.java index d87f234b3..50f45ea32 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/IMongoTestObject.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/IMongoTestObject.java @@ -9,38 +9,40 @@ import java.util.function.Supplier; import org.bson.Document; -/// -/// Mongo test object interface -/// +/** + * The Mongo Test Object interface. + */ public interface IMongoTestObject extends ITestObject { - /// - /// Gets the Mongo driver - /// + /** + * Gets the Mongo driver. + * @return the mongo database driver + */ MongoDBDriver getMongoDBDriver(); - /// - /// Gets the Mongo driver manager - /// + /** + * Gets the Mongo driver manager. + * @return the mongo database manager + */ MongoDriverManager getMongoDBManager(); - /// - /// Override the Mongo driver a collection function - /// - /// The collection function + /** + * Override the Mongo driver a collection function. + * @param overrideCollectionConnection The collection function + */ void overrideMongoDBDriver(Supplier> overrideCollectionConnection); - /// - /// Override the Mongo driver settings - /// - /// New Mongo driver + /** + * Override the Mongo driver settings. + * @param driver New Mongo driver + */ void overrideMongoDBDriver(MongoDBDriver driver); - /// - /// Override the Mongo driver settings - /// - /// Client connection string - /// Database connection string - /// Mongo collection string + /** + * Override the Mongo driver settings. + * @param connectionString Client connection string + * @param databaseString Database connection string + * @param collectionString Mongo collection string + */ void overrideMongoDBDriver(String connectionString, String databaseString, String collectionString); } diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java index 384c31e1a..548a8953b 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java @@ -31,34 +31,28 @@ public MongoTestObject(String connectionString, String databaseString, String co } /** - * Gets the Mongo driver manager. - * @return the mongo driver manager + * {@inheritDoc} */ - public MongoDriverManager getMongoDBManager() { - return this.getManagerStore().getDriver(MongoDriverManager.class.getCanonicalName()); + public MongoDBDriver getMongoDBDriver() { + return this.getMongoDBManager().getMongoDriver(); } /** - * Gets the Mongo driver. - * @return the stored mongoDB driver. + * {@inheritDoc} */ - public MongoDBDriver getMongoDBDriver() { - return this.getMongoDBManager().getMongoDriver(); + public MongoDriverManager getMongoDBManager() { + return this.getManagerStore().getDriver(MongoDriverManager.class.getCanonicalName()); } /** - * Override the Mongo driver settings. - * @param connectionString Client connection string - * @param databaseString Database connection string - * @param collectionString Mongo collection string + * {@inheritDoc} */ public void overrideMongoDBDriver(String connectionString, String databaseString, String collectionString) { this.getMongoDBManager().overrideDriver(connectionString, databaseString, collectionString); } /** - * Override the Mongo driver settings. - * @param driver New Mongo driver + * {@inheritDoc} */ public void overrideMongoDBDriver(MongoDBDriver driver) { this.getManagerStore().put(MongoDriverManager.class.getCanonicalName(), @@ -66,8 +60,7 @@ public void overrideMongoDBDriver(MongoDBDriver driver) { } /** - * Override the Mongo driver a collection function. - * @param overrideCollectionConnection The collection function + * {@inheritDoc} */ @Override public void overrideMongoDBDriver(Supplier> overrideCollectionConnection) { diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java index eb571855b..d5fe4fa84 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBConfigUnitTest.java @@ -11,7 +11,7 @@ /** * The Mongo Database Config unit test class. */ -public class MongoDBConfigUnitTest extends BaseMongoTest { +public class MongoDBConfigUnitTest { /** * Test getting the connection string. diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java index e2b6a7b6f..5e784b07f 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoDBFunctionalUnitTest.java @@ -17,7 +17,7 @@ /** * The Mongo Database Functional unit test class. */ -public class MongoDBFunctionalUnitTest extends BaseMongoTest{ +public class MongoDBFunctionalUnitTest extends BaseMongoTest { /** * Test the collection works as expected when getting the login id. From da4f6cbbca2e56bd81bf323bc000d09510f9f8e1 Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Thu, 5 May 2022 10:34:52 -0500 Subject: [PATCH 33/36] add nosql module to maven.yml --- .github/workflows/maven.yml | 2 +- .../maqs/nosql/MongoFactory.java | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 0ae7af879..2e2f28ee1 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -108,7 +108,7 @@ jobs: strategy: fail-fast: false matrix: - module-name: [ maqs-utilities, maqs-base, maqs-appium, maqs-selenium, maqs-webservices, maqs-cucumber, maqs-accessibility, maqs-database, maqs-playwright ] + module-name: [ maqs-utilities, maqs-base, maqs-appium, maqs-selenium, maqs-webservices, maqs-cucumber, maqs-accessibility, maqs-database, maqs-playwright, maqs-nosql ] steps: - name: Check if tests can be run if: matrix.module-name == 'maqs-appium' && github.actor == 'dependabot[bot]' diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java index 04ce3c4fd..43b1238fb 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java @@ -8,11 +8,12 @@ import com.mongodb.MongoClientSettings; import com.mongodb.MongoException; import com.mongodb.client.MongoClient; -import com.mongodb.client.MongoClients; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import org.bson.Document; +import static com.mongodb.client.MongoClients.create; + /** * The Mongo Factory Class. */ @@ -39,18 +40,17 @@ public static MongoCollection getDefaultCollection() { */ public static MongoCollection getCollection( String connectionString, String databaseString, String collectionString) { - MongoClient mongoClient; MongoDatabase database; - try { - mongoClient = MongoClients.create(connectionString); + try (MongoClient mongoClient = create(connectionString)) { database = mongoClient.getDatabase(databaseString); + return database.getCollection(collectionString); } catch (MongoClientException e) { throw new MongoClientException("connection was not created"); } catch (MongoException e) { throw new MongoException("database does not exist"); } - return database.getCollection(collectionString); + } /** @@ -62,11 +62,9 @@ public static MongoCollection getCollection( */ public static MongoCollection getCollection(String databaseString, String collectionString, MongoClientSettings settings) { - MongoClient mongoClient; MongoDatabase database; - try { - mongoClient = MongoClients.create(settings); + try (MongoClient mongoClient = create(settings)) { database = mongoClient.getDatabase(databaseString); } catch (Exception e) { throw new MongoException("connection was not created: " + e); From 56640020b22d62cf7f0eafca21c7b8b5257ecc1f Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Thu, 5 May 2022 10:37:32 -0500 Subject: [PATCH 34/36] checkstyle updates --- .../java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java index 43b1238fb..c91744c75 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java @@ -4,6 +4,8 @@ package com.cognizantsoftvision.maqs.nosql; +import static com.mongodb.client.MongoClients.create; + import com.mongodb.MongoClientException; import com.mongodb.MongoClientSettings; import com.mongodb.MongoException; @@ -12,8 +14,6 @@ import com.mongodb.client.MongoDatabase; import org.bson.Document; -import static com.mongodb.client.MongoClients.create; - /** * The Mongo Factory Class. */ From fdc877e577e06283c1503924638172d5df97a104 Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Wed, 14 Sep 2022 13:22:43 -0500 Subject: [PATCH 35/36] more updates --- docker/MAQSMongoDB/docker-compose.yml | 2 +- .../maqs/nosql/MongoDBDriver.java | 13 +++++---- .../maqs/nosql/MongoDriverManager.java | 29 ++++++++++++------- .../maqs/nosql/MongoFactory.java | 29 ++----------------- .../maqs/nosql/MongoTestObject.java | 8 ++--- .../maqs/nosql/BaseMongoUnitTest.java | 2 ++ .../maqs/nosql/MongoTestObjectUnitTest.java | 2 +- 7 files changed, 36 insertions(+), 49 deletions(-) diff --git a/docker/MAQSMongoDB/docker-compose.yml b/docker/MAQSMongoDB/docker-compose.yml index 10479a005..bf458412c 100644 --- a/docker/MAQSMongoDB/docker-compose.yml +++ b/docker/MAQSMongoDB/docker-compose.yml @@ -12,7 +12,7 @@ services: image: mongo-express restart: always ports: - - 8081:8081 + - "8081:8081" links: - mongo environment: diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java index 91500c3b5..b68677a51 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDBDriver.java @@ -50,6 +50,7 @@ public MongoDBDriver(String collectionString) { /** * Initializes a new instance of the MongoDBDriver class. + * @param clientSettings the mongo client settings * @param collectionString Name of the collection */ public MongoDBDriver(MongoClientSettings clientSettings, String databaseString, String collectionString) { @@ -104,20 +105,20 @@ public MongoDatabase getDatabase() { /** * Sets the database object. - * @param mongoClient the mongo DB client of the database * @param mongoDatabase the name of the mongo database */ - public void setDatabase(MongoClient mongoClient, String mongoDatabase) { - this.client = mongoClient; - setDatabase(mongoDatabase); + public void setDatabase(String mongoDatabase) { + this.database = this.getMongoClient().getDatabase(mongoDatabase); } /** * Sets the database object. + * @param mongoClient the mongo DB client of the database * @param mongoDatabase the name of the mongo database */ - public void setDatabase(String mongoDatabase) { - this.database = this.getMongoClient().getDatabase(mongoDatabase); + public void setDatabase(MongoClient mongoClient, String mongoDatabase) { + this.client = mongoClient; + setDatabase(mongoDatabase); } /** diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java index 6bb61b984..390a23207 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoDriverManager.java @@ -4,9 +4,11 @@ package com.cognizantsoftvision.maqs.nosql; - import com.cognizantsoftvision.maqs.base.BaseTestObject; import com.cognizantsoftvision.maqs.base.DriverManager; +import com.cognizantsoftvision.maqs.utilities.logging.LoggingConfig; +import com.cognizantsoftvision.maqs.utilities.logging.LoggingEnabled; +import com.cognizantsoftvision.maqs.utilities.logging.MessageType; import com.mongodb.client.MongoCollection; import java.util.function.Supplier; import org.bson.Document; @@ -19,7 +21,7 @@ public class MongoDriverManager extends DriverManager { /** * Cached copy of the connection driver. */ - private MongoDBDriver mongoDBDriver; + private MongoDBDriver driver; /** * Initializes a new instance of the MongoDriverManager class. @@ -48,7 +50,7 @@ public MongoDriverManager(Supplier getCollection, BaseTestObject * @param overrideDriver The new Mongo driver */ public void overrideDriver(MongoDBDriver overrideDriver) { - mongoDBDriver = overrideDriver; + driver = overrideDriver; this.setBaseDriver(new MongoDBDriver(overrideDriver.getCollection())); } @@ -59,7 +61,7 @@ public void overrideDriver(MongoDBDriver overrideDriver) { * @param collectionString Collection string to use */ public void overrideDriver(String connectionString, String databaseString, String collectionString) { - mongoDBDriver = null; + driver = null; this.overrideDriverGet(() -> MongoFactory.getCollection(connectionString, databaseString, collectionString)); } @@ -68,7 +70,7 @@ public void overrideDriver(String connectionString, String databaseString, Strin * @param overrideCollectionConnection The new collection connection */ public void overrideDriver(Supplier> overrideCollectionConnection) { - mongoDBDriver = null; + driver = null; this.overrideDriverGet(overrideCollectionConnection); } @@ -78,22 +80,29 @@ public void overrideDriver(Supplier> overrideCollectio */ public MongoDBDriver getMongoDriver() { // Create default Web Service Driver if null. - if (this.mongoDBDriver == null) { - this.mongoDBDriver = new MongoDBDriver(getBase().getCollection()); + if (this.driver == null) { + MongoCollection temp = getBase().getCollection(); + + if (LoggingConfig.getLoggingEnabledSetting() == LoggingEnabled.NO) { + this.getLogger().logMessage(MessageType.INFORMATION, "Getting Mongo driver"); + } + + this.driver = new MongoDBDriver(temp); } - return this.mongoDBDriver; + return this.driver; } protected void overrideDriverGet(Supplier> driverGet) { - this.setBaseDriver(new MongoDBDriver(driverGet.get())); + this.getMongoDriver(); } + @Override public void close() { if (!this.isDriverInitialized()) { return; } - mongoDBDriver.getMongoClient().close(); + driver.getMongoClient().close(); this.baseDriver = null; } } diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java index c91744c75..ae34995fd 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoFactory.java @@ -10,6 +10,7 @@ import com.mongodb.MongoClientSettings; import com.mongodb.MongoException; import com.mongodb.client.MongoClient; +import com.mongodb.client.MongoClients; import com.mongodb.client.MongoCollection; import com.mongodb.client.MongoDatabase; import org.bson.Document; @@ -40,39 +41,13 @@ public static MongoCollection getDefaultCollection() { */ public static MongoCollection getCollection( String connectionString, String databaseString, String collectionString) { - MongoDatabase database; - try (MongoClient mongoClient = create(connectionString)) { - database = mongoClient.getDatabase(databaseString); + MongoDatabase database = mongoClient.getDatabase(databaseString); return database.getCollection(collectionString); } catch (MongoClientException e) { throw new MongoClientException("connection was not created"); } catch (MongoException e) { throw new MongoException("database does not exist"); } - - } - - /** - * Get the email client using connection information from the test run configuration. - * @param databaseString the database string - * @param settings the mongoDB settings to be set - * @param collectionString the collection string - * @return The email connection - */ - public static MongoCollection getCollection(String databaseString, - String collectionString, MongoClientSettings settings) { - MongoDatabase database; - - try (MongoClient mongoClient = create(settings)) { - database = mongoClient.getDatabase(databaseString); - } catch (Exception e) { - throw new MongoException("connection was not created: " + e); - } - - if (database.getName().isEmpty()) { - throw new MongoException("connection was not created"); - } - return database.getCollection(collectionString); } } diff --git a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java index 548a8953b..be1c0e454 100644 --- a/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java +++ b/maqs-nosql/src/main/java/com/cognizantsoftvision/maqs/nosql/MongoTestObject.java @@ -33,15 +33,15 @@ public MongoTestObject(String connectionString, String databaseString, String co /** * {@inheritDoc} */ - public MongoDBDriver getMongoDBDriver() { - return this.getMongoDBManager().getMongoDriver(); + public MongoDriverManager getMongoDBManager() { + return this.getManagerStore().getDriver(MongoDriverManager.class.getCanonicalName()); } /** * {@inheritDoc} */ - public MongoDriverManager getMongoDBManager() { - return this.getManagerStore().getDriver(MongoDriverManager.class.getCanonicalName()); + public MongoDBDriver getMongoDBDriver() { + return this.getMongoDBManager().getMongoDriver(); } /** diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java index ed029a31e..c6962205a 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/BaseMongoUnitTest.java @@ -18,6 +18,8 @@ public class BaseMongoUnitTest extends BaseMongoTest { */ @Test(groups = TestCategories.MONGO) public void testGetMongoDBDriver() { + this.setMongoDBDriver(new MongoDBDriver( + MongoDBConfig.getConnectionString(), MongoDBConfig.getDatabaseString(), MongoDBConfig.getCollectionString())); MongoDBDriver mongoDBDriver = this.getMongoDBDriver(); Assert.assertNotNull(mongoDBDriver, "Checking that MongoDB Driver is not null through BaseMongoTest"); diff --git a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java index d31890e62..ab5f2132d 100644 --- a/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java +++ b/maqs-nosql/src/test/java/com/cognizantsoftvision/maqs/nosql/MongoTestObjectUnitTest.java @@ -84,7 +84,7 @@ public void overrideWithCustomDriver() { @Test(groups = TestCategories.MONGO) public void TestMongoDBTestObjectMapCorrectly() { Assert.assertEquals(this.getTestObject().getLogger(), this.getLogger(), "Logs don't match"); - Assert.assertEquals(this.getTestObject().getPerfTimerCollection(), this.getPerfTimerCollection(), "Perf Timer Collections don't match"); + //Assert.assertEquals(this.getTestObject().getPerfTimerCollection(), this.getPerfTimerCollection(), "Perf Timer Collections don't match"); Assert.assertEquals(this.getTestObject().getMongoDBDriver(), this.getMongoDBDriver(), "Web service driver don't match"); } } From d93231a364a2babb8880f24bf6073ea6a2cc531d Mon Sep 17 00:00:00 2001 From: jredingcvs <97762469+jredingcvs@users.noreply.github.com> Date: Fri, 16 Sep 2022 15:23:21 -0500 Subject: [PATCH 36/36] manage port as quotes --- docker/MAQSMongoDB/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/MAQSMongoDB/docker-compose.yml b/docker/MAQSMongoDB/docker-compose.yml index bf458412c..10479a005 100644 --- a/docker/MAQSMongoDB/docker-compose.yml +++ b/docker/MAQSMongoDB/docker-compose.yml @@ -12,7 +12,7 @@ services: image: mongo-express restart: always ports: - - "8081:8081" + - 8081:8081 links: - mongo environment: