Merge remote-tracking branch 'origin/develop' into fb_plateEditorNpe

Author: labkey-tchad

modules/simpletest/resources/scripts/validationTest/simpleQueryTest.js

@@ -49,7 +49,7 @@ var testFunctions = [
 
     function() //testResults[3]
     {
-        testResults[testResults.length] = LABKEY.Query.executeSql({schemaName: schemaName, sort: "Date", sql: "select audit.Date from audit"});
+        testResults[testResults.length] = LABKEY.Query.executeSql({schemaName: schemaName, sort: "Date", sql: "select Date from UserAuditEvent"});
         executeNext();
     },
 
@@ -100,7 +100,7 @@ var testFunctions = [
         if (!testResults[0].rowsAffected || testResults[0].rowsAffected != 1)
             errors[errors.length] = new Error("Query.insertRows() = "+Ext.util.JSON.encode(testResults[0]));
 
-        if (!testResults[1].rows || testResults[1].rows.length  != 1)
+        if (!testResults[1].rows || testResults[1].rows.length != 1)
             errors[errors.length] = new Error("Query.selectRows() = "+Ext.util.JSON.encode(testResults[1]));
 
         if (!testResults[2].exception)

src/org/labkey/test/WebDriverWrapper.java

@@ -53,6 +53,7 @@
 import org.labkey.test.util.EscapeUtil;
 import org.labkey.test.util.Ext4Helper;
 import org.labkey.test.util.ExtHelper;
+import org.labkey.test.util.HtmlFragmentSelection;
 import org.labkey.test.util.LabKeyExpectedConditions;
 import org.labkey.test.util.LogMethod;
 import org.labkey.test.util.LoggedParam;
@@ -3503,14 +3504,14 @@ public void actionClear(WebElement input)
     }
 
     /**
-     *  puts the specified text into the clipboard, then pastes it into the specified element,
+     *  puts the specified text and html into the clipboard, then pastes it into the specified element,
      *  or whatever has focus at the moment.
      */
-    public void actionPaste(WebElement input, String text)
+    public void actionPaste(WebElement input, String text, boolean isHtml)
     {
         Keys cmdKey = WebDriverUtils.MODIFIER_KEY;
 
-        setClipboardContent(text);
+        setClipboardContent(text, isHtml);
 
         if (input == null)
         {
@@ -3531,16 +3532,40 @@ public void actionPaste(WebElement input, String text)
         }
     }
 
+    /**
+     *  puts the specified text into the clipboard, then pastes it into the specified element,
+     *  or whatever has focus at the moment.
+     */
+    public void actionPaste(WebElement input, String text)
+    {
+        actionPaste(input, text, false);
+    }
+
     public void clearClipboardContent()
     {
         setClipboardContent(" ");
     }
 
-    protected void setClipboardContent(String text)
+    protected void setClipboardContent(String text, boolean isHtml)
     {
         Clipboard c = Toolkit.getDefaultToolkit().getSystemClipboard();
-        StringSelection sel = new StringSelection(text);
-        c.setContents(sel, sel);
+        Transferable sel;
+
+        if (isHtml)
+        {
+            sel = new HtmlFragmentSelection(text);
+        }
+        else
+        {
+            sel = new StringSelection(text);
+        }
+
+        c.setContents(sel, null);
+    }
+
+    protected void setClipboardContent(String text)
+    {
+        setClipboardContent(text, false);
     }
 
     public String getClipboardContent() throws IOException, UnsupportedFlavorException

src/org/labkey/test/tests/list/ListLookupTest.java

@@ -27,19 +27,21 @@
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
+import static org.labkey.test.util.TestDataGenerator.ALL_CHARS_PLACEHOLDER;
+import static org.labkey.test.util.TestDataGenerator.REPEAT_PLACEHOLDER;
 
 // Issue 52098, Issue 49422
 @Category({Daily.class, Data.class, Hosting.class})
 public class ListLookupTest extends BaseWebDriverTest
 {
     private static final String lookToListName = TestDataGenerator.randomDomainName("lookToList", DomainUtils.DomainKind.IntList);
-    private static final String lookToKeyFieldName = TestDataGenerator.randomFieldName("lookToKeyField", null, DomainUtils.DomainKind.IntList);
+    private static final String lookToKeyFieldName = TestDataGenerator.randomFieldName("lookToKeyField", 5, 5, "" + REPEAT_PLACEHOLDER + ALL_CHARS_PLACEHOLDER, DomainUtils.DomainKind.IntList);
     private static final String lookToFieldName = TestDataGenerator.randomFieldName("lookToField", null, DomainUtils.DomainKind.IntList);
     private static List<Map<String, String>> lookToListValues;
     private static String lookupKeyAsNameNumber;
     private static String lookupKeyAsNameFieldValue;
     private static final String lookFromListName = TestDataGenerator.randomDomainName("lookFromList", DomainUtils.DomainKind.IntList);
-    private static final String lookFromKeyFieldName = TestDataGenerator.randomFieldName("Look From Key Field", null, DomainUtils.DomainKind.IntList);
+    private static final String lookFromKeyFieldName = TestDataGenerator.randomFieldName("Look From Key Field", 5, 5, "" + REPEAT_PLACEHOLDER + ALL_CHARS_PLACEHOLDER, DomainUtils.DomainKind.IntList);
     private static final String lookFromLookupFieldName = TestDataGenerator.randomFieldName("Look From Lookup Field", null, DomainUtils.DomainKind.IntList);
     private static final String lookFromLookupFieldKey = EscapeUtil.fieldKeyEncodePart(lookFromLookupFieldName);
 

src/org/labkey/test/util/HtmlFragmentSelection.java

@@ -0,0 +1,45 @@
+package org.labkey.test.util;
+
+import org.jetbrains.annotations.NotNull;
+
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.datatransfer.UnsupportedFlavorException;
+
+/**
+ * Used when you want to put an HTML payload on the clipboard, allowing you to emulate things like copy/pasting from
+ * ELN/Google Docs.
+ */
+public class HtmlFragmentSelection implements Transferable
+{
+    // You might be tempted to add support for DataFlavor.stringFlavor to this class in addition to
+    // DataFlavor.fragmentHtmlFlavor, because that's what the examples show across the Internet do, and that's what the
+    // various AI tools will tell you to do, but it simply doesn't work. If you put a text and HTML payload in the Java
+    // clipboard it will only paste the text, and not the HTML.
+    private static final DataFlavor[] transferDataFlavors = {DataFlavor.fragmentHtmlFlavor};
+    private final String html;
+
+    public HtmlFragmentSelection(String html) {
+        this.html = html;
+    }
+
+    @Override
+    public DataFlavor[] getTransferDataFlavors() {
+        return transferDataFlavors;
+    }
+
+    @Override
+    public boolean isDataFlavorSupported(DataFlavor flavor) {
+        return flavor.equals(DataFlavor.fragmentHtmlFlavor);
+    }
+
+    @Override
+    @NotNull
+    public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException
+    {
+        if (flavor == DataFlavor.fragmentHtmlFlavor) {
+            return html;
+        }
+        throw new UnsupportedFlavorException(flavor);
+    }
+}