Merge branch 'develop' into issue/fixing-missing-href-in-url-with-parameters

Author: 0nko

.gitignore

@@ -46,3 +46,8 @@ annotations/
 # Enforce plugins
 !/.idea/externalDependencies.xml
 
+# OS generated
+/.DS_Store
+
+# Kotlin lint
+ktlint

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
+## Unreleased
 ### Fixed
+- The text handling following immediately after images
+- Undo/redo edit history
+- The demo app sample text
 - URL span not including href attribute when other attributes are present
 
 ## [1.0-beta.11](https://github.com/wordpress-mobile/AztecEditor-Android/releases/tag/v1.0-beta.11) - 2017-11-20

app/src/androidTest/kotlin/org/wordpress/aztec/demo/Actions.kt

@@ -14,6 +14,8 @@ import android.view.View
 import android.widget.EditText
 import org.hamcrest.Matcher
 import org.hamcrest.Matchers.allOf
+import org.wordpress.aztec.AztecText
+import org.wordpress.aztec.watchers.EndOfBufferMarkerAdder
 
 object Actions {
     fun invokeClick(): ViewAction {
@@ -32,7 +34,6 @@ object Actions {
         }
     }
 
-    @Suppress("DEPRECATION")
     fun relativeClick(xPercent: Float = 0.5f, yPercent: Float = 0.5f): ViewAction {
         return GeneralClickAction(
                 Tap.SINGLE,
@@ -45,7 +46,7 @@ object Actions {
 
                     floatArrayOf(x, y)
                 },
-                Press.FINGER)
+                Press.FINGER, 0, 0)
     }
 
     fun selectAll(): ViewAction {
@@ -65,4 +66,94 @@ object Actions {
             }
         }
     }
+
+    fun copyToClipboardAztec(): ViewAction {
+        return object : ViewAction {
+            override fun getConstraints(): Matcher<View> {
+                return allOf(isDisplayed(), isAssignableFrom(EditText::class.java))
+            }
+
+            override fun getDescription(): String {
+                return "Copy to Aztec clipboard"
+            }
+
+            override fun perform(uiController: UiController?, view: View?) {
+                if (view is AztecText) {
+                    view.copy(view.text, view.selectionStart, view.selectionEnd)
+                }
+            }
+        }
+    }
+
+    fun copyRangeToClipboardAztec(start: Int, end: Int): ViewAction {
+        return object : ViewAction {
+            override fun getConstraints(): Matcher<View> {
+                return allOf(isDisplayed(), isAssignableFrom(EditText::class.java))
+            }
+
+            override fun getDescription(): String {
+                return "Copy to Aztec clipboard"
+            }
+
+            override fun perform(uiController: UiController?, view: View?) {
+                if (view is AztecText) {
+                    view.copy(view.text, start, end)
+                }
+            }
+        }
+    }
+
+    fun pasteFromClipboardAztec(): ViewAction {
+        return object : ViewAction {
+            override fun getConstraints(): Matcher<View> {
+                return allOf(isDisplayed(), isAssignableFrom(EditText::class.java))
+            }
+
+            override fun getDescription(): String {
+                return "Paste from Aztec clipboard"
+            }
+
+            override fun perform(uiController: UiController?, view: View?) {
+                if (view is AztecText) {
+                    view.paste(view.text, view.selectionStart, view.selectionEnd)
+                }
+            }
+        }
+    }
+
+    fun pasteRangeFromClipboardAztec(start: Int, end: Int): ViewAction {
+        return object : ViewAction {
+            override fun getConstraints(): Matcher<View> {
+                return allOf(isDisplayed(), isAssignableFrom(EditText::class.java))
+            }
+
+            override fun getDescription(): String {
+                return "Paste from Aztec clipboard from range [$start] to [$end]"
+            }
+
+            override fun perform(uiController: UiController?, view: View?) {
+                if (view is AztecText) {
+                    view.paste(view.text, start, end)
+                }
+            }
+        }
+    }
+
+    fun setAztecCursorPositionEnd(): ViewAction {
+        return object : ViewAction {
+            override fun getConstraints(): Matcher<View> {
+                return allOf(isDisplayed(), isAssignableFrom(EditText::class.java))
+            }
+
+            override fun getDescription(): String {
+                return "Set Aztec cursor at the end of current text buffer"
+            }
+
+            override fun perform(uiController: UiController?, view: View?) {
+                if (view is AztecText) {
+                    view.setSelection(EndOfBufferMarkerAdder.safeLength(view))
+                }
+            }
+        }
+    }
 }

app/src/androidTest/kotlin/org/wordpress/aztec/demo/BaseHistoryTest.kt

