Updated test mysql image to version 5.7.31, renamed WatcherContext to…

… AppContext
openmrs · Nov 5, 2021 · 325d389 · 325d389
1 parent 6eaec94
commit 325d389
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.../java/org/openmrs/eip/WatcherContext.java → ...main/java/org/openmrs/eip/AppContext.java b/.../java/org/openmrs/eip/WatcherContext.java → ...main/java/org/openmrs/eip/AppContext.java
@@ -6,7 +6,7 @@
 import org.springframework.stereotype.Component;
 
 @Component
-public class WatcherContext implements ApplicationContextAware {
+public class AppContext implements ApplicationContextAware {
 
 	private static ApplicationContext appContext;
 

diff --git a/commons/src/main/java/org/openmrs/eip/Utils.java b/commons/src/main/java/org/openmrs/eip/Utils.java
@@ -15,7 +15,7 @@ public class Utils {
 	 * @return
 	 */
 	public static List<String> getWatchedTables() {
-		String watchedTables = WatcherContext.getBean(Environment.class).getProperty(Constants.PROP_WATCHED_TABLES);
+		String watchedTables = AppContext.getBean(Environment.class).getProperty(Constants.PROP_WATCHED_TABLES);
 		return Arrays.asList(watchedTables.split(","));
 	}
 

diff --git a/commons/src/main/java/org/openmrs/eip/app/config/AppConfig.java b/commons/src/main/java/org/openmrs/eip/app/config/AppConfig.java
@@ -14,7 +14,7 @@
 
 @Configuration
 @EnableCaching
-@org.springframework.context.annotation.PropertySource("application-common.properties")
+@org.springframework.context.annotation.PropertySource("classpath:application-common.properties")
 public class AppConfig {
 
 	/**

diff --git a/commons/src/test/java/org/openmrs/eip/BaseDbBackedCamelTest.java b/commons/src/test/java/org/openmrs/eip/BaseDbBackedCamelTest.java
@@ -31,7 +31,7 @@
 @Transactional
 public abstract class BaseDbBackedCamelTest extends BaseCamelTest {
 
-	protected static MySQLContainer mysqlContainer = new MySQLContainer<>(parse("mysql:5.6"));
+	protected static MySQLContainer mysqlContainer = new MySQLContainer<>(parse("mysql:5.7.31"));
 
 	protected static Integer MYSQL_PORT;
 

diff --git a/commons/src/test/java/org/openmrs/eip/UtilsTest.java b/commons/src/test/java/org/openmrs/eip/UtilsTest.java
@@ -16,7 +16,7 @@
 import org.springframework.core.env.Environment;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest(WatcherContext.class)
+@PrepareForTest(AppContext.class)
 public class UtilsTest {
 
 	@Test
@@ -99,9 +99,9 @@ public void getTablesInHierarchy_shouldReturnCommaSeparatedListOfSubclassAndSupe
 
 	@Test
 	public void getWatchedTables_shouldReturnTheWatchedTableNames() {
-		PowerMockito.mockStatic(WatcherContext.class);
+		PowerMockito.mockStatic(AppContext.class);
 		Environment mockEnv = Mockito.mock(Environment.class);
-		Mockito.when(WatcherContext.getBean(Environment.class)).thenReturn(mockEnv);
+		Mockito.when(AppContext.getBean(Environment.class)).thenReturn(mockEnv);
 		Mockito.when(mockEnv.getProperty(Constants.PROP_WATCHED_TABLES)).thenReturn("person,patient,visit");
 		List<String> watchedTables = Utils.getWatchedTables();
 		assertEquals(3, watchedTables.size());