#114 getText shall not return \n on Requirement Text

Change-Id: I5a6a3ae8fcdc0cd03f2e1c0686d35664e69d1429 Signed-off-by: Philippe DUL <philippe.dul@thalesgroup.com>
eclipse-capella · Jan 19, 2021 · df1f1f5 · df1f1f5
1 parent 9c8d04c
commit df1f1f5
Show file tree

Hide file tree

Showing 3 changed files with 69 additions and 1 deletion.
diff --git a/...ts.model.helpers/src/org/polarsys/kitalpha/vp/requirements/model/helpers/LabelHelper.java b/...ts.model.helpers/src/org/polarsys/kitalpha/vp/requirements/model/helpers/LabelHelper.java
@@ -20,7 +20,7 @@ private LabelHelper() {
     // Private constructor
   }
   public static String transformHTMLToText(String content) {
-    content = content.replaceAll("<[^>]*>", "").replaceAll("\r\n", " ").trim();
+    content = content.replaceAll("<[^>]*>", "").replaceAll("\r\n", " ").replaceAll("\n", " ").trim();
     // Decode special characters
     content = URI.decode(content);
     // Unescape HTML special character entities

diff --git a/...irements.ju/src/org/polarsys/capella/vp/requirements/ju/testcases/HtmlToTextTestCase.java b/...irements.ju/src/org/polarsys/capella/vp/requirements/ju/testcases/HtmlToTextTestCase.java
@@ -0,0 +1,66 @@
+/*******************************************************************************
+ * Copyright (c) 2021 THALES GLOBAL SERVICES.
+ * 
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * http://www.eclipse.org/legal/epl-2.0
+ * 
+ * SPDX-License-Identifier: EPL-2.0
+ *  
+ * Contributors:
+ *    Thales - initial API and implementation
+ *******************************************************************************/
+package org.polarsys.capella.vp.requirements.ju.testcases;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.polarsys.capella.common.ef.command.AbstractReadWriteCommand;
+import org.polarsys.capella.common.helpers.EObjectLabelProviderHelper;
+import org.polarsys.capella.common.helpers.TransactionHelper;
+import org.polarsys.capella.test.framework.api.BasicTestCase;
+import org.polarsys.capella.test.framework.context.SessionContext;
+import org.polarsys.kitalpha.vp.requirements.Requirements.Requirement;
+
+public class HtmlToTextTestCase extends BasicTestCase {
+
+  private static final String projectTestName = "misc";
+
+  /**
+   * @see org.polarsys.capella.test.framework.api.BasicTestArtefact#getRequiredTestModels()
+   */
+  @Override
+  public List<String> getRequiredTestModels() {
+    return Arrays.asList(projectTestName);
+  }
+
+  /**
+   * @see org.polarsys.capella.test.framework.api.BasicTestCase#test()
+   */
+  @Override
+  public void test() throws Exception {
+    SessionContext session = new SessionContext(getSession(projectTestName));
+
+    Requirement target = session.getSemanticElement("130237c0-c390-4b1a-99e8-1933d14d0f21");
+    setText(target, "value1<okok>");
+    assertTrue(EObjectLabelProviderHelper.getText(target).equals("value1"));
+
+    setText(target, "value1<okok>\r\nvalue2");
+    assertTrue(EObjectLabelProviderHelper.getText(target).equals("value1 value2"));
+
+    setText(target, "value1<okok>\nvalue2");
+    assertTrue(EObjectLabelProviderHelper.getText(target).equals("value1 value2"));
+
+    setText(target, "value1<okok><pppp>\n<lll>\n</br>\r\n</kkkk>value2");
+    assertTrue(EObjectLabelProviderHelper.getText(target).equals("value1   value2"));
+  }
+
+  private void setText(Requirement req, String text) {
+    TransactionHelper.getExecutionManager(req).execute(new AbstractReadWriteCommand() {
+      @Override
+      public void run() {
+        req.setReqIFText(text);
+      }
+    });
+  }
+}
diff --git a/...ents.ju/src/org/polarsys/capella/vp/requirements/ju/testsuites/RequirementsTestSuite.java b/...ents.ju/src/org/polarsys/capella/vp/requirements/ju/testsuites/RequirementsTestSuite.java
@@ -19,6 +19,7 @@
 import org.polarsys.capella.test.framework.api.BasicTestSuite;
 import org.polarsys.capella.vp.requirements.ju.testcases.EditableTargetScope;
 import org.polarsys.capella.vp.requirements.ju.testcases.FragmentationTestCase;
+import org.polarsys.capella.vp.requirements.ju.testcases.HtmlToTextTestCase;
 import org.polarsys.capella.vp.requirements.ju.testcases.ImportPreferencesTestCase;
 import org.polarsys.capella.vp.requirements.ju.testcases.ImportTestCase;
 import org.polarsys.capella.vp.requirements.ju.testcases.MassActionAttributes;
@@ -72,6 +73,7 @@ public static Test suite() {
   protected List<BasicTestArtefact> getTests() {
     List<BasicTestArtefact> tests = new ArrayList<BasicTestArtefact>();
 
+    tests.add(new HtmlToTextTestCase());
     tests.add(new MassActionAttributes());
     tests.add(new AbstractRelation_RelationType());
     tests.add(new BooleanValueAttribute_Definition_AttributeDefinition());