#1509 Ignore extractTemplatesWithOldCinfiguration (#1536)

* #1509 Ignore extractTemplatesWithOldCinfiguration Fixed CLI adaptTemplatesTest Fixed Eclipse testAdaptTemplates Deleted generation from Eclipse Test * removed exception that was used to differenciate between test and production and added an argument instead. * #1509 Enabled extractTemplatesWithOldConfiguration * #1509 Implemented requested changes * #1509 Implemented requested changes Co-authored-by: LarsReinken <[email protected]>
devonfw · Jun 7, 2022 · 882013e · 882013e
1 parent 6c61401
commit 882013e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 22 deletions.
diff --git a/...ystemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/AdaptTemplatesCommandTest.java b/...ystemtest/src/test/java/com/devonfw/cobigen/cli/systemtest/AdaptTemplatesCommandTest.java
@@ -9,7 +9,6 @@
 import java.nio.file.Path;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.devonfw.cobigen.api.constants.ConfigurationConstants;
@@ -48,12 +47,12 @@ public void initAdaptTemplatesTest() throws URISyntaxException, IOException {
    *
    * @throws Exception test fails
    */
-  @Ignore
   @Test
   public void adaptTemplatesTest() throws Exception {
 
-    String args[] = new String[1];
+    String args[] = new String[2];
     args[0] = "adapt-templates";
+    args[1] = "--all";
 
     execute(args, false);
 

diff --git a/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/AdaptTemplatesCommand.java b/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/commands/AdaptTemplatesCommand.java
@@ -16,6 +16,7 @@
 import com.devonfw.cobigen.impl.adapter.TemplateAdapterImpl;
 
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Option;
 
 /**
  * This class handles the user defined template directory e.g. determining and obtaining the latest templates jar,
@@ -30,6 +31,12 @@ public class AdaptTemplatesCommand extends CommandCommons {
    */
   private static Logger LOG = LoggerFactory.getLogger(CobiGenCLI.class);
 
+  /**
+   * If this options is enabled, all templates are extracted.
+   */
+  @Option(names = { "--all" }, description = MessagesConstants.ADAPT_ALL_DESCRIPTION)
+  boolean adaptAll;
+
   @Override
   public Integer doAction() throws Exception {
 
@@ -74,8 +81,13 @@ private List<Path> getJarsToAdapt(TemplateAdapter templateAdapter, List<Path> te
       printJarsForSelection(templateAdapter, templateJars);
 
       List<String> userSelection = new ArrayList<>();
-      for (String templateSelection : ValidationUtils.getUserInput().split(",")) {
-        userSelection.add(templateSelection);
+
+      if (this.adaptAll) {
+        userSelection.add("0");
+      } else {
+        for (String templateSelection : ValidationUtils.getUserInput().split(",")) {
+          userSelection.add(templateSelection);
+        }
       }
 
       if (userSelection.contains("0")) {

diff --git a/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/constants/MessagesConstants.java b/cobigen-cli/cli/src/main/java/com/devonfw/cobigen/cli/constants/MessagesConstants.java
@@ -72,6 +72,11 @@ public class MessagesConstants {
    */
   public static final String ADAPT_TEMPLATES_DESCRIPTION = "Generates a new templates folder next to the cobigen cli";
 
+  /**
+   * Message constant: description of the adapt-templates --all command
+   */
+  public static final String ADAPT_ALL_DESCRIPTION = "If this option is enabled, all templates will get adapted.";
+
   /**
    * Message constant: description of the custom-location option
    */

diff --git a/...bigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/AdaptTemplatesTest.java b/...bigen-eclipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/AdaptTemplatesTest.java
@@ -6,7 +6,6 @@
 import java.io.File;
 
 import org.apache.commons.io.FileUtils;
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.ResourcesPlugin;
@@ -16,11 +15,11 @@
 import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TemporaryFolder;
 
+import com.devonfw.cobigen.api.constants.ConfigurationConstants;
 import com.devonfw.cobigen.eclipse.common.constants.external.ResourceConstants;
 import com.devonfw.cobigen.eclipse.test.common.SystemTest;
 import com.devonfw.cobigen.eclipse.test.common.swtbot.AllJobsAreFinished;
@@ -52,6 +51,7 @@ public class AdaptTemplatesTest extends SystemTest {
   public static void setupClass() throws Exception {
 
     EclipseUtils.cleanWorkspace(bot, true);
+
   }
 
   /**
@@ -80,31 +80,24 @@ public void testBasicOpenAPIGenerationWithAdaptTemplates() throws Exception {
     SWTBotTreeItem javaClassItem = view.bot().tree().expandNode(testProjName, "adapt-templates.yml");
     javaClassItem.select();
 
-    // execute CobiGen
-    EclipseCobiGenUtils.processCobiGen(bot, javaClassItem, 25000, "CRUD devon4j Server>CRUD REST services");
-    bot.waitUntil(new AllJobsAreFinished(), 10000);
-    // increase timeout as the openAPI parser is slow on initialization
-    EclipseCobiGenUtils.confirmSuccessfullGeneration(bot, 40000);
-
     bot.waitUntil(new AllJobsAreFinished(), 10000);
-    IProject proj = ResourcesPlugin.getWorkspace().getRoot().getProject(testProjName);
-    IFile generationResult = proj.getFile(
-        "src/main/java/com/devonfw/test/sampledatamanagement/service/impl/rest/SampledatamanagementRestServiceImpl.java");
+    String Cobigen_templates = ConfigurationConstants.COBIGEN_TEMPLATES;
+    IProject adaptedTemplatesProj = ResourcesPlugin.getWorkspace().getRoot().getProject(Cobigen_templates);
 
-    assertThat(generationResult.exists()).isTrue();
+    assertThat(adaptedTemplatesProj.exists()).isTrue();
   }
 
   /**
    * Test of testBasicOpenAPIGenerationWithAdaptTemplates with custom COBIGEN_HOME environment variable
    *
    * @throws Exception test fails
    */
-  @Ignore
   @Test
-  public void testAdaptTemplatesAndGenerate() throws Exception {
+  public void testAdaptTemplates() throws Exception {
+
+    File tmpProject = this.tempFolder.newFolder("playground", "project", "templates");
 
-    File tmpProject = this.tempFolder.newFolder("playground", "project");
-    withEnvironmentVariable("COBIGEN_HOME", tmpProject.toPath().toString())
+    withEnvironmentVariable(ConfigurationConstants.CONFIG_ENV_HOME, tmpProject.getParentFile().getAbsolutePath())
         .execute(() -> testBasicOpenAPIGenerationWithAdaptTemplates());
   }
 }
diff --git a/...test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/EclipseCobiGenUtils.java b/...test/src/main/java/com/devonfw/cobigen/eclipse/test/common/utils/EclipseCobiGenUtils.java
@@ -176,8 +176,12 @@ public static void runAndCaptureAdaptTemplates(SWTWorkbenchBot bot) throws Excep
 
     takeScreenshot(bot, "Adapt Templates Warning!");
     SWTBotShell warningDialog = bot.shell("Warning!");
-
     warningDialog.bot().button("Ok").click();
+
+    takeScreenshot(bot, "Create new POM!");
+    SWTBotShell finishDialog = bot.shell("Create new POM");
+    finishDialog.bot().button("Finish").click();
+
     SWTBotShell informationDialog = bot.shell("Information");
     bot.waitUntil(new AnyShellIsActive("Information"), DEFAULT_TIMEOUT);
     takeScreenshot(bot, "Adapt Templates Information");