Addresses PR comments

Manuel Vivo · manuelvicnt · commit bce0d2a363bb · 2019-12-16T18:00:22.000+01:00
diff --git a/JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsUiTest.kt b/JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsUiTest.kt
@@ -47,7 +47,7 @@ class JetnewsUiTest {
     @Test
     fun app_opensArticle() {
         findAllByText("Manuel Vivo").first().doClick()
-        workForComposeToBeIdle()
+        waitForComposeToBeIdle()
         findByText("July 30 • 3 min read").assertIsDisplayed()
     }
 }
diff --git a/JetNews/app/src/androidTest/java/com/example/jetnews/TestHelper.kt b/JetNews/app/src/androidTest/java/com/example/jetnews/TestHelper.kt
@@ -53,7 +53,9 @@ fun JetnewsStatus.resetState() {
 fun ComposeTestRule.setMaterialContent(children: @Composable() () -> Unit) {
     setContent {
         MaterialTheme {
-            Surface(children = children)
+            Surface {
+                children()
+            }
         }
     }
 }
@@ -62,7 +64,7 @@ fun ComposeTestRule.setMaterialContent(children: @Composable() () -> Unit) {
  * Workarounds, these functions should be removed when UI testing improves
  */
 
-fun workForComposeToBeIdle() {
+fun waitForComposeToBeIdle() {
     // Temporary workaround - use waitForIdle in dev04
     Thread.sleep(500)
 }
diff --git a/JetNews/gradle/wrapper/gradle-wrapper.properties b/JetNews/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Mon Nov 25 14:20:04 GMT 2019
+#Mon Dec 16 15:55:18 CET 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ class JetnewsUiTest {`
`47`	`47`	`@Test`
`48`	`48`	`fun app_opensArticle() {`
`49`	`49`	`findAllByText("Manuel Vivo").first().doClick()`
`50`		`- workForComposeToBeIdle()`
	`50`	`+ waitForComposeToBeIdle()`
`51`	`51`	`findByText("July 30 • 3 min read").assertIsDisplayed()`
`52`	`52`	`}`
`53`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,9 @@ fun JetnewsStatus.resetState() {`
`53`	`53`	`fun ComposeTestRule.setMaterialContent(children: @Composable() () -> Unit) {`
`54`	`54`	`setContent {`
`55`	`55`	`MaterialTheme {`
`56`		`- Surface(children = children)`
	`56`	`+ Surface {`
	`57`	`+ children()`
	`58`	`+ }`
`57`	`59`	`}`
`58`	`60`	`}`
`59`	`61`	`}`
`@@ -62,7 +64,7 @@ fun ComposeTestRule.setMaterialContent(children: @Composable() () -> Unit) {`
`62`	`64`	`* Workarounds, these functions should be removed when UI testing improves`
`63`	`65`	`*/`
`64`	`66`
`65`		`-fun workForComposeToBeIdle() {`
	`67`	`+fun waitForComposeToBeIdle() {`
`66`	`68`	`// Temporary workaround - use waitForIdle in dev04`
`67`	`69`	`Thread.sleep(500)`
`68`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#Mon Nov 25 14:20:04 GMT 2019`
	`1`	`+#Mon Dec 16 15:55:18 CET 2019`
`2`	`2`	`distributionBase=GRADLE_USER_HOME`
`3`	`3`	`distributionPath=wrapper/dists`
`4`	`4`	`zipStoreBase=GRADLE_USER_HOME`