Local Database for test database module

Docker/MAQSSQLServer/docker-compose.yml

@@ -0,0 +1,18 @@
+version: '2'
+
+services:
+  mssql:
+    image: mcr.microsoft.com/mssql/server:latest
+    ports:
+      - 1433:1433
+    environment:
+      - ACCEPT_EULA=Y
+      - SA_PASSWORD=magenicMAQS2
+      - MSSQL_PID=Developer
+    expose:
+      - 1433
+    volumes:
+      # Mount the current directory onto /mnt/host on the image.
+      - ./:/mnt/host/
+    # Run a custom bash script that bootstraps the database after it is started.
+    command: ['/bin/bash', '/mnt/host/initialize_and_start_sqlserver.sh'] 

Docker/MAQSSQLServer/initialize_and_start_sqlserver.sh

@@ -0,0 +1,34 @@
+#!/bin/bash
+{ 
+    # Wait for SQL Server to start up
+    # Check if the server is ready
+    not_ready=1
+    while [ $not_ready != 0 ]
+    do
+        # Wait for the return code of the following statement to be zero
+        /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P magenicMAQS2 -d master -Q "SELECT TOP 1 message_id FROM sys.messages"
+        not_ready=$?
+
+        if [ $not_ready != 0 ]
+        then
+            echo "Could not contact sql server, will try again in 5 seconds."
+            sleep 5s
+        fi
+    done
+
+    echo "Started initializing database"
+    # Set up the schema and stored procedures
+    /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P magenicMAQS2 -d master -i `dirname $0`/schema.sql
+    /opt/mssql-tools/bin/sqlcmd -S localhost -U sa -P magenicMAQS2 -d master -i `dirname $0`/stored_procedures.sql
+    # Use BCP to import test data
+    /opt/mssql-tools/bin/bcp MagenicAutomation.dbo.States in "`dirname $0`/SeedData/MagenicAutomation/States.bcp" \
+        -n -S localhost -U sa -P magenicMAQS2
+    /opt/mssql-tools/bin/bcp MagenicAutomation.dbo.Cities in "`dirname $0`/SeedData/MagenicAutomation/Cities.bcp" \
+        -n -S localhost -U sa -P magenicMAQS2
+    /opt/mssql-tools/bin/bcp MagenicAutomation.dbo.Datatype in "`dirname $0`/SeedData/MagenicAutomation/Datatype.bcp" \
+        -n -S localhost -U sa -P magenicMAQS2
+    echo "Finished initializing database"
+}&
+
+# Start SQL server
+exec /opt/mssql/bin/sqlservr

Docker/MAQSSQLServer/schema.sql

@@ -0,0 +1,31 @@
+CREATE DATABASE MagenicAutomation;
+GO
+USE MagenicAutomation;
+GO
+CREATE TABLE [dbo].[States](
+	[StateID] [int] PRIMARY KEY IDENTITY(1,1) NOT NULL,
+	[StateName] [nvarchar](max) NOT NULL,
+	[StateAbbreviation] [nvarchar](2) NULL
+);
+GO
+CREATE TABLE [dbo].[Cities](
+	[CityID] [int] PRIMARY KEY IDENTITY(1,1) NOT NULL,
+	[CityName] [nvarchar](max) NOT NULL,
+	[CityPopulation] [decimal](18, 2) 
+);
+GO
+CREATE TABLE [dbo].[Datatype](
+	[bitintType] [bigint] NULL,
+	[bitType] [bit] NULL,
+	[char10Type] [char](10) NULL,
+	[dateType] [date] NULL,
+	[dateTimeType] [datetime] NULL,
+	[floatType] [float] NULL,
+	[intType] [int] NULL,
+	[ncharType] [nchar](10) NULL,
+	[nvarcharType] [nvarchar](50) NULL,
+	[varcharType] [varchar](50) NULL,
+	[decimalType] [decimal](18, 2) NULL,
+	[xmlType] [xml] NULL
+);
+GO

Docker/MAQSSQLServer/stored_procedures.sql

@@ -0,0 +1,17 @@
+USE MagenicAutomation;
+GO
+CREATE PROCEDURE [dbo].[getStateAbbrevMatch]
+       @StateAbbreviation VARCHAR(2)
+  AS BEGIN
+    SELECT StateAbbreviation FROM States
+    WHERE StateAbbreviation = @StateAbbreviation
+  END 
+GO
+CREATE PROCEDURE [dbo].[setStateAbbrevToSelf]
+       @StateAbbreviation VARCHAR(2)
+  AS BEGIN
+    UPDATE States
+    SET StateAbbreviation = @StateAbbreviation 
+    WHERE StateAbbreviation = @StateAbbreviation
+  END 
+GO

jmaqs-database/config.xml

@@ -52,10 +52,11 @@
         <DatabaseName>MagenicAutomation</DatabaseName>
         <!--<DatabaseProviderType>SQL</DatabaseProviderType>
         <DatabaseProviderType>MYSQL</DatabaseProviderType>-->
+<!--        Data Source=localhost;Initial Catalog=MagenicAutomation;Persist Security Info=True;User ID=sa;Password=magenicMAQS2;Connection Timeout=30-->
         <DatabaseProviderType>SQL</DatabaseProviderType>
-        <DatabaseUser>MagenicQA</DatabaseUser>
-        <DatabasePassword>1magenicMARQ</DatabasePassword>
-        <DatabaseConnectionString>jdbc:sqlserver://qasqlserver.database.windows.net</DatabaseConnectionString>
+        <DatabaseUser>sa</DatabaseUser>
+        <DatabasePassword>magenicMAQS2</DatabasePassword>
+        <DatabaseConnectionString>jdbc:sqlserver://localhost</DatabaseConnectionString>
         <EntityDirectory>./src/test/java/com/magenic/jmaqs/database/entities/</EntityDirectory>
         <EntityPackage>com.magenic.jmaqs.database.entities</EntityPackage>
     </DatabaseMaqs>

