Unit test for issue 1845

git-svn-id: http://svn.dmdirc.com/trunk@4842 00569f92-eb28-0410-84fd-f71c24880f

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -22,7 +22,8 @@
 
 package com.dmdirc.harness;
 
-import com.dmdirc.*;
+import com.dmdirc.Server;
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.interfaces.InputWindow;
@@ -42,7 +43,8 @@ public class TestWritableFrameContainer extends WritableFrameContainer {
         this(lineLength, IdentityManager.getGlobalConfig());
     }
 
-    public void sendLine(String line) {
+    public void sendLine(final String line) {
+        // Do nothing
     }
 
     public InputWindow getFrame() {
@@ -54,10 +56,11 @@ public class TestWritableFrameContainer extends WritableFrameContainer {
     }
 
     public String toString() {
-        return null;
+        return "window";
     }
 
     public void windowClosing() {
+        // Do nothing
     }
 
     public Server getServer() {

test/com/dmdirc/harness/ui/TestInputTextFrame.java

@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2006-2007 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.harness.ui;
-
-import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.commandparser.PopupType;
-import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.commandparser.parsers.GlobalCommandParser;
-import com.dmdirc.ui.swing.components.InputTextFrame;
-
-import javax.swing.JPopupMenu;
-
-public class TestInputTextFrame extends InputTextFrame {
-
-    public TestInputTextFrame(WritableFrameContainer owner) {
-        super(owner);
-    }
-
-    @Override
-    public void addCustomPopupItems(JPopupMenu popupMenu) {
-        return;
-    }
-
-    @Override
-    public PopupType getChannelPopupType() {
-        return PopupType.CHAN_CHANNEL;
-    }
-
-    @Override
-    public PopupType getHyperlinkPopupType() {
-        return PopupType.CHAN_CHANNEL;
-    }
-
-    @Override
-    public PopupType getNicknamePopupType() {
-        return PopupType.CHAN_CHANNEL;
-    }
-
-    @Override
-    public PopupType getNormalPopupType() {
-        return PopupType.CHAN_CHANNEL;
-    }
-
-    @Override
-    public CommandParser getCommandParser() {
-        return GlobalCommandParser.getGlobalCommandParser();
-    }
-
-}

test/com/dmdirc/ui/swing/components/InputTextFrameTest.java

@@ -23,22 +23,29 @@
 package com.dmdirc.ui.swing.components;
 
 import com.dmdirc.WritableFrameContainer;
+import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.ConfigManager;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.harness.TestConfigManagerMap;
 import com.dmdirc.harness.TestWritableFrameContainer;
-import com.dmdirc.harness.ui.TestInputTextFrame;
+import com.dmdirc.harness.ui.ClassFinder;
 import com.dmdirc.harness.ui.UIClassTestRunner;
 import com.dmdirc.harness.ui.UITestIface;
 
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.interfaces.Window;
+import com.dmdirc.ui.swing.CustomInputFrame;
 import com.dmdirc.ui.swing.SwingController;
+import com.dmdirc.ui.swing.UIUtilities;
 import java.awt.Toolkit;
 import java.awt.datatransfer.StringSelection;
 import java.awt.event.KeyEvent;
+import javax.swing.text.JTextComponent;
 import org.fest.swing.core.EventMode;
 import org.fest.swing.core.KeyPressInfo;
 import org.fest.swing.core.matcher.DialogByTitleMatcher;
+import org.fest.swing.core.matcher.JButtonByTextMatcher;
+import org.fest.swing.fixture.DialogFixture;
 import org.fest.swing.fixture.FrameFixture;
 import org.fest.swing.fixture.JInternalFrameFixture;
 import org.fest.swing.util.Platform;
@@ -52,10 +59,10 @@ import static org.junit.Assert.*;
 @RunWith(UIClassTestRunner.class)
 public class InputTextFrameTest implements UITestIface {
 
-    FrameFixture mainframe;
-    JInternalFrameFixture window;
-    TestConfigManagerMap cmmap;
-    TestWritableFrameContainer owner;
+    static FrameFixture mainframe;
+    static JInternalFrameFixture window;
+    static TestConfigManagerMap cmmap;
+    static TestWritableFrameContainer owner;
 
     @Before
     public void setUp() {
@@ -64,36 +71,99 @@ public class InputTextFrameTest implements UITestIface {
         cmmap = new TestConfigManagerMap();
         cmmap.settings.put("ui.pasteProtectionLimit", "1");
 
-        owner = new TestWritableFrameContainer(512, cmmap);
+        if (window == null) {
+            owner = new TestWritableFrameContainer(512, cmmap);
+
+            setupWindow(cmmap);
+        }
     }
 
     @After
     public void tearDown() {
-        if (window != null) {
-            window.close();
-        }
-
-        if (mainframe != null) {
-            mainframe.close();
-        }
+        // ??
     }
 
     @Test
     public void testPasteDialogAppearing() throws InterruptedException {
-        setupWindow(cmmap);
+        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
+                new StringSelection("line1\nline2"), null);
 
+        window.textBox().pressAndReleaseKey(KeyPressInfo.keyCode(KeyEvent.VK_V)
+                .modifiers(Platform.controlOrCommandMask()));
+        mainframe.dialog(DialogByTitleMatcher.withTitleAndShowing("Multi-line paste"))
+                .requireVisible().close();
+    }
+
+    @Test
+    public void testPasteDialogContents() throws InterruptedException {
         Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
                 new StringSelection("line1\nline2"), null);
 
-        while (true) {
-            Thread.yield();
-            Thread.sleep(1000);
-        }
+        window.textBox().pressAndReleaseKey(KeyPressInfo.keyCode(KeyEvent.VK_V)
+                .modifiers(Platform.controlOrCommandMask()));
+
+        final DialogFixture dlg = mainframe.dialog(DialogByTitleMatcher
+                .withTitleAndShowing("Multi-line paste"));
 
-        //window.textBox().pressAndReleaseKey(KeyPressInfo.keyCode(KeyEvent.VK_C)
-        //        .modifiers(Platform.controlOrCommandMask()));
-        //mainframe.dialog(DialogByTitleMatcher.withTitle("Multi-line paste")).
-          //      requireVisible();
+        dlg.requireVisible().button(JButtonByTextMatcher.withText("Edit")).click();
+        dlg.textBox(new ClassFinder<TextAreaInputField>(TextAreaInputField.class, null))
+                .requireText("line1\nline2");
+        dlg.close();
+    }
+
+    @Test
+    public void testPasteDialogWithTextBefore() throws InterruptedException {
+        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
+                new StringSelection("line1\nline2"), null);
+
+        window.textBox().enterText("testing:");
+        window.textBox().pressAndReleaseKey(KeyPressInfo.keyCode(KeyEvent.VK_V)
+                .modifiers(Platform.controlOrCommandMask()));
+
+        final DialogFixture dlg = mainframe.dialog(DialogByTitleMatcher
+                .withTitleAndShowing("Multi-line paste"));
+
+        dlg.requireVisible().button(JButtonByTextMatcher.withText("Edit")).click();
+        dlg.textBox(new ClassFinder<TextAreaInputField>(TextAreaInputField.class, null))
+                .requireText("testing:line1\nline2");
+        dlg.close();
+    }
+
+    @Test
+    public void testPasteDialogWithTextAfter() throws InterruptedException {
+        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
+                new StringSelection("line1\nline2"), null);
+
+        window.textBox().enterText("<- testing").pressAndReleaseKey(
+                KeyPressInfo.keyCode(KeyEvent.VK_HOME));
+        window.textBox().pressAndReleaseKey(KeyPressInfo.keyCode(KeyEvent.VK_V)
+                .modifiers(Platform.controlOrCommandMask()));
+
+        final DialogFixture dlg = mainframe.dialog(DialogByTitleMatcher
+                .withTitleAndShowing("Multi-line paste"));
+
+        dlg.requireVisible().button(JButtonByTextMatcher.withText("Edit")).click();
+        dlg.textBox(new ClassFinder<TextAreaInputField>(TextAreaInputField.class, null))
+                .requireText("line1\nline2<- testing");
+        dlg.close();
+    }
+
+    @Test
+    public void testPasteDialogWithTextAround() throws InterruptedException {
+        Toolkit.getDefaultToolkit().getSystemClipboard().setContents(
+                new StringSelection("line1\nline2"), null);
+
+        window.textBox().enterText("testing:<- testing").selectText(8, 8);
+        window.textBox().pressAndReleaseKey(KeyPressInfo.keyCode(KeyEvent.VK_V)
+                .modifiers(Platform.controlOrCommandMask()));
+
+        final DialogFixture dlg = mainframe.dialog(DialogByTitleMatcher
+                .withTitleAndShowing("Multi-line paste"));
+
+        dlg.requireVisible().button(JButtonByTextMatcher.withText("Edit")).click();
+        dlg.textBox(new ClassFinder<TextAreaInputField>(TextAreaInputField.class, null))
+                .requireText("testing:line1\nline2<- testing");
+        dlg.close();
     }
 
     public static junit.framework.Test suite() {
@@ -101,10 +171,13 @@ public class InputTextFrameTest implements UITestIface {
     }
 
     protected void setupWindow(final ConfigManager configManager) {
+        UIUtilities.initUISettings();
+
         mainframe = new FrameFixture(SwingController.getMainFrame());
         mainframe.robot.settings().eventMode(EventMode.AWT);
 
-        final TestInputTextFrame titf = new TestInputTextFrame(owner);
+        final CustomInputFrame titf = new CustomInputFrame(owner,
+                GlobalCommandParser.getGlobalCommandParser());
 
         titf.setTitle("testing123");
 
@@ -113,7 +186,6 @@ public class InputTextFrameTest implements UITestIface {
         WindowManager.addWindow(titf);
 
         titf.open();
-        titf.show();
 
         window = new JInternalFrameFixture(mainframe.robot, titf);
     }