wip

apicollective · May 29, 2024 · b09705f · b09705f
1 parent b77239c
commit b09705f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 11 deletions.
diff --git a/kotlin-generator/src/test/scala/models/generator/kotlin/KotlinGeneratorTest.scala b/kotlin-generator/src/test/scala/models/generator/kotlin/KotlinGeneratorTest.scala
@@ -13,7 +13,7 @@ class KotlinGeneratorTest
 
   private val serviceDefs = Seq(builtInTypesService,
                                 // dateTimeService,
-                                // generatorApiServiceWithUnionAndDescriminator,
+                                // generatorApiServiceWithUnionAndDiscriminator,
                                 apidocApiService,
                                 collectionJsonDefaultsService,
                                 referenceApiService,

diff --git a/kotlin-generator/src/test/scala/models/generator/kotlin/KotlinTestHelper.scala b/kotlin-generator/src/test/scala/models/generator/kotlin/KotlinTestHelper.scala
@@ -80,8 +80,8 @@ object KotlinTestHelper extends Matchers {
 
   def assertKotlinCodeCompiles(kotlinSourceDirectory: java.io.File): Unit = {
     assert(kotlinSourceDirectory.exists())
-    assert(kotlinSourceDirectory.canRead())
-    assert(kotlinSourceDirectory.isDirectory())
+    assert(kotlinSourceDirectory.canRead)
+    assert(kotlinSourceDirectory.isDirectory)
     val result = new KotlinCompiler().compileSourceDir(kotlinSourceDirectory.toPath)
     result.isSuccess shouldBe true
     ()

diff --git a/scala-generator/src/test/scala/utils/ScalaFormatterSpec.scala b/scala-generator/src/test/scala/utils/ScalaFormatterSpec.scala
@@ -5,18 +5,16 @@ import org.scalatest.matchers.should.Matchers
 
 class ScalaFormatterSpec extends AnyFunSpec with Matchers {
 
-  it("ScalaFormatter should format valid scala code") {
-    val contents = "case class Foo(bar: String)"
-    val result = ScalaFormatter.format(contents)
+  private[this] def format(code: String) = {
+    ScalaFormatter.format(code)
+  }
 
-    result should be(Symbol("right"))
+  it("ScalaFormatter should format valid scala code") {
+    format("case class Foo(bar: String)") should be(Symbol("right"))
   }
 
   it("ScalaFormatter should fail to format invalid scala code") {
-    val contents = "Foo Bar"
-    val result = ScalaFormatter.format(contents)
-
-    result should be(Symbol("left"))
+    format("Foo Bar {") should be(Symbol("left"))
   }
 
 }