Rename JVM File contents helper functions

Author: Joseph Cooper

assertk/src/jvmMain/kotlin/assertk/assertions/file.kt

@@ -59,12 +59,26 @@ fun Assert<File>.extension() = havingExtension()
 /**
  * Returns an assert on the file's contents as text.
  */
-fun Assert<File>.text(charset: Charset = Charsets.UTF_8) = having("text") { it.readText(charset) }
+fun Assert<File>.havingText(charset: Charset = Charsets.UTF_8) = having("text") { it.readText(charset) }
+
+@Deprecated(
+    message = "Function text has been renamed to havingText",
+    replaceWith = ReplaceWith("havingText()"),
+    level = DeprecationLevel.WARNING
+)
+fun Assert<File>.text(charset: Charset = Charsets.UTF_8) = havingText()
 
 /**
  * Returns an assert on the file's contents as bytes.
  */
-fun Assert<File>.bytes() = having("bytes", File::readBytes)
+fun Assert<File>.havingBytes() = having("bytes", File::readBytes)
+
+@Deprecated(
+    message = "Function bytes has been renamed to havingBytes",
+    replaceWith = ReplaceWith("havingBytes()"),
+    level = DeprecationLevel.WARNING
+)
+fun Assert<File>.bytes() = havingBytes()
 
 /**
  * Asserts the file exists.
@@ -144,7 +158,7 @@ fun Assert<File>.hasExtension(expected: String) {
  * @see [hasBytes]
  */
 fun Assert<File>.hasText(expected: String, charset: Charset = Charsets.UTF_8) {
-    text(charset).isEqualTo(expected)
+    havingText(charset).isEqualTo(expected)
 }
 
 /**

assertk/src/jvmTest/kotlin/test/assertk/assertions/FileTest.kt

@@ -204,13 +204,13 @@ class FileTest {
     //region contains
     @Test
     fun contains_correct_substring_passes() {
-        assertThat(fileWithText).text().contains("Forty-two")
+        assertThat(fileWithText).havingText().contains("Forty-two")
     }
 
     @Test
     fun contains_wrong_substring_fails() {
         val error = assertFailsWith<AssertionError> {
-            assertThat(fileWithText).text().contains("Forty-two!")
+            assertThat(fileWithText).havingText().contains("Forty-two!")
         }
         assertTrue(error.message!!.startsWith("expected [text] to contain:<\"Forty-two!\"> but was:<\"$text\">"))
         assertTrue(error.message!!.contains("file_contains"))
@@ -228,14 +228,14 @@ class FileTest {
 
     @Test
     fun matches_correct_regex_passes() {
-        assertThat(matchingFile).text().matches(".a...e.".toRegex())
+        assertThat(matchingFile).havingText().matches(".a...e.".toRegex())
     }
 
     @Test
     fun matches_wrong_regex_fails() {
         val incorrectRegexp = ".*d".toRegex()
         val error = assertFailsWith<AssertionError> {
-            assertThat(matchingFile).text().matches(incorrectRegexp)
+            assertThat(matchingFile).havingText().matches(incorrectRegexp)
         }
         assertTrue(error.message!!.startsWith("expected [text] to match:</$incorrectRegexp/> but was:<\"$matchingText\">"))
         assertTrue(error.message!!.contains("file_contains"))