Merge pull request #800 from CJSCommonPlatform/add-file-service-test-…

…datasource Add get file-service datasource to TestJdbcDataSourceProvider
CJSCommonPlatform · Apr 9, 2020 · 2c9fbc5 · 2c9fbc5
2 parents 3e85660 + a47f2f4
commit 2c9fbc5
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,7 +15,9 @@ before_script:
   - psql -c 'create database frameworkviewstore;' -U postgres
   - psql -c 'create database frameworkfilestore;' -U postgres
   - psql -c 'create database frameworksystem;' -U postgres
+  - psql -c 'create database fileservice;' -U postgres
   - psql -c "CREATE USER framework WITH PASSWORD 'framework';" -U postgres
+  - psql -c "CREATE USER fileservice WITH PASSWORD 'fileservice';" -U postgres
 addons:
   postgresql: "9.5"
   sonarcloud:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,8 @@ on [Keep a CHANGELOG](http://keepachangelog.com/). This project adheres to
 [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Added
+- Added get file-service datasource to TestJdbcDataSourceProvider
 
 ## [6.5.0-M5] - 2019-12-17
 - Update framework-api to 4.2.1

diff --git a/.../main/java/uk/gov/justice/services/test/utils/persistence/TestJdbcDataSourceProvider.java b/.../main/java/uk/gov/justice/services/test/utils/persistence/TestJdbcDataSourceProvider.java
@@ -34,6 +34,10 @@ public DataSource getSystemDataSource(final String contextName) {
 
     }
 
+    public DataSource getFileServiceDataSource() {
+        return getDataSource("fileservice", "fileservice");
+    }
+
     private DataSource getDataSource(final String contextName, final String databaseName) {
 
         final PGSimpleDataSource dataSource = new PGSimpleDataSource();

diff --git a/...est/java/uk/gov/justice/services/test/utils/persistence/TestJdbcDataSourceProviderIT.java b/...est/java/uk/gov/justice/services/test/utils/persistence/TestJdbcDataSourceProviderIT.java
@@ -37,6 +37,7 @@ public void shouldGetADataSourceToTheEventStore() throws Exception {
             assertThat(connection.isClosed(), is(false));
         }
     }
+
     @Test
     public void shouldGetADataSourceToSystem() throws Exception {
 
@@ -46,4 +47,14 @@ public void shouldGetADataSourceToSystem() throws Exception {
             assertThat(connection.isClosed(), is(false));
         }
     }
+
+    @Test
+    public void shouldGetDataSourceToFileService() throws Exception {
+
+        final DataSource dataSource = testJdbcDataSourceProvider.getFileServiceDataSource();
+
+        try(final Connection connection = dataSource.getConnection()) {
+            assertThat(connection.isClosed(), is(false));
+        }
+    }
 }