Merge pull request #84 from eprogramming/master

functional test not part of unit test

Author: helio-frota

src/test/java/org/jboss/aesh/mterm/action/BaseActionTest.java

@@ -16,6 +16,7 @@
 
 import javax.swing.JTextArea;
 
+import org.jboss.aesh.mterm.util.MtermUtil;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
@@ -31,6 +32,7 @@ public class BaseActionTest {
     @Before
     public void setUp() {
         textArea = new JTextArea();
+        MtermUtil.INSTANCE.createPs1("");
         action = new BaseAction(textArea) {
             @Override
             public void actionPerformed(ActionEvent e) {

…rg/jboss/aesh/mterm/gui/MtermUITest.java …esh/mterm/gui/MtermUITestFunctional.javasrc/test/java/org/jboss/aesh/mterm/gui/MtermUITest.java renamed to src/test/java/org/jboss/aesh/mterm/gui/MtermUITestFunctional.java src/test/java/org/jboss/aesh/mterm/gui/MtermUITest.java renamed to src/test/java/org/jboss/aesh/mterm/gui/MtermUITestFunctional.java

@@ -28,7 +28,7 @@
  *
  * @author <a href="mailto:00hf11@gmail.com">Helio Frota</a>
  */
-public class MtermUITest {
+public class MtermUITestFunctional {
 
     FrameFixture frame;
 

src/test/java/org/jboss/aesh/mterm/util/MtermUtilTest.java

@@ -25,7 +25,7 @@ public void testCreatePs1() {
         String ps1 = MtermUtil.INSTANCE.createPs1("");
         Assert.assertTrue(ps1.contains("@"));
         Assert.assertTrue(ps1.contains("["));
-        Assert.assertTrue(ps1.contains("~]$"));
+        Assert.assertTrue(ps1.contains("]$"));
         Assert.assertEquals(ps1, MtermUtil.INSTANCE.getPs1());
     }