Merge pull request #897 from wordpress-mobile/upgrade-robolectric-4.3.1

hypest · web-flow · commit b50ced733b29 · 2020-02-25T17:38:53.000+02:00
Upgrade to Robolectric v4.3.1
diff --git a/aztec/build.gradle b/aztec/build.gradle
@@ -57,6 +57,7 @@ dependencies {
 
     testImplementation "junit:junit:$jUnitVersion"
     testImplementation "org.robolectric:robolectric:$robolectricVersion"
+    testImplementation 'androidx.test:core:1.2.0'
 
     androidTestImplementation 'androidx.test:core:1.2.0'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/AttributeTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/AttributeTest.kt
@@ -16,7 +16,7 @@ import org.wordpress.aztec.watchers.EndOfBufferMarkerAdder
  * Testing attribute preservation for supported HTML elements
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class AttributeTest {
     companion object {
         private val HEADING =
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/AztecParserTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/AztecParserTest.kt
@@ -5,6 +5,7 @@ package org.wordpress.aztec
 import android.test.AndroidTestCase
 import android.text.SpannableString
 import android.text.SpannableStringBuilder
+import androidx.test.core.app.ApplicationProvider
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Ignore
@@ -13,13 +14,12 @@ import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
-import org.robolectric.shadows.ShadowApplication
 
 /**
  * Tests for [AztecParser].
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class AztecParserTest : AndroidTestCase() {
     private var mParser = AztecParser()
     private val HTML_BOLD = "<b>Bold</b><br><br>"
@@ -92,7 +92,7 @@ class AztecParserTest : AndroidTestCase() {
      */
     @Before
     fun init() {
-        context = ShadowApplication.getInstance().applicationContext
+        context = ApplicationProvider.getApplicationContext()
     }
 
     /**
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/AztecToolbarTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/AztecToolbarTest.kt
@@ -16,7 +16,7 @@ import org.wordpress.aztec.toolbar.AztecToolbar
  * Combined test for toolbar and inline styles.
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class AztecToolbarTest {
     lateinit var editText: AztecText
     lateinit var sourceText: SourceViewEditText
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/BlockElementsTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/BlockElementsTest.kt
@@ -18,7 +18,7 @@ import org.wordpress.aztec.TestUtils.safeLength
  * Testing interactions of multiple block elements
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class BlockElementsTest {
     lateinit var editText: AztecText
 
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/CalypsoFormattingTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/CalypsoFormattingTest.kt
@@ -5,18 +5,18 @@ package org.wordpress.aztec
 import android.test.AndroidTestCase
 import android.text.SpannableString
 import android.text.SpannableStringBuilder
+import androidx.test.core.app.ApplicationProvider
 import junit.framework.Assert
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
-import org.robolectric.shadows.ShadowApplication
 import org.wordpress.aztec.source.Format
 
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class CalypsoFormattingTest : AndroidTestCase() {
     private var parser = AztecParser()
 
@@ -104,7 +104,7 @@ class CalypsoFormattingTest : AndroidTestCase() {
      */
     @Before
     fun init() {
-        context = ShadowApplication.getInstance().applicationContext
+        context = ApplicationProvider.getApplicationContext()
     }
 
     /**
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/ClipboardTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/ClipboardTest.kt
@@ -12,7 +12,7 @@ import org.robolectric.annotation.Config
 import org.wordpress.aztec.source.Format
 
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class ClipboardTest {
     private val HEADING =
             "<h1>Heading 1</h1>" +
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/CssStyleAttributeTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/CssStyleAttributeTest.kt
@@ -4,19 +4,19 @@ package org.wordpress.aztec
 
 import android.test.AndroidTestCase
 import android.text.SpannableString
+import androidx.test.core.app.ApplicationProvider
 import junit.framework.Assert
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
-import org.robolectric.shadows.ShadowApplication
 import org.wordpress.aztec.source.CssStyleFormatter
 import org.wordpress.aztec.spans.AztecStyleBoldSpan
 
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(16, 21, 25))
+@Config(sdk = intArrayOf(16, 21, 25))
 class CssStyleAttributeTest : AndroidTestCase() {
 
     private val EMPTY_STYLE_HTML = "<b>bold</b>"
@@ -27,7 +27,7 @@ class CssStyleAttributeTest : AndroidTestCase() {
 
     @Before
     fun init() {
-        context = ShadowApplication.getInstance().applicationContext
+        context = ApplicationProvider.getApplicationContext()
         parser = AztecParser()
     }
 
@@ -112,4 +112,4 @@ class CssStyleAttributeTest : AndroidTestCase() {
 
         Assert.assertEquals(EMPTY_STYLE_HTML, parser.toHtml(text))
     }
-}
+}
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/CssUnderlinePluginTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/CssUnderlinePluginTest.kt
@@ -16,7 +16,7 @@ import org.wordpress.aztec.spans.AztecUnderlineSpan
  * Combined test for toolbar and inline styles.
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class CssUnderlinePluginTest {
     lateinit var editText: AztecText
 
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/HeadingTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/HeadingTest.kt
@@ -20,7 +20,7 @@ import org.wordpress.aztec.toolbar.AztecToolbar
  * Testing heading behaviour.
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class HeadingTest {
     lateinit var editText: AztecText
     lateinit var sourceText: SourceViewEditText
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/HtmlAttributeStyleColorTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/HtmlAttributeStyleColorTest.kt
@@ -5,14 +5,14 @@ package org.wordpress.aztec
 import android.test.AndroidTestCase
 import android.text.SpannableString
 import android.text.style.ForegroundColorSpan
+import androidx.test.core.app.ApplicationProvider
 import junit.framework.Assert
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
-import org.robolectric.shadows.ShadowApplication
 import org.wordpress.aztec.spans.IAztecAttributedSpan
 
 /**
@@ -29,7 +29,7 @@ import org.wordpress.aztec.spans.IAztecAttributedSpan
  * Also tests invalid html style attribute color properties.
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(16, 21, 25))
+@Config(sdk = intArrayOf(16, 21, 25))
 class HtmlAttributeStyleColorTest : AndroidTestCase() {
 
     private val HTML_BOLD_STYLE_COLOR = "<b style=\"color:blue;\">Blue</b>"
@@ -45,7 +45,7 @@ class HtmlAttributeStyleColorTest : AndroidTestCase() {
 
     @Before
     fun init() {
-        context = ShadowApplication.getInstance().applicationContext
+        context = ApplicationProvider.getApplicationContext()
         parser = AztecParser()
     }
 
@@ -138,4 +138,4 @@ class HtmlAttributeStyleColorTest : AndroidTestCase() {
         val colorSpanCount = span.getSpans(0, span.length, ForegroundColorSpan::class.java).count()
         Assert.assertEquals(0, colorSpanCount)
     }
-}
+}
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/HtmlFormattingTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/HtmlFormattingTest.kt
@@ -4,18 +4,18 @@ package org.wordpress.aztec
 
 import android.test.AndroidTestCase
 import android.text.SpannableString
+import androidx.test.core.app.ApplicationProvider
 import junit.framework.Assert
 import org.junit.Before
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
-import org.robolectric.shadows.ShadowApplication
 import org.wordpress.aztec.source.Format
 
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class HtmlFormattingTest : AndroidTestCase() {
 
     private var parser = AztecParser()
@@ -173,7 +173,7 @@ class HtmlFormattingTest : AndroidTestCase() {
      */
     @Before
     fun init() {
-        context = ShadowApplication.getInstance().applicationContext
+        context = ApplicationProvider.getApplicationContext()
     }
 
     /**
@@ -258,4 +258,4 @@ class HtmlFormattingTest : AndroidTestCase() {
         val output = Format.removeSourceEditorFormatting(Format.addSourceEditorFormatting(input))
         Assert.assertEquals(HTML_NESTED_BOLD_TAGS_HTML_PROCESSING_OUTPUT, output)
     }
-}
+}
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/LinkTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/LinkTest.kt
@@ -10,7 +10,7 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class LinkTest {
 
     lateinit var editText: AztecText
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/ListTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/ListTest.kt
@@ -20,7 +20,7 @@ import org.wordpress.aztec.watchers.EndOfBufferMarkerAdder
  * This test uses ParameterizedRobolectricTestRunner and runs twice - for ol and ul tags.
  */
 @RunWith(ParameterizedRobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class ListTest(listTextFormat: ITextFormat, listHtmlTag: String) {
 
     val listType = listTextFormat
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/PreformatTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/PreformatTest.kt
@@ -5,7 +5,7 @@ package org.wordpress.aztec
 // * Testing preformat behavior.
 // */
 //@RunWith(RobolectricTestRunner::class)
-//@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+//@Config(sdk = intArrayOf(23))
 //class PreformatTest {
 //    val tag = "pre"
 //
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/QuoteTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/QuoteTest.kt
@@ -17,7 +17,7 @@ import org.wordpress.aztec.watchers.EndOfBufferMarkerAdder
  * Testing quote behaviour.
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class QuoteTest {
 
     val formattingType = AztecTextFormat.FORMAT_QUOTE
diff --git a/aztec/src/test/kotlin/org/wordpress/aztec/util/ColorConverterTest.kt b/aztec/src/test/kotlin/org/wordpress/aztec/util/ColorConverterTest.kt
@@ -5,13 +5,12 @@ import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
-import org.wordpress.aztec.BuildConfig
 
 /**
  * Tests for translating various strings to colors using [ColorConverter].
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class ColorConverterTest {
 
     /**
@@ -92,4 +91,4 @@ class ColorConverterTest {
         val colorInt = ColorConverter.getColorInt(colorString)
         Assert.assertEquals(colorInt, ColorConverter.COLOR_NOT_FOUND)
     }
-}
+}
diff --git a/build.gradle b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         tagSoupVersion = '1.2.1'
         glideVersion = '4.10.0'
         picassoVersion = '2.5.2'
-        robolectricVersion = '3.5.1'
+        robolectricVersion = '4.3.1'
         jUnitVersion = '4.12'
         jSoupVersion = '1.11.3'
         wordpressUtilsVersion = '1.21'
diff --git a/gradle.properties b/gradle.properties
@@ -18,4 +18,6 @@ android.useAndroidX=true
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
- org.gradle.parallel=true
+ org.gradle.parallel=true
+
+android.enableUnitTestBinaryResources=true
diff --git a/wordpress-comments/src/test/java/org/wordpress/aztec/plugins/CommentsToolbarTest.kt b/wordpress-comments/src/test/java/org/wordpress/aztec/plugins/CommentsToolbarTest.kt
@@ -12,7 +12,6 @@ import org.robolectric.annotation.Config
 import org.wordpress.aztec.Aztec
 import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.ITextFormat
-import org.wordpress.aztec.plugins.wpcomments.BuildConfig
 import org.wordpress.aztec.plugins.wpcomments.R
 import org.wordpress.aztec.plugins.wpcomments.WordPressCommentsPlugin
 import org.wordpress.aztec.plugins.wpcomments.toolbar.MoreToolbarButton
@@ -25,7 +24,7 @@ import org.wordpress.aztec.toolbar.IAztecToolbarClickListener
  * Combined test for toolbar and inline styles.
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(23))
+@Config(sdk = intArrayOf(23))
 class CommentsToolbarTest {
 
     lateinit var editText: AztecText
diff --git a/wordpress-comments/src/test/java/org/wordpress/aztec/plugins/WordPressCommentTest.kt b/wordpress-comments/src/test/java/org/wordpress/aztec/plugins/WordPressCommentTest.kt
@@ -14,7 +14,6 @@ import org.wordpress.aztec.AztecText
 import org.wordpress.aztec.Constants
 import org.wordpress.aztec.plugins.TestUtils.backspaceAt
 import org.wordpress.aztec.plugins.TestUtils.safeEmpty
-import org.wordpress.aztec.plugins.wpcomments.BuildConfig
 import org.wordpress.aztec.plugins.wpcomments.CommentsTextFormat
 import org.wordpress.aztec.plugins.wpcomments.WordPressCommentsPlugin
 import org.wordpress.aztec.plugins.wpcomments.spans.WordPressCommentSpan
@@ -25,7 +24,7 @@ import org.wordpress.aztec.plugins.wpcomments.toolbar.PageToolbarButton
  * Tests for special comments ([WordPressCommentSpan.Comment.MORE] and [WordPressCommentSpan.Comment.PAGE])
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(25))
+@Config(sdk = intArrayOf(25))
 class WordPressCommentTest {
     lateinit var editText: AztecText
 
diff --git a/wordpress-shortcodes/src/test/java/org/wordpress/aztec/plugins/shortcodes/AudioShortcodeTest.kt b/wordpress-shortcodes/src/test/java/org/wordpress/aztec/plugins/shortcodes/AudioShortcodeTest.kt
@@ -17,7 +17,7 @@ import org.wordpress.aztec.plugins.shortcodes.TestUtils.safeEmpty
  * Tests for the audio shortcode plugin
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(25))
+@Config(sdk = intArrayOf(25))
 class AudioShortcodeTest {
     lateinit var editText: AztecText
 
diff --git a/wordpress-shortcodes/src/test/java/org/wordpress/aztec/plugins/shortcodes/ImageCaptionTest.kt b/wordpress-shortcodes/src/test/java/org/wordpress/aztec/plugins/shortcodes/ImageCaptionTest.kt
@@ -25,7 +25,7 @@ import org.xml.sax.Attributes
  * Tests for the caption shortcode plugin
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(25))
+@Config(sdk = intArrayOf(25))
 class ImageCaptionTest {
     lateinit var editText: AztecText
 
diff --git a/wordpress-shortcodes/src/test/java/org/wordpress/aztec/plugins/shortcodes/VideoShortcodeTest.kt b/wordpress-shortcodes/src/test/java/org/wordpress/aztec/plugins/shortcodes/VideoShortcodeTest.kt
@@ -17,7 +17,7 @@ import org.wordpress.aztec.plugins.shortcodes.TestUtils.safeEmpty
  * Tests for the video shortcode plugin
  */
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(25))
+@Config(sdk = intArrayOf(25))
 class VideoShortcodeTest {
     lateinit var editText: AztecText
 
