Fix failing tests

Author: Hanseter

src/main/kotlin/com/github/hanseter/json/editor/JsonPropertiesEditor.kt

@@ -154,6 +154,7 @@ class JsonPropertiesEditor @JvmOverloads constructor(
         (treeTableView.root as FilterableTreeItem).add(pane.treeItem)
         pane.treeItem.isExpanded = idsToPanes.size <= viewOptions.numberOfInitiallyOpenedObjects
         pane.valid.addListener(paneValidListener)
+        paneValidListener.changed(pane.valid, pane.valid.get(), pane.valid.get())
     }
 
     fun display(

src/main/kotlin/com/github/hanseter/json/editor/JsonPropertiesPane.kt

@@ -204,6 +204,7 @@ class JsonPropertiesPane(
     private fun updateTreeAfterChildChange(control: TypeControl) {
         val item = findInTree(treeItem, control) ?: return
 
+        item.list.clear()
         item.list.setAll(control.childControls.map { wrapControlInTreeItem(it) })
     }
 

src/test/kotlin/com/github/hanseter/json/editor/CustomizationObjectTest.kt

@@ -2,11 +2,15 @@ package com.github.hanseter.json.editor
 
 import com.github.hanseter.json.editor.types.TypeModel
 import com.github.hanseter.json.editor.util.CustomizationObject
+import javafx.scene.Parent
 import javafx.scene.control.Labeled
 import javafx.scene.control.TextField
 import javafx.stage.Stage
 import org.hamcrest.MatcherAssert
+import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers
+import org.hamcrest.Matchers.`is`
+import org.hamcrest.Matchers.not
 import org.json.JSONObject
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.extension.ExtendWith
@@ -59,14 +63,14 @@ class CustomizationObjectTest {
 
         val fooControl = editor.getControlInTable("bar") as TextField
 
-        MatcherAssert.assertThat((fooCell.graphic as Labeled).text, Matchers.`is`("bar"))
-        MatcherAssert.assertThat((notFooCell.graphic as Labeled).text, Matchers.`is`("notFoo"))
+        assertThat(((fooCell.graphic as Parent).childrenUnmodifiable.first() as Labeled).text, `is`("bar"))
+        assertThat(((notFooCell.graphic as Parent).childrenUnmodifiable.first() as Labeled).text, `is`("notFoo"))
 
         fooControl.text = "something"
 
         WaitForAsyncUtils.waitForFxEvents()
-        MatcherAssert.assertThat((fooCell.graphic as Labeled).text, Matchers.`is`("barsomething"))
-        MatcherAssert.assertThat((notFooCell.graphic as Labeled).text, Matchers.`is`("notFoo"))
+        assertThat(((fooCell.graphic as Parent).childrenUnmodifiable.first() as Labeled).text, `is`("barsomething"))
+        assertThat(((notFooCell.graphic as Parent).childrenUnmodifiable.first() as Labeled).text, `is`("notFoo"))
     }
 
     @Test
@@ -101,8 +105,8 @@ class CustomizationObjectTest {
 
         val fooCell = editor.getKeyCellInTable("foo")
 
-        MatcherAssert.assertThat(fooCell.tooltip, Matchers.notNullValue())
-        MatcherAssert.assertThat(fooCell.tooltip.text, Matchers.`is`("fooDesc"))
+        assertThat(fooCell.tooltip, Matchers.notNullValue())
+        assertThat(fooCell.tooltip.text, `is`("fooDesc"))
 
     }
 
@@ -127,7 +131,7 @@ class CustomizationObjectTest {
 
         val fooCell = editor.getKeyCellInTable("foo")
 
-        MatcherAssert.assertThat((fooCell.graphic as Labeled).text, Matchers.`is`("foo"))
+        assertThat(((fooCell.graphic as Parent).childrenUnmodifiable.first() as Labeled).text, `is`("foo"))
 
         editor.customizationObject = object : CustomizationObject {
 
@@ -142,7 +146,7 @@ class CustomizationObjectTest {
 
         WaitForAsyncUtils.waitForFxEvents()
         val fooCellNew = editor.getKeyCellInTable("bar")
-        MatcherAssert.assertThat((fooCellNew.graphic as Labeled).text, Matchers.`is`("bar"))
+        assertThat(((fooCellNew.graphic as Parent).childrenUnmodifiable.first() as Labeled).text, `is`("bar"))
     }
 
 }

src/test/kotlin/com/github/hanseter/json/editor/SchemaChangeTest.kt

@@ -57,7 +57,7 @@ class SchemaChangeTest {
 
 
 
-            PropertiesEditResult(it.data, ParsedSchema.create(newSchema, null as URI))
+            PropertiesEditResult(it.data, ParsedSchema.create(newSchema, null))
         }
 
 

src/test/kotlin/com/github/hanseter/json/editor/ValidationKeywordsTest.kt

@@ -3,6 +3,7 @@ package com.github.hanseter.json.editor
 import javafx.scene.control.TextField
 import javafx.stage.Stage
 import org.hamcrest.MatcherAssert
+import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.`is`
 import org.json.JSONObject
 import org.junit.jupiter.api.Test
@@ -39,72 +40,78 @@ class ValidationKeywordsTest {
         editor.display("1", "1", JSONObject().put("a", "foo"), schema) { it }
 
         WaitForAsyncUtils.waitForFxEvents()
-        MatcherAssert.assertThat(editor.valid.get(), `is`(true))
+        assertThat(editor.valid.get(), `is`(true))
 
         val stringControl = editor.getControlInTable("a") as TextField
 
         stringControl.text = "bar"
 
         WaitForAsyncUtils.waitForFxEvents()
-        MatcherAssert.assertThat(editor.valid.get(), `is`(false))
+        assertThat(editor.valid.get(), `is`(false))
     }
 
     @Test
     fun testConditional() {
         val schema = JSONObject("""
 {
+  "type":"object",
   "properties": {
-    "a": {
-      "type": "string"
-    },
-    "b": {
-      "type": "string"
-    }
-  },
-  "if": {
-    "properties": {
-      "a": {
-        "const": "foo"
-      }
-    }
-  },
-  "then": {
-    "properties": {
-      "b": {
-        "pattern": ".*bar.*"
-      }
-    }
-  },
-  "else": {
-    "properties": {
-      "b": {
-        "pattern": ".*baz.*"
-      }
-    }
+    "nested": {
+        "type":"object",
+        "properties": {
+          "a": {
+            "type": "string"
+          },
+          "b": {
+            "type": "string"
+          }
+        },
+        "if": {
+          "properties": {
+            "a": {
+              "const": "foo"
+            }
+          }
+        },
+        "then": {
+          "properties": {
+            "b": {
+              "pattern": ".*bar.*"
+            }
+          }
+        },
+        "else": {
+          "properties": {
+            "b": {
+              "pattern": ".*baz.*"
+            }
+          }
+        }
+     }
   }
 }
         """)
 
-        editor.display("1", "1", JSONObject("""{"a": "foo", "b": "not"}"""), schema) { it }
+        editor.display("1", "1", JSONObject("""{"nested":{"a": "foo", "b": "not"}}"""), schema) { it }
 
         WaitForAsyncUtils.waitForFxEvents()
-        MatcherAssert.assertThat(editor.valid.get(), `is`(false))
+        assertThat(editor.valid.get(), `is`(false))
 
         val itemTable = editor.getItemTable()
         val aControl = editor.getControlInTable("a") as TextField
         val bControl = editor.getControlInTable("b") as TextField
 
         bControl.text = "something bar something"
         WaitForAsyncUtils.waitForFxEvents()
-        MatcherAssert.assertThat(editor.valid.get(), `is`(true))
+        assertThat(editor.valid.get(), `is`(true))
 
 
         aControl.text = "bar"
         WaitForAsyncUtils.waitForFxEvents()
-        MatcherAssert.assertThat(editor.valid.get(), `is`(false))
+        assertThat(editor.valid.get(), `is`(false))
 
         bControl.text = "something baz something"
         WaitForAsyncUtils.waitForFxEvents()
-        MatcherAssert.assertThat(editor.valid.get(), `is`(true))
+        assertThat(editor.valid.get(), `is`(true))
     }
 }

src/test/kotlin/com/github/hanseter/json/editor/app/SchemaChangingTestApp.kt

@@ -96,7 +96,7 @@ class SchemaChangingTestApp : Application() {
 
             PropertiesEditResult(
                 SchemaNormalizer.deepCopy(it.data).put("b", ""),
-                ParsedSchema.Companion.create(newSchema, null as URI)
+                ParsedSchema.Companion.create(newSchema, null)
             )
         }