O3-3776: Fix Content Package Template Creation (#287)

openmrs · Aug 26, 2024 · 517a440 · 517a440
1 parent 58f4b90
commit 517a440
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 13 deletions.
diff --git a/archetype-module-refapp/src/main/resources/archetype-resources/pom.xml b/archetype-module-refapp/src/main/resources/archetype-resources/pom.xml
@@ -67,6 +67,5 @@
 
 	<properties>
 		<openmrsPlatformVersion>1.11.6</openmrsPlatformVersion>
-		<openmrsContentPackageVersion>1.0.0-SNAPSHOT</openmrsContentPackageVersion>
 	</properties>
 </project>
diff --git a/integration-tests/src/test/java/org/openmrs/maven/plugins/CreateProjectIntegrationTest.java b/integration-tests/src/test/java/org/openmrs/maven/plugins/CreateProjectIntegrationTest.java
@@ -74,6 +74,40 @@ public void createProject_shouldCreatePlatformModuleProject() throws Exception{
         assertProjectCreated();
     }
 
+    @Test
+    public void createProject_shouldCreateContentPackageModuleProject() throws Exception{
+        addTaskParam("type", "content-package");
+
+        addTaskParam("moduleId", "test");
+        addTaskParam("moduleName", "Test");
+        addTaskParam("moduleDescription", "none");
+        addTaskParam("groupId", "org.openmrs.content");
+        addTaskParam("version", "1.0.0-SNAPSHOT");
+
+        addAnswer("1.0.0");
+
+        addTaskParam(BATCH_ANSWERS, getAnswers()); //only to set interactive mode to false
+
+        executeTask("create-project");
+        assertSuccess();
+        assertContentPackageCreated();
+    }
+
+    @Test
+    public void createProject_shouldCreateContentPackageProjectUsingBatchAnswers() throws Exception{
+        addAnswer("Content Package");
+        addAnswer("test");
+        addAnswer("Test");
+        addAnswer("none");
+        addAnswer("org.openmrs.content");
+        addAnswer("1.0.0-SNAPSHOT");
+        addAnswer("1.0.0");
+
+        executeTask("create-project");
+        assertSuccess();
+        assertContentPackageCreated();
+    }
+
     private void assertProjectCreated() {
         //check only basic structure of module project and pom existence, not coupled with archetype itself
         assertFilePresent("test");
@@ -82,4 +116,14 @@ private void assertProjectCreated() {
         assertFilePresent("test", "omod");
         assertFilePresent("test", "pom.xml");
     }
+
+    private void assertContentPackageCreated() {
+        assertFilePresent("test");
+        assertFilePresent("test", ".github");
+        assertFilePresent("test", "configuration");
+        assertFilePresent("test", "README.md");
+        assertFilePresent("test", "assembly.xml");
+        assertFilePresent("test", "content.properties");
+        assertFilePresent("test", "pom.xml");
+    }
 }
diff --git a/maven-plugin/src/main/java/org/openmrs/maven/plugins/CreateProject.java b/maven-plugin/src/main/java/org/openmrs/maven/plugins/CreateProject.java
@@ -1,17 +1,5 @@
 package org.openmrs.maven.plugins;
 
-import static org.openmrs.maven.plugins.utility.PropertiesUtils.loadPropertiesFromResource;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.artifactId;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.configuration;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.element;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.executeMojo;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.executionEnvironment;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.goal;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.groupId;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.name;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.plugin;
-import static org.twdata.maven.mojoexecutor.MojoExecutor.version;
-
 import org.apache.commons.lang.StringUtils;
 import org.apache.maven.plugin.MojoExecutionException;
 import org.apache.maven.plugin.MojoFailureException;
@@ -25,6 +13,18 @@
 import java.util.Arrays;
 import java.util.Properties;
 
+import static org.openmrs.maven.plugins.utility.PropertiesUtils.loadPropertiesFromResource;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.artifactId;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.configuration;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.element;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.executeMojo;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.executionEnvironment;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.goal;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.groupId;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.name;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.plugin;
+import static org.twdata.maven.mojoexecutor.MojoExecutor.version;
+
 /**
  * Creates a new OpenMRS project from an archetype
  */
@@ -281,6 +281,7 @@ private void createModule() throws MojoExecutionException {
 			    "2.4");
 			archetypeArtifactId = SDKConstants.REFAPP_ARCH_ARTIFACT_ID;
 		} else if (TYPE_CONTENT_PACKAGE.equals(type)) {
+			contentpackage = wizard.promptForValueIfMissingWithDefault("What version of the content package (-D%s) do you want to support?", contentpackage, "contentpackage", "1.0.0");
 			archetypeArtifactId = SDKConstants.CONTENT_PACKAGE_ARCH_ARTIFACT_ID;
 		} else {
 			throw new MojoExecutionException("Invalid project type");