Resolve TODO to refactor Search and Skip test snippets (#105)

# Pull Request Info

[PR Reviewing
Guidelines](https://github.com/mongodb/docs-java/blob/master/REVIEWING.md)

Missed these TODOs on #99

JIRA - no jira
Staging
-
https://docs-mongodbcom-staging.corp.mongodb.com/kotlin/docsworker-xlarge/no-jira-refactor/fundamentals/crud/read-operations/text/
-
https://docs-mongodbcom-staging.corp.mongodb.com/kotlin/docsworker-xlarge/no-jira-refactor/fundamentals/crud/read-operations/skip/

## Self-Review Checklist

- [ ] Is this free of any warnings or errors in the RST?
- [ ] Did you run a spell-check?
- [ ] Did you run a grammar-check?
- [ ] Are all the links working?

(cherry picked from commit 9c7dd52)

Author: cbullinger

examples/src/test/kotlin/SearchTextTest.kt

@@ -14,8 +14,6 @@ import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.TestInstance
 import kotlin.test.*
 
-// TODO: light refactor on these examples so that they don't collect directly from find() op, but rather assign to val findFlow
-// and then collect/println from that for consistency with other examples
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class SearchTextTest {
     // :snippet-start: search-data-model
@@ -64,13 +62,14 @@ internal class SearchTextTest {
         // :snippet-end:
         // Junit test for the above code
         val testFilter = Filters.text("Furious")
-        collection.find(testFilter).collect { println(it) }
+        val findFlow = collection.find(testFilter)
+        findFlow.collect { println(it) }
         val expected = listOf(
             Movies(1, "2 Fast 2 Furious", listOf("undercover", "drug dealer")),
             Movies(3, "Furious 7", listOf("emotional")),
             Movies(4, "The Fate of the Furious", listOf("betrayal"))
         )
-        assertEquals(expected, collection.find(testFilter).sort(ascending("_id")).toList() )
+        assertEquals(expected, findFlow.sort(ascending("_id")).toList() )
     }
 
     @Test
@@ -89,57 +88,61 @@ internal class SearchTextTest {
         collection.createIndex(Indexes.text("title"))
         // :snippet-start: search-term
         val filter = Filters.text("fast")
-        collection.find(filter).collect { println(it) }
+        val findFlow = collection.find(filter)
+        findFlow.collect { println(it) }
         // :snippet-end:
         // Junit test for the above code
         val expected = listOf(
             Movies(1, "2 Fast 2 Furious", listOf("undercover", "drug dealer")),
             Movies(2, "Fast 5", listOf("bank robbery", "full team"))
         )
-        assertEquals(expected, collection.find(filter).sort(ascending("_id")).toList() )
+        assertEquals(expected, findFlow.sort(ascending("_id")).toList() )
     }
 
     @Test
     fun searchMultipleTermsTest() = runBlocking {
         collection.createIndex(Indexes.text("title"))
         // :snippet-start: search-multiple-terms
         val filter = Filters.text("fate 7")
-        collection.find(filter).collect { println(it) }
+        val findFlow = collection.find(filter)
+        findFlow.collect { println(it) }
         // :snippet-end:
         // Junit test for the above code
         val expected = listOf(
             Movies(3, "Furious 7", listOf("emotional")),
             Movies(4, "The Fate of the Furious", listOf("betrayal"))
         )
-        assertEquals(expected, collection.find(filter).toList() )
+        assertEquals(expected, findFlow.toList() )
     }
 
     @Test
     fun searchPhraseTest() = runBlocking {
         collection.createIndex(Indexes.text("title"))
         // :snippet-start: search-phrase
         val filter = Filters.text("\"fate of the furious\"")
-        collection.find(filter).collect { println(it) }
+        val findFlow = collection.find(filter)
+        findFlow.collect { println(it) }
         // :snippet-end:
         // Junit test for the above code
         val expected = listOf(
             Movies(4, "The Fate of the Furious", listOf("betrayal"))
         )
-        assertEquals(expected, collection.find(filter).toList() )
+        assertEquals(expected, findFlow.toList() )
     }
 
     @Test
     fun excludeTermTest() = runBlocking {
         collection.createIndex(Indexes.text("title"))
         // :snippet-start: exclude-term
         val filter = Filters.text("furious -fast")
-        collection.find(filter).collect { println(it) }
+        val findFlow = collection.find(filter)
+        findFlow.collect { println(it) }
         // :snippet-end:
         // Junit test for the above code
         val expected = listOf(
             Movies(3, "Furious 7", listOf("emotional")),
             Movies(4, "The Fate of the Furious", listOf("betrayal"))
         )
-        assertEquals(expected, collection.find(filter).sort(ascending("_id")).toList() )
+        assertEquals(expected, findFlow.sort(ascending("_id")).toList() )
     }
 }

examples/src/test/kotlin/SkipTest.kt

@@ -14,8 +14,6 @@ import org.junit.jupiter.api.TestInstance
 import java.util.*
 import kotlin.test.*
 
-// TODO: light refactor on these examples so that they don't collect directly from find() op, but rather assign to val findFlow
-// and then collect/println from that for consistency with other examples
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
 internal class SkipTest {
     // :snippet-start: skip-data-model
@@ -94,16 +92,15 @@ internal class SkipTest {
         val results = collection.find(filter)
             .sort(descending(PaintOrder::qty.name))
             .skip(5)
-            .collect { println(it) }
+        results.collect { println(it) }
         // :snippet-end:
         // Junit test for the above code
         val expected = listOf(
             PaintOrder(4, 6, "white"),
             PaintOrder(1, 5, "red"),
             PaintOrder(6, 3, "pink")
         )
-        assertEquals(expected, collection.find(filter).sort(descending(PaintOrder::qty.name))
-            .skip(5).toList() )
+        assertEquals(expected, results.toList() )
     }
 
     @Test
@@ -115,7 +112,8 @@ internal class SkipTest {
             Aggregates.sort(descending(PaintOrder::qty.name)),
             Aggregates.skip(5)
         )
-        collection.aggregate(aggregate).collect { println(it) }
+        val findFlow = collection.aggregate(aggregate)
+        findFlow.collect { println(it) }
         // :snippet-end:
 
         // Junit test for the above code
@@ -124,7 +122,7 @@ internal class SkipTest {
             PaintOrder(1, 5, "red"),
             PaintOrder(6, 3, "pink")
         )
-        assertEquals(expected, collection.aggregate(aggregate).toList())
+        assertEquals(expected, findFlow.toList())
     }
 
     @Test
@@ -136,9 +134,10 @@ internal class SkipTest {
             Aggregates.sort(descending(PaintOrder::qty.name)),
             Aggregates.skip(9)
         )
-        collection.aggregate(emptyQuery).collect { println(it) }
+        val findFlow = collection.aggregate(emptyQuery)
+        findFlow.collect { println(it) }
         // :snippet-end:
         // Junit test for the above code
-        assertTrue(collection.aggregate(emptyQuery).toList().isEmpty())
+        assertTrue(findFlow.toList().isEmpty())
     }
 }

