make 2.6 the minimum version for the LoaderTest

mekomsolutions · Nov 15, 2023 · 652b62e · 652b62e
1 parent 4f391a0
commit 652b62e
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 4 deletions.
diff --git a/api-2.6/pom.xml b/api-2.6/pom.xml
@@ -124,6 +124,13 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.openmrs.module</groupId>
+            <artifactId>queue-api</artifactId>
+            <version>${queueVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
 
 </project>
diff --git a/...c/test/java/org/openmrs/module/initializer/DomainBaseModuleContextSensitive_2_6_Test.java b/...c/test/java/org/openmrs/module/initializer/DomainBaseModuleContextSensitive_2_6_Test.java
@@ -9,8 +9,22 @@
  */
 package org.openmrs.module.initializer;
 
+import org.openmrs.module.Module;
+import org.openmrs.module.ModuleFactory;
+
+import java.io.File;
+
 public abstract class DomainBaseModuleContextSensitive_2_6_Test extends DomainBaseModuleContextSensitiveTest {
 
+	public DomainBaseModuleContextSensitive_2_6_Test() {
+		super();
+		{
+			Module mod = new Module("", "queue", "", "", "", "1.0.0");
+			mod.setFile(new File(""));
+			ModuleFactory.getStartedModulesMap().put(mod.getModuleId(), mod);
+		}
+	}
+
 	@Override
 	public void updateSearchIndex() {
 		// to prevent Data Filter's 'Illegal Record Access'

diff --git a/...ializer/api/loaders/LoadersOrderTest.java → ...ule/initializer/api/LoadersOrderTest.java b/...ializer/api/loaders/LoadersOrderTest.java → ...ule/initializer/api/LoadersOrderTest.java
@@ -7,7 +7,7 @@
  * Copyright (C) OpenMRS Inc. OpenMRS is a registered trademark and the OpenMRS
  * graphic logo is a trademark of OpenMRS Inc.
  */
-package org.openmrs.module.initializer.api.loaders;
+package org.openmrs.module.initializer.api;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.everyItem;
@@ -23,14 +23,16 @@
 import org.hamcrest.TypeSafeDiagnosingMatcher;
 import org.junit.Test;
 import org.openmrs.module.initializer.Domain;
-import org.openmrs.module.initializer.DomainBaseModuleContextSensitive_2_3_Test;
+import org.openmrs.module.initializer.DomainBaseModuleContextSensitive_2_6_Test;
+import org.openmrs.module.initializer.api.loaders.Loader;
 
-public class LoadersOrderTest extends DomainBaseModuleContextSensitive_2_3_Test {
+public class LoadersOrderTest extends DomainBaseModuleContextSensitive_2_6_Test {
 
 	@Test
 	public void getLoaders_shouldBeUnequivocallyOrdered() {
 		Loader previousLoader = null;
 
+
 		List<Loader> loaders = applicationContext.getBeansOfType(Loader.class).values().stream().sorted()
 		        .collect(Collectors.toList());
 
@@ -45,6 +47,7 @@ public void getLoaders_shouldBeUnequivocallyOrdered() {
 
 		List<Loader> runtimeLoaders = getService().getLoaders();
 		assertThat(runtimeLoaders, everyItem(hasExpectedDomain()));
+
 		assertThat(runtimeLoaders, coversAllDomains());
 	}
 

diff --git a/omod/pom.xml b/omod/pom.xml
@@ -42,6 +42,12 @@
             <artifactId>${project.parent.artifactId}-api-2.5</artifactId>
             <version>${project.parent.version}</version>
         </dependency>
+
+        <dependency>
+            <groupId>${project.parent.groupId}</groupId>
+            <artifactId>${project.parent.artifactId}-api-2.6</artifactId>
+            <version>${project.parent.version}</version>
+        </dependency>
 
         <dependency>
             <groupId>${project.parent.groupId}</groupId>

diff --git a/validator/pom.xml b/validator/pom.xml
@@ -16,7 +16,7 @@
   <properties>
     <springVersion>4.1.4.RELEASE</springVersion>
     <!-- OpenMRS Core and modules -->
-    <openmrsPlatformVersion>2.3.6</openmrsPlatformVersion>
+    <openmrsPlatformVersion>2.6.3-SNAPSHOT</openmrsPlatformVersion>
     <reportingCompatibilityVersion>2.0.6</reportingCompatibilityVersion>
     <htmlwidgetsVersion>1.7.2</htmlwidgetsVersion>
     <mysqlTestContainerVersion>1.15.3</mysqlTestContainerVersion>
@@ -140,6 +140,13 @@
       <type>jar</type>
     </dependency>
 
+    <dependency>
+      <groupId>${project.parent.groupId}</groupId>
+      <artifactId>${project.parent.artifactId}-api-2.6</artifactId>
+      <version>${project.parent.version}</version>
+      <type>jar</type>
+    </dependency>
+
     <dependency>
       <groupId>org.openmrs.api</groupId>
       <artifactId>openmrs-api</artifactId>