Rename IntFormat -> LiteralInt.

diffplug · Dec 19, 2023 · c9aa23f · c9aa23f
1 parent 9b0853a
commit c9aa23f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Literals.kt b/selfie-lib/src/commonMain/kotlin/com/diffplug/selfie/Literals.kt
@@ -28,7 +28,7 @@ interface LiteralFormat<T : Any> {
   fun parse(str: String, language: Language): T
 }
 
-object IntFormat : LiteralFormat<Int> {
+object LiteralInt : LiteralFormat<Int> {
   override fun encode(value: Int, language: Language): String {
     // TODO: 1000000 is hard to read, 1_000_000 is much much better
     return value.toString()
@@ -38,7 +38,7 @@ object IntFormat : LiteralFormat<Int> {
   }
 }
 
-object StrFormat : LiteralFormat<String> {
+object LiteralString : LiteralFormat<String> {
   override fun encode(value: String, language: Language): String {
     if (!value.contains("\n")) {
       // TODO: replace \t, maybe others...

diff --git a/...tlin/com/diffplug/selfie/IntFormatTest.kt → ...lin/com/diffplug/selfie/LiteralIntTest.kt b/...tlin/com/diffplug/selfie/IntFormatTest.kt → ...lin/com/diffplug/selfie/LiteralIntTest.kt
@@ -18,7 +18,7 @@ package com.diffplug.selfie
 import io.kotest.matchers.shouldBe
 import kotlin.test.Test
 
-class IntFormatTest {
+class LiteralIntTest {
   @Test
   fun encode() {
     encode(0, "0")
@@ -33,7 +33,7 @@ class IntFormatTest {
     encode(-1_000_000, "-1000000")
   }
   private fun encode(value: Int, expected: String) {
-    val actual = IntFormat().encode(value)
+    val actual = LiteralInt.encode(value, Language.JAVA)
     actual shouldBe expected
   }
 
@@ -50,7 +50,7 @@ class IntFormatTest {
     decode("-9_9_9", -999)
   }
   private fun decode(value: String, expected: Int) {
-    val actual = IntFormat().parse(value)
+    val actual = LiteralInt.parse(value, Language.JAVA)
     actual shouldBe expected
   }
 }
diff --git a/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/Selfie.kt b/selfie-runner-junit5/src/main/kotlin/com/diffplug/selfie/Selfie.kt
@@ -71,7 +71,7 @@ object Selfie {
         }
     private fun toBeDidntMatch(expected: Int?): Int {
       if (RW.isWrite) {
-        Router.writeInline(recordCall(), LiteralValue(expected, actual, IntFormat))
+        Router.writeInline(recordCall(), LiteralValue(expected, actual, LiteralInt))
         return actual
       } else {
         if (expected == null) {