source/examples/generated/SearchTextTest.snippet.exclude-term.kt

@@ -1,2 +1,3 @@
 val filter = Filters.text("furious -fast")
-collection.find(filter).collect { println(it) }
+val findFlow = collection.find(filter)
+findFlow.collect { println(it) }

source/examples/generated/SearchTextTest.snippet.search-multiple-terms.kt

@@ -1,2 +1,3 @@
 val filter = Filters.text("fate 7")
-collection.find(filter).collect { println(it) }
+val findFlow = collection.find(filter)
+findFlow.collect { println(it) }

source/examples/generated/SearchTextTest.snippet.search-phrase.kt

@@ -1,2 +1,3 @@
 val filter = Filters.text("\"fate of the furious\"")
-collection.find(filter).collect { println(it) }
+val findFlow = collection.find(filter)
+findFlow.collect { println(it) }

source/examples/generated/SearchTextTest.snippet.search-term.kt

@@ -1,2 +1,3 @@
 val filter = Filters.text("fast")
-collection.find(filter).collect { println(it) }
+val findFlow = collection.find(filter)
+findFlow.collect { println(it) }

source/examples/generated/SkipTest.snippet.aggregation.kt

@@ -4,4 +4,5 @@ val aggregate = listOf(
     Aggregates.sort(descending(PaintOrder::qty.name)),
     Aggregates.skip(5)
 )
-collection.aggregate(aggregate).collect { println(it) }
+val findFlow = collection.aggregate(aggregate)
+findFlow.collect { println(it) }

source/examples/generated/SkipTest.snippet.find-iterable.kt

@@ -2,4 +2,4 @@ val filter = Filters.empty()
 val results = collection.find(filter)
     .sort(descending(PaintOrder::qty.name))
     .skip(5)
-    .collect { println(it) }
+results.collect { println(it) }

source/examples/generated/SkipTest.snippet.no-results.kt

@@ -4,4 +4,5 @@ val emptyQuery = listOf(
     Aggregates.sort(descending(PaintOrder::qty.name)),
     Aggregates.skip(9)
 )
-collection.aggregate(emptyQuery).collect { println(it) }
+val findFlow = collection.aggregate(emptyQuery)
+findFlow.collect { println(it) }