@@ -0,0 +1,27 @@
+package org.wordpress.aztec.demo
+
+import android.support.test.rule.ActivityTestRule
+import org.junit.Before
+import org.junit.Rule
+import org.wordpress.aztec.AztecText
+
+/**
+ * Base class for History testing.
+ */
+abstract class BaseHistoryTest : BaseTest() {
+
+    protected val throttleTime: Long = 1000L
+
+    @Rule
+    @JvmField
+    var mActivityTestRule = ActivityTestRule(MainActivity::class.java)
+
+    /**
+     * Increases the history time to cover test device variability.
+     */
+    @Before
+    fun init() {
+        val aztecText = mActivityTestRule.activity.findViewById<AztecText>(R.id.aztec)
+        aztecText.history.historyThrottleTime = throttleTime
+    }
+}

app/src/androidTest/kotlin/org/wordpress/aztec/demo/pages/EditorPage.kt

@@ -95,6 +95,18 @@ class EditorPage : BasePage() {
         return this
     }
 
+    /**
+     * Using selectAllText() + delete() do not work as intended. This method
+     * will select all the text in the editor and then delete that text.
+     */
+    fun selectAllAndDelete(): EditorPage {
+        selectAllText()
+        editor.perform(pressKey(KeyEvent.KEYCODE_FORWARD_DEL))
+        label("Select all text and delete")
+
+        return this
+    }
+
     fun delete(characters: Int): EditorPage {
         for (i in 1..characters) {
             editor.perform(pressKey(KeyEvent.KEYCODE_DEL))
@@ -103,6 +115,20 @@ class EditorPage : BasePage() {
         return this
     }
 
+    fun insertNewLine(): EditorPage {
+        editor.perform(pressKey(KeyEvent.KEYCODE_ENTER))
+        label("Insert new line")
+
+        return this
+    }
+
+    fun clearText(): EditorPage {
+        editor.perform(ViewActions.clearText())
+        label("Clear editor text")
+
+        return this
+    }
+
     fun insertText(text: String): EditorPage {
         editor.perform(typeText(text), ViewActions.closeSoftKeyboard())
         label("Inserted text")
@@ -304,17 +330,71 @@ class EditorPage : BasePage() {
         return this
     }
 
+    fun verify(expected: String): EditorPage {
+        editor.check(matches(Matchers.withStrippedText(expected)))
+        label("Verified expected editor contents")
+
+        return this
+    }
+
     fun verifyHTML(expected: String): EditorPage {
         htmlEditor.check(matches(Matchers.withStrippedText(expected)))
-        label("Verified expected editor contents")
+        label("Verified expected HTML editor contents")
 
         return this
     }
 
     fun verifyHTML(expected: Regex): EditorPage {
         htmlEditor.check(matches(Matchers.withRegex(expected)))
-        label("Verified expected editor contents")
+        label("Verified expected HTML editor contents")
+
+        return this
+    }
+
+    fun verifyHTMLNoStripping(expected: String): EditorPage {
+        htmlEditor.check(matches(withText(expected)))
+        label("Verified expected HTML editor contents without stripping")
+
+        return this
+    }
+
+    fun copyToClipboard(): EditorPage {
+        editor.perform(Actions.copyToClipboardAztec())
+        label("Copy to Aztec clipboard")
+
+        return this
+    }
+
+    fun copyRangeToClipboard(start: Int, end: Int): EditorPage {
+        editor.perform(Actions.copyRangeToClipboardAztec(start, end))
+        label("Copy text from index [$start] to [$end] to clipboard")
+
+        return this
+    }
+
+    fun pasteFromClipboard(): EditorPage {
+        editor.perform(Actions.pasteFromClipboardAztec())
+        label("Paste from Aztec clipboard")
+
+        return this
+    }
+
+    fun pasteRangeFromClipboard(start: Int, end: Int): EditorPage {
+        editor.perform(Actions.pasteRangeFromClipboardAztec(start, end))
+        label("Past from Aztec clipboard from range [$start] to [$end]")
+
+        return this
+    }
+
+    fun setCursorPositionAtEnd(): EditorPage {
+        editor.perform(Actions.setAztecCursorPositionEnd())
+        label("Set Aztec cursor position at the end of text buffer")
+
+        return this
+    }
 
+    fun threadSleep(millis: Long): EditorPage {
+        Thread.sleep(millis)
         return this
     }
 
@@ -333,4 +413,4 @@ class EditorPage : BasePage() {
         UNORDERED(onData(hasToString("Unordered List"))),
         ORDERED(onData(hasToString("Ordered List")))
     }
-}
+}