jmaqs-database/pom.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xmlns="http://maven.apache.org/POM/4.0.0"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
@@ -13,7 +13,7 @@
     <version>${revision}</version>
     <name>JMAQS Database Testing Module</name>
     <properties>
-        <hibernate-core.version>5.6.0.Final</hibernate-core.version>
+        <hibernate-core.version>5.6.1.Final</hibernate-core.version>
         <sqlite-jdbc.version>3.36.0.3</sqlite-jdbc.version>
         <mssql-jdbc.version>8.2.2.jre8</mssql-jdbc.version>
         <javax.persistence.version>2.2.1</javax.persistence.version>
@@ -67,4 +67,33 @@
             <version>${sqlite-jdbc.version}</version>
         </dependency>
     </dependencies>
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>io.fabric8</groupId>
+                <artifactId>docker-maven-plugin</artifactId>
+                <version>0.37.0</version>
+                <configuration>
+                    <images>
+                        <image>
+                            <alias>mssql</alias>
+                            <name>mcr.microsoft.com/mssql/server:latest</name>
+                            <external>
+                                <type>compose</type>
+                                <basedir>../Docker/MAQSSQLServer/</basedir>
+                                <composeFile>docker-compose.yml</composeFile>
+                            </external>
+                        </image>
+                    </images>
+                    <execution>
+                        <id>setup-database</id>
+                        <phase>process-test-resources</phase>
+                        <goals>
+                            <goal>start</goal>
+                        </goals>
+                    </execution>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
 </project>

jmaqs-database/src/test/java/com/magenic/jmaqs/database/DatabaseConfigUnitTest.java

@@ -23,7 +23,7 @@ public class DatabaseConfigUnitTest extends BaseGenericTest {
   @Test(groups = TestCategories.DATABASE)
   public void testGetConnectionString() {
     Assert.assertEquals(DatabaseConfig.getConnectionString(),
-        "jdbc:sqlserver://qasqlserver.database.windows.net");
+        "jdbc:sqlserver://localhost");
   }
 
   /**
@@ -68,11 +68,11 @@ public void testGetDatabaseName() {
 
   @Test(groups = TestCategories.DATABASE)
   public void testGetDatabaseUser() {
-    Assert.assertEquals(DatabaseConfig.getDatabaseUser(), "MagenicQA");
+    Assert.assertEquals(DatabaseConfig.getDatabaseUser(), "sa");
   }
 
   @Test(groups = TestCategories.DATABASE)
   public void testGetDatabasePassword() {
-    Assert.assertEquals(DatabaseConfig.getDatabasePassword(), "1magenicMARQ");
+    Assert.assertEquals(DatabaseConfig.getDatabasePassword(), "magenicMAQS2");
   }
 }

jmaqs-selenium/src/main/java/com/magenic/jmaqs/selenium/WebDriverFactory.java

@@ -7,11 +7,8 @@
 import com.magenic.jmaqs.selenium.constants.BrowserType;
 import com.magenic.jmaqs.selenium.constants.OperatingSystem;
 import com.magenic.jmaqs.selenium.constants.RemoteBrowserType;
-import com.magenic.jmaqs.selenium.constants.WebDriverFile;
 import com.magenic.jmaqs.selenium.exceptions.DriverNotFoundException;
 import com.magenic.jmaqs.selenium.exceptions.WebDriverFactoryException;
-import com.magenic.jmaqs.utilities.helper.Config;
-import com.magenic.jmaqs.utilities.helper.ConfigSection;
 import com.magenic.jmaqs.utilities.helper.StringProcessor;
 import java.io.File;
 import java.net.URL;

pom.xml

@@ -230,22 +230,41 @@
         <profile>
             <id>testing</id>
             <activation>
+                <activeByDefault>true</activeByDefault>
                 <property>
                     <name>testing</name>
                 </property>
             </activation>
             <build>
                 <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-dependency-plugin</artifactId>
+                        <version>3.1.2</version>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>properties</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-surefire-plugin</artifactId>
-                        <version>${surefire.plugin.version}</version>
+                        <version>3.0.0-M5</version>
                         <configuration>
                             <parallel>methods</parallel>
                             <threadCount>5</threadCount>
-                            <!--                            <argLine>${argLine}</argLine>-->
-                            <!--                            <argLine>-javaagent @{maven.dependency.io.github.bonigarcia:webdrivermanager:jar:path}</argLine>-->
+                            <argLine>${argLine} -javaagent:@{io.github.bonigarcia:webdrivermanager:jar}</argLine>
                         </configuration>
+                        <dependencies>
+                            <dependency>
+                                <groupId>org.apache.maven.surefire</groupId>
+                                <artifactId>surefire-testng</artifactId>
+                                <version>3.0.0-M5</version>
+                            </dependency>
+                        </dependencies>
                     </plugin>
                 </plugins>
             </build>
@@ -421,35 +440,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>3.1.2</version>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>properties</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>3.0.0-M5</version>
-                <configuration>
-                    <parallel>methods</parallel>
-                    <threadCount>5</threadCount>
-                    <argLine>-javaagent:@{io.github.bonigarcia:webdrivermanager:jar}</argLine>
-                </configuration>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>surefire-testng</artifactId>
-                        <version>3.0.0-M5</version>
-                    </dependency>
-                </dependencies>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-checkstyle-plugin</artifactId>