devonfw#1518

mdukhan · Jul 6, 2022 · 3f1f30f · 3f1f30f
1 parent 2297c3b
commit 3f1f30f
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 27 deletions.
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
@@ -51,7 +51,7 @@ public Integer doAction() throws Exception {
       templateAdapter.adaptTemplates();
     } catch (UpgradeTemplatesNotificationException e) {
       if (askUserToContinueWithUpgrade(e)) {
-        templateAdapter.upgradeMonolithicTemplates();
+        TemplateAdapter.upgradeMonolithicTemplates();
       }
     } catch (TemplateSelectionForAdaptionException e) {
       List<Path> templateJars = e.getTemplateSets();

diff --git a/...clipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/GenerateFromTextInputTest.java b/...clipse-test/src/main/java/com/devonfw/cobigen/eclipse/test/GenerateFromTextInputTest.java
@@ -15,7 +15,6 @@
 import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
 import org.eclipse.swtbot.swt.finder.widgets.SWTBotTreeItem;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -55,7 +54,6 @@ public static void setupClass() throws Exception {
    *
    * @throws Exception Test fails
    */
-  @Ignore
   @Test
   public void testGenerateFromTextDoesNotLoop() throws Exception {
 

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
@@ -150,6 +150,7 @@ public static void processCobiGenWithTextInput(SWTWorkbenchBot bot, SWTBotEclips
     ResourcesPlugin.getWorkspace().build(IncrementalProjectBuilder.FULL_BUILD, new NullProgressMonitor());
     bot.waitUntil(new AllJobsAreFinished(), defaultTimeout); // build might take some time
     input.contextMenu("CobiGen").menu("Generate...").click();
+    postponeUpgradeAndContinue(bot);
     generateWithSelectedIncrements(bot, defaultTimeout, increments);
   }
 
@@ -201,27 +202,7 @@ private static void processCobiGenAndPostponeUpgrade(SWTWorkbenchBot bot, SWTBot
     bot.waitUntil(new AllJobsAreFinished(), defaultTimeout); // build might take some time
     input.contextMenu("CobiGen").menu("Generate...").click();
     postponeUpgradeAndContinue(bot);
-    bot.waitUntil(new AnyShellIsActive(CobiGenDialogConstants.GenerateWizard.DIALOG_TITLE,
-        CobiGenDialogConstants.GenerateWizard.DIALOG_TITLE_BATCH), defaultTimeout);
-
-    // select increment and generate
-    for (String increment : increments) {
-      // check for multi layer nodes
-      if (increment.contains(">")) {
-        SWTBotTreeItem treeItem = expandNodes(bot, increment);
-        bot.waitUntil(widgetIsEnabled(treeItem));
-        treeItem.check();
-      } else {
-        // select single increment
-        SWTBotTreeItem treeItem = bot.tree().getTreeItem(increment);
-        bot.waitUntil(widgetIsEnabled(treeItem));
-        treeItem.check();
-      }
-    }
-    SWTBotButton finishButton = bot.button(IDialogConstants.FINISH_LABEL);
-    bot.waitUntil(widgetIsEnabled(bot.button()));
-    finishButton.click();
-
+    generateWithSelectedIncrements(bot, defaultTimeout, increments);
   }
 
   /**

diff --git a/...est/src/main/resources/GenerateFromTextInputTest/templates/src/main/templates/context.xml b/...est/src/main/resources/GenerateFromTextInputTest/templates/src/main/templates/context.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <contextConfiguration xmlns="http://capgemini.com/devonfw/cobigen/ContextConfiguration" version="2.2">
-    <trigger id="test" type="java">
+    <trigger id="test" type="java" templateFolder="template1">
         <matcher type="fqn" value=".*">
         </matcher>
     </trigger>

diff --git a/...igen-core/src/test/java/com/devonfw/cobigen/unittest/versioning/VersionValidatorTest.java b/...igen-core/src/test/java/com/devonfw/cobigen/unittest/versioning/VersionValidatorTest.java
@@ -2,7 +2,6 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-import org.junit.Ignore;
 import org.junit.Test;
 
 import com.devonfw.cobigen.api.exception.InvalidConfigurationException;
@@ -40,7 +39,6 @@ public void testInvalidCobiGenVersion_tooOld_contextConfiguration() {
    *
    * @author mbrunnli (May 17, 2016)
    */
-  @Ignore // Should be reactivated after issue #1531
   @Test(expected = InvalidConfigurationException.class)
   public void testInvalidCobiGenVersion_tooNew_contextConfiguration() {