-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Adding better error messages for JSON parsing.
- Loading branch information
Showing
5 changed files
with
204 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
80 changes: 80 additions & 0 deletions
80
...nfig-json/src/test/java/com/oracle/labs/mlrg/olcut/config/json/test/TypeCheckingTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| /* | ||
| * Copyright (c) 2025, Oracle and/or its affiliates. | ||
| * | ||
| * Licensed under the 2-clause BSD license. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * 1. Redistributions of source code must retain the above copyright notice, | ||
| * this list of conditions and the following disclaimer. | ||
| * | ||
| * 2. Redistributions in binary form must reproduce the above copyright notice, | ||
| * this list of conditions and the following disclaimer in the documentation | ||
| * and/or other materials provided with the distribution. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE | ||
| * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| * POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| package com.oracle.labs.mlrg.olcut.config.json.test; | ||
|
|
||
| import com.oracle.labs.mlrg.olcut.config.ConfigurationManager; | ||
| import com.oracle.labs.mlrg.olcut.config.io.ConfigLoaderException; | ||
| import com.oracle.labs.mlrg.olcut.config.json.JsonConfigFactory; | ||
| import org.junit.jupiter.api.Assertions; | ||
| import org.junit.jupiter.api.BeforeAll; | ||
| import org.junit.jupiter.api.Test; | ||
|
|
||
| import java.io.IOException; | ||
|
|
||
| import static com.oracle.labs.mlrg.olcut.config.ConfigurationManager.createModuleResourceString; | ||
| import static org.junit.jupiter.api.Assertions.fail; | ||
|
|
||
| public class TypeCheckingTest { | ||
|
|
||
| @BeforeAll | ||
| public static void setUp() { | ||
| ConfigurationManager.addFileFormatFactory(new JsonConfigFactory()); | ||
| } | ||
|
|
||
| @Test | ||
| public void arrayTest() throws IOException { | ||
| try { | ||
| ConfigurationManager cm = new ConfigurationManager(createModuleResourceString(this.getClass(), "typeCheckingListConfig.json")); | ||
| fail("Should have thrown ConfigLoaderException"); | ||
| } catch (ConfigLoaderException e) { | ||
| Assertions.assertTrue(e.getMessage().startsWith("Invalid value")); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void propertyTest() throws IOException { | ||
| try { | ||
| ConfigurationManager cm = new ConfigurationManager(createModuleResourceString(this.getClass(), "typeCheckingPropertyConfig.json")); | ||
| fail("Should have thrown ConfigLoaderException"); | ||
| } catch (ConfigLoaderException e) { | ||
| Assertions.assertTrue(e.getMessage().startsWith("Invalid value")); | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| public void mapTest() throws IOException { | ||
| try { | ||
| ConfigurationManager cm = new ConfigurationManager(createModuleResourceString(this.getClass(), "typeCheckingMapConfig.json")); | ||
| fail("Should have thrown ConfigLoaderException"); | ||
| } catch (ConfigLoaderException e) { | ||
| Assertions.assertTrue(e.getMessage().startsWith("Invalid value")); | ||
| } | ||
| } | ||
|
|
||
| } |
62 changes: 62 additions & 0 deletions
62
...rc/test/resources/com/oracle/labs/mlrg/olcut/config/json/test/typeCheckingListConfig.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,62 @@ | ||
| { | ||
| "config" : { | ||
| "global-properties" : { }, | ||
| "components" : [ { | ||
| "name" : "a", | ||
| "type" : "com.oracle.labs.mlrg.olcut.test.config.ArrayConfigurable", | ||
| "export" : "false", | ||
| "import" : "false", | ||
| "properties" : { | ||
| "floatArray" : [ { | ||
| "item" : "1.1f" | ||
| }, { | ||
| "item" : "2.3" | ||
| }, { | ||
| "item" : "3.5" | ||
| } ], | ||
| "doubleArray" : [ { | ||
| "item" : 1e-16 | ||
| }, { | ||
| "item" : 2e-16 | ||
| }, { | ||
| "item" : "3.16" | ||
| } ], | ||
| "longArray" : [ { | ||
| "item" : 9223372036854775807 | ||
| }, { | ||
| "item" : "9223372036854775806" | ||
| }, { | ||
| "item" : "5" | ||
| } ], | ||
| "byteArray" : [ { | ||
| "item" : "1" | ||
| }, { | ||
| "item" : "2" | ||
| }, { | ||
| "item" : "3" | ||
| } ], | ||
| "shortArray" : [ { | ||
| "item" : "1" | ||
| }, { | ||
| "item" : "2" | ||
| }, { | ||
| "item" : "3" | ||
| } ], | ||
| "intArray" : [ { | ||
| "item" : 1 | ||
| }, { | ||
| "item" : 2 | ||
| }, { | ||
| "item": "3" | ||
| } ], | ||
| "charArray" : [ { | ||
| "item" : "a" | ||
| }, { | ||
| "item" : "b" | ||
| }, { | ||
| "item" : "c" | ||
| } ] | ||
| } | ||
| } ] | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
...src/test/resources/com/oracle/labs/mlrg/olcut/config/json/test/typeCheckingMapConfig.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| { | ||
| "config" : { | ||
| "components" : [ { | ||
| "name" : "mapTest", | ||
| "type" : "com.oracle.labs.mlrg.olcut.test.config.MapConfigurable", | ||
| "export" : "false", | ||
| "import" : "false", | ||
| "properties" : { | ||
| "map" : { | ||
| "foo" : "quux", | ||
| "things" : 5 | ||
| } | ||
| } | ||
| } ] | ||
| } | ||
| } |
18 changes: 18 additions & 0 deletions
18
...est/resources/com/oracle/labs/mlrg/olcut/config/json/test/typeCheckingPropertyConfig.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| { | ||
| "config": { | ||
| "global-properties": {}, | ||
| "components": [ | ||
| { | ||
| "name": "a", | ||
| "type": "com.oracle.labs.mlrg.olcut.test.config.BasicConfigurable", | ||
| "export": "false", | ||
| "import": "false", | ||
| "properties": { | ||
| "s": "one", | ||
| "d": 3.0, | ||
| "i": 2 | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| } |