Updates BooleanSchemaTest

Author: spacether

samples/client/petstore/kotlin/src/main/kotlin/org/openapijsonschematools/client/schemas/validation/TypeValidator.kt

@@ -15,11 +15,15 @@ class TypeValidator : KeywordValidator {
                 Void::class.java
             }
             is List<*> -> {
-                MutableList::class.java
+                List::class.java
             }
 
             is Map<*, *> -> {
-                MutableMap::class.java
+                Map::class.java
+            }
+
+            is Boolean -> {
+                Boolean::class.java
             }
 
             else -> {

samples/client/petstore/kotlin/src/test/kotlin/org/openapijsonschematools/client/schemas/BooleanSchemaTest.kt

@@ -0,0 +1,53 @@
+package org.openapijsonschematools.client.schemas
+
+import org.openapijsonschematools.client.configurations.JsonSchemaKeywordFlags
+import org.openapijsonschematools.client.configurations.SchemaConfiguration
+import org.openapijsonschematools.client.exceptions.ValidationException
+import org.openapijsonschematools.client.schemas.BooleanJsonSchema.BooleanJsonSchema1
+import org.openapijsonschematools.client.schemas.validation.JsonSchema
+import org.openapijsonschematools.client.schemas.validation.PathToSchemasMap
+import org.openapijsonschematools.client.schemas.validation.ValidationMetadata
+import kotlin.test.Test
+import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+
+class BooleanSchemaTest {
+    @Test
+    @Throws(ValidationException::class)
+    fun testValidateTrue() {
+        val validatedValue = booleanJsonSchema.validate(true, configuration)
+        assertTrue(validatedValue)
+    }
+
+    @Test
+    @Throws(ValidationException::class)
+    fun testValidateFalse() {
+        val validatedValue = booleanJsonSchema.validate(false, configuration)
+        assertFalse(validatedValue)
+    }
+
+    @Test
+    fun testExceptionThrownForInvalidType() {
+        assertFailsWith<ValidationException>(
+            block = {
+                JsonSchema.validate(
+                    booleanJsonSchema,
+                    null,
+                    validationMetadata
+                )
+            }
+        )
+    }
+
+    companion object {
+        val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
+        val booleanJsonSchema = BooleanJsonSchema1.getInstance()
+        val validationMetadata = ValidationMetadata(
+            listOf("args[0"),
+            configuration,
+            PathToSchemasMap(),
+            LinkedHashSet()
+        )
+    }
+}

src/main/resources/kotlin/src/main/kotlin/packagename/schemas/validation/TypeValidator.hbs

@@ -15,11 +15,15 @@ class TypeValidator : KeywordValidator {
                 Void::class.java
             }
             is List<*> -> {
-                MutableList::class.java
+                List::class.java
             }
 
             is Map<*, *> -> {
-                MutableMap::class.java
+                Map::class.java
+            }
+
+            is Boolean -> {
+                Boolean::class.java
             }
 
             else -> {

src/main/resources/kotlin/src/test/kotlin/packagename/schemas/BooleanSchemaTest.hbs

@@ -1,45 +1,53 @@
 package {{{packageName}}}.schemas;
 
-import org.junit.Assert;
-import org.junit.Test;
 import {{{packageName}}}.configurations.JsonSchemaKeywordFlags;
 import {{{packageName}}}.configurations.SchemaConfiguration;
 import {{{packageName}}}.exceptions.ValidationException;
 import {{{packageName}}}.schemas.validation.JsonSchema;
 import {{{packageName}}}.schemas.validation.PathToSchemasMap;
 import {{{packageName}}}.schemas.validation.ValidationMetadata;
 
-import java.util.LinkedHashSet;
-import java.util.List;
+import kotlin.test.Test
+import kotlin.test.assertFailsWith
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
 
-public class BooleanSchemaTest {
-    static final SchemaConfiguration configuration = new SchemaConfiguration(new JsonSchemaKeywordFlags.Builder().build());
-    static final BooleanJsonSchema.BooleanJsonSchema1 booleanJsonSchema = BooleanJsonSchema.BooleanJsonSchema1.getInstance();
-    static final ValidationMetadata validationMetadata = new ValidationMetadata(
-            List.of("args[0"),
-            configuration,
-            new PathToSchemasMap(),
-            new LinkedHashSet<>()
-    );
-    
+class BooleanSchemaTest {
     @Test
-    public void testValidateTrue() throws ValidationException {
-        boolean validatedValue = booleanJsonSchema.validate(true, configuration);
-        Assert.assertTrue(validatedValue);
+    @Throws(ValidationException::class)
+    fun testValidateTrue() {
+        val validatedValue = booleanJsonSchema.validate(true, configuration)
+        assertTrue(validatedValue)
     }
 
     @Test
-    public void testValidateFalse() throws ValidationException {
-        boolean validatedValue = booleanJsonSchema.validate(false, configuration);
-        Assert.assertFalse(validatedValue);
+    @Throws(ValidationException::class)
+    fun testValidateFalse() {
+        val validatedValue = booleanJsonSchema.validate(false, configuration)
+        assertFalse(validatedValue)
     }
 
     @Test
-    public void testExceptionThrownForInvalidType() {
-        Assert.assertThrows(ValidationException.class, () -> JsonSchema.validate(
-                booleanJsonSchema,
-                null,
-                validationMetadata
-        ));
+    fun testExceptionThrownForInvalidType() {
+        assertFailsWith<ValidationException>(
+            block = {
+                JsonSchema.validate(
+                    booleanJsonSchema,
+                    null,
+                    validationMetadata
+                )
+            }
+        )
+    }
+
+    companion object {
+        val configuration = SchemaConfiguration(JsonSchemaKeywordFlags.Builder().build())
+        val booleanJsonSchema = BooleanJsonSchema1.getInstance()
+        val validationMetadata = ValidationMetadata(
+            listOf("args[0"),
+            configuration,
+            PathToSchemasMap(),
+            LinkedHashSet()
+        )
     }
-}
+}