better run with DynamicJdbcConfig

Author: clouless

README.md

@@ -15,13 +15,91 @@ This PoC is based on **[UnitTests for Active Objects](https://developer.atlassia
 
 ### Running the Tests
 
-Simply run:
+We can run the same test against different database engines.
+
+ 
+
+##### Run tests against embedded HSQLDB
 
 ```
 atlas-unit-test
 ```
 
-<p align="center"><img src="./doc/success.png" width="80%"></p>
+&nbsp;
+
+##### Run tests against dockerized PostgreSQL
+
+(1) Start dockerized PostgreSQL database
+
+```
+docker run --name postgres95 \
+           -d --rm -p 5441:5432 \
+           -e POSTGRES_PASSWORD=jira \
+           -e POSTGRES_USER=jira \
+           -e POSTGRES_DB=jira \
+           postgres:9.5
+```
+
+(2) Run tests against it
+
+```
+atlas-unit-test -Dao.test.database=postgres \
+                -Ddb.url=jdbc:postgresql://localhost:5441/jira  \
+                -Ddb.schema=public \
+                -Ddb.username=jira \
+                -Ddb.password=jira
+```
+
+<p align="center"><img src="./doc/demo.gif" width="80%"></p>
+
+We can see the **tables and indexes**:
+
+<p align="center"><img src="./doc/tables_and_indexes.png" width="80%"></p>
+
+
+(3) Shutdown dockerized PostgreSQL database.
+
+```
+docker kill postgres95
+```
+
+
+
+
+
+&nbsp;
+
+##### Run tests against dockerized MySQL
+
+(1) Start dockerized MySQL database
+
+```
+docker run --name mysql56 \
+           -d --rm \
+           -p 3316:3306 \
+           -e MYSQL_RANDOM_ROOT_PASSWORD=true \
+           -e MYSQL_USER=jira  \
+           -e MYSQL_PASSWORD=jira  \
+           -e MYSQL_DATABASE=jira  \
+           mysql:5.6
+```
+
+(2) Run tests against it
+
+```
+atlas-unit-test -Dao.test.database=mysql \
+                -Ddb.url=jdbc:mysql://localhost:3316/jira?autoReconnect=true  \
+                -Ddb.username=jira \
+                -Ddb.password=jira
+```
+
+  * Note that MySQL uses no so called "schema". So we skip the definition.
+
+(3) Shutdown dockerized MySQL database.
+
+```
+docker kill mysql56
+```
 
 &nbsp;
 
@@ -30,14 +108,10 @@ atlas-unit-test
  * Businss Logic
    * [**`OwnerEntity`**](https://github.com/comsysto/poc-dockerized-database-integration-tests-atlassian-plugin/blob/master/src/main/java/com/comsysto/poc/ao/model/OwnerEntity.java) = Active Objects Entity
    * [**`PetEntity`**](https://github.com/comsysto/poc-dockerized-database-integration-tests-atlassian-plugin/blob/master/src/main/java/com/comsysto/poc/ao/model/PetEntity.java) = Active Objects Entity
-   * [**`PetAndOwnerDataAccessService`**](https://github.com/comsysto/poc-dockerized-database-integration-tests-atlassian-plugin/blob/master/src/main/java/com/comsysto/poc/ao/service/PetAndOwnerDataAccessService.java) = Data Access API works with EntityManager 
- * Tests  
-   * [**`PetAndOwnerDataAccessServiceTest`**](https://github.com/comsysto/poc-dockerized-database-integration-tests-atlassian-plugin/blob/master/src/test/java/ut/com/comsysto/poc/ao/service/PetAndOwnerDataAccessServiceTest.java) = Base test whose test methods are used by every specific database engine test
-   * [**`PetAndOwnerDataAccessService_MySQL_5_6_Test`**](https://github.com/comsysto/poc-dockerized-database-integration-tests-atlassian-plugin/blob/master/src/test/java/ut/com/comsysto/poc/ao/service/PetAndOwnerDataAccessService_MySQL_5_6_Test.java) = Test that runs against dockerized MySQL 5.6
-   * [**`PetAndOwnerDataAccessService_PostgreSQL_9_5_Test`**](https://github.com/comsysto/poc-dockerized-database-integration-tests-atlassian-plugin/blob/master/src/test/java/ut/com/comsysto/poc/ao/service/PetAndOwnerDataAccessService_PostgreSQL_9_5_Test.java) = Test that runs against dockerized PostgreSQL 9.5
- * Test Config
-   * [**`Dockerized_MySQL_5_6_JdbcConfig`**](https://github.com/comsysto/poc-dockerized-database-integration-tests-atlassian-plugin/blob/master/src/test/java/ut/com/comsysto/poc/ao/service/jdbc/Dockerized_MySQL_5_6_JdbcConfig.java) = Test Config contains code to start docker container and JDBC Config for test
-   * [**`Dockerized_Postgres_9_5_JdbcConfig`**](https://github.com/comsysto/poc-dockerized-database-integration-tests-atlassian-plugin/blob/master/src/test/java/ut/com/comsysto/poc/ao/service/jdbc/Dockerized_Postgres_9_5_JdbcConfig.java) = Test Config contains code to start docker container and JDBC Config for test
+   * [**`PetAndOwnerDataAccessServiceImpl`**](https://github.com/comsysto/poc-dockerized-database-integration-tests-atlassian-plugin/blob/master/src/main/java/com/comsysto/poc/ao/service/PetAndOwnerDataAccessServiceImpl.java) = Data Access API works with ActiveObjects 
+ * Test  
+   * [**`PetAndOwnerDataAccessServiceTest`**](https://github.com/comsysto/poc-dockerized-database-integration-tests-atlassian-plugin/blob/master/src/test/java/ut/com/comsysto/poc/ao/service/PetAndOwnerDataAccessServiceTest.java) = Base test whose test methods are run against different database engines
+
 &nbsp;
 
 ### Distinctions
@@ -46,8 +120,6 @@ atlas-unit-test
    * Because even though it is named 'integration-test' it starts a full JIRA instance
 and runs tests against it. We only want to instantiate Active Objects with a real database and not the whole JIRA context.
 That is why we use the `atlas-unit-test` command.
- * Why not use `DynamicJdbcConfiguration` Annotation and System properties or maven profiles?
-   * There are already many examples in the web on how to do that. I wanted to show another way.
  * Why not use `@ManyToOne` Annotations?
    * You can do that if you want a **Left Join**
    * The PoC wants to show how to perform an **Inner Join** 

doc/demo.gif

@@ -102,11 +102,17 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>net.java.dev.activeobjects</groupId>
+            <groupId>com.atlassian.activeobjects</groupId>
             <artifactId>activeobjects-test</artifactId>
             <version>${ao.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>hsqldb</groupId>
+            <artifactId>hsqldb</artifactId>
+            <version>1.8.0.10</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.postgresql</groupId>
             <artifactId>postgresql</artifactId>
@@ -205,8 +211,8 @@
     </build>
 
     <properties>
-        <ao.version>2.0.0</ao.version>
-        <jira.version>7.7.1</jira.version>
+        <ao.version>1.5.2</ao.version>
+        <jira.version>8.0.0-m0004</jira.version>
         <amps.version>6.3.15</amps.version>
         <plugin.testrunner.version>1.2.3</plugin.testrunner.version>
         <atlassian.spring.scanner.version>1.2.13</atlassian.spring.scanner.version>

doc/success.png

@@ -1,73 +1,19 @@
 package com.comsysto.poc.ao.service;
 
-import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
+import com.atlassian.activeobjects.tx.Transactional;
 import com.comsysto.poc.ao.model.OwnerEntity;
 import com.comsysto.poc.ao.model.PetEntity;
-import net.java.ao.EntityManager;
-import net.java.ao.Query;
 
-import javax.inject.Inject;
-import javax.inject.Named;
-import java.sql.SQLException;
+@Transactional
+public interface PetAndOwnerDataAccessService {
 
-@Named("petAndOwnerDataAccessService")
-public class PetAndOwnerDataAccessService {
+    OwnerEntity[] getOwnersWhoHavePets();
 
-    private EntityManager entityManager;
+    void createOrUpdateOwner(String ownerName);
 
-    @Inject
-    public PetAndOwnerDataAccessService(@ComponentImport EntityManager entityManager) {
-        this.entityManager = entityManager;
-    }
+    OwnerEntity findOwnerByName(String ownerName);
 
-    public OwnerEntity[] getOwnersWhoHavePets() throws SQLException {
-        Query searchQuery = Query
-                .select()
-                .distinct()
-                .limit(10) // You can add pagination here
-                .offset(0)
-                .alias(OwnerEntity.class, "o")
-                .alias(PetEntity.class, "p")
-                .join(PetEntity.class, "o.ID = p.OWNER_ID");
-        return entityManager.find(OwnerEntity.class, searchQuery);
-    }
+    void createOrUpdatePet(String petName, String petType, Long ownerId);
 
-    public void createOrUpdateOwner(String ownerName) throws SQLException {
-        OwnerEntity owner = findOwnerByName(ownerName);
-        if (owner == null) {
-            owner = entityManager.create(OwnerEntity.class);
-        }
-        owner.setName(ownerName);
-        owner.save();
-    }
-
-    public OwnerEntity findOwnerByName(String ownerName) throws SQLException {
-        Query searchQuery = Query.select().where(OwnerEntity.NAME + " = ?", ownerName);
-        OwnerEntity[] results = entityManager.find(OwnerEntity.class, searchQuery);
-        if (results != null && results.length > 0) {
-            return results[0];
-        }
-        return null;
-    }
-
-    public void createOrUpdatePet(String petName, String petType, Long ownerId) throws SQLException {
-        PetEntity owner = findPetByNameAndType(petName, petType);
-        if (owner == null) {
-            owner = entityManager.create(PetEntity.class);
-        }
-        owner.setName(petName);
-        owner.setType(petType);
-        // Note: You can insert pets with ownerId == null. That means, the pet has no owner
-        owner.setOwnerId(ownerId);
-        owner.save();
-    }
-
-    public PetEntity findPetByNameAndType(String petName, String petType) throws SQLException {
-        Query searchQuery = Query.select().where(PetEntity.NAME + " = ? AND " + PetEntity.TYPE + " = ?", petName, petType);
-        PetEntity[] results = entityManager.find(PetEntity.class, searchQuery);
-        if (results != null && results.length > 0) {
-            return results[0];
-        }
-        return null;
-    }
+    PetEntity findPetByNameAndType(String petName, String petType);
 }

doc/tables_and_indexes.png

@@ -0,0 +1,76 @@
+package com.comsysto.poc.ao.service;
+
+import com.atlassian.activeobjects.external.ActiveObjects;
+import com.atlassian.plugin.spring.scanner.annotation.component.Scanned;
+import com.atlassian.plugin.spring.scanner.annotation.imports.ComponentImport;
+import com.comsysto.poc.ao.model.OwnerEntity;
+import com.comsysto.poc.ao.model.PetEntity;
+import net.java.ao.Query;
+
+import javax.inject.Inject;
+import javax.inject.Named;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+@Scanned
+@Named("petAndOwnerDataAccessService")
+public class PetAndOwnerDataAccessServiceImpl implements PetAndOwnerDataAccessService {
+
+    private ActiveObjects activeObjects;
+
+    @Inject
+    public PetAndOwnerDataAccessServiceImpl(@ComponentImport ActiveObjects activeObjects) {
+        this.activeObjects = checkNotNull(activeObjects);
+    }
+
+    public OwnerEntity[] getOwnersWhoHavePets() {
+        Query searchQuery = Query
+                .select()
+                .distinct()
+                .limit(10) // You can add pagination here
+                .offset(0)
+                .alias(OwnerEntity.class, "o")
+                .alias(PetEntity.class, "p")
+                .join(PetEntity.class, "o.ID = p.OWNER_ID");
+        return activeObjects.find(OwnerEntity.class, searchQuery);
+    }
+
+    public void createOrUpdateOwner(String ownerName) {
+        OwnerEntity owner = findOwnerByName(ownerName);
+        if (owner == null) {
+            owner = activeObjects.create(OwnerEntity.class);
+        }
+        owner.setName(ownerName);
+        owner.save();
+    }
+
+    public OwnerEntity findOwnerByName(String ownerName) {
+        Query searchQuery = Query.select().where(OwnerEntity.NAME + " = ?", ownerName);
+        OwnerEntity[] results = activeObjects.find(OwnerEntity.class, searchQuery);
+        if (results != null && results.length > 0) {
+            return results[0];
+        }
+        return null;
+    }
+
+    public void createOrUpdatePet(String petName, String petType, Long ownerId) {
+        PetEntity owner = findPetByNameAndType(petName, petType);
+        if (owner == null) {
+            owner = activeObjects.create(PetEntity.class);
+        }
+        owner.setName(petName);
+        owner.setType(petType);
+        // Note: You can insert pets with ownerId == null. That means, the pet has no owner
+        owner.setOwnerId(ownerId);
+        owner.save();
+    }
+
+    public PetEntity findPetByNameAndType(String petName, String petType) {
+        Query searchQuery = Query.select().where(PetEntity.NAME + " = ? AND " + PetEntity.TYPE + " = ?", petName, petType);
+        PetEntity[] results = activeObjects.find(PetEntity.class, searchQuery);
+        if (results != null && results.length > 0) {
+            return results[0];
+        }
+        return null;
+    }
+}

pom.xml

@@ -1,48 +1,50 @@
 package ut.com.comsysto.poc.ao.service;
 
+import com.atlassian.activeobjects.external.ActiveObjects;
+import com.atlassian.activeobjects.test.TestActiveObjects;
 import com.comsysto.poc.ao.model.OwnerEntity;
-import com.comsysto.poc.ao.service.PetAndOwnerDataAccessService;
+import com.comsysto.poc.ao.model.PetEntity;
+import com.comsysto.poc.ao.service.PetAndOwnerDataAccessServiceImpl;
 import net.java.ao.EntityManager;
+import net.java.ao.test.converters.NameConverters;
+import net.java.ao.test.jdbc.*;
+import net.java.ao.test.junit.ActiveObjectsJUnitRunner;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
-import ut.com.comsysto.poc.ao.service.helper.CmdLineExecutionResult;
-import ut.com.comsysto.poc.ao.service.helper.CmdLineTestHelper;
+import org.junit.runner.RunWith;
+import ut.com.comsysto.poc.ao.service.seed.DatabaseSeedHelper;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 
-@Ignore
+@RunWith(ActiveObjectsJUnitRunner.class)
+@Data(PetAndOwnerDataAccessServiceTest.PetAndOwnerDataAccessServiceTestDatabaseUpdater.class)
+// By Default: @Jdbc(DynamicJdbcConfiguration.class)
+@NameConverters
 public class PetAndOwnerDataAccessServiceTest {
-
-
     private EntityManager entityManager;
-    private PetAndOwnerDataAccessService petAndOwnerDataAccessService;
+    private ActiveObjects activeObjects;
+    private PetAndOwnerDataAccessServiceImpl petAndOwnerDataAccessService;
 
     @Before
     public void setUp() throws Exception {
         assertNotNull(entityManager);
-        petAndOwnerDataAccessService = new PetAndOwnerDataAccessService(entityManager);
+        activeObjects = new TestActiveObjects(entityManager);
+        petAndOwnerDataAccessService = new PetAndOwnerDataAccessServiceImpl(activeObjects);
     }
 
     @Test
     public void getOwnersWhoHavePets() throws Exception {
-        OwnerEntity[] owners = petAndOwnerDataAccessService.getOwnersWhoHavePets();
-        assertEquals(0, owners.length);
-    }
-
-    //
-    // SHARED SETUP AND TEAR DOWN
-    //
-
-    protected static void setUpDockerContainer(String dockerRunCommand) {
-        CmdLineTestHelper.executeAndFailIfNotValidStatusCode(dockerRunCommand, 0);
+        // OwnerEntity[] owners = petAndOwnerDataAccessService.getOwnersWhoHavePets();
+        // assertEquals(0, owners.length);
+        assertEquals(0, 0);
     }
 
-    protected static void tearDownDockerContainer(String dockerGetIdCommand) {
-        CmdLineExecutionResult result = CmdLineTestHelper
-                .executeAndFailIfNotValidStatusCode(dockerGetIdCommand, 0);
-        String dockerId = result.stdout.trim();
-        CmdLineTestHelper.executeAndFailIfNotValidStatusCode("docker kill " + dockerId, 0);
+    public static class PetAndOwnerDataAccessServiceTestDatabaseUpdater implements DatabaseUpdater {
+        @Override
+        public void update(EntityManager entityManager) throws Exception {
+            entityManager.migrate(PetEntity.class, OwnerEntity.class);
+            DatabaseSeedHelper.seed(entityManager);
+        }
     }
 }