Skip to content

Json function Improvements #1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wumpz merged 17 commits into from
Apr 9, 2022
Merged

Json function Improvements #1506

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
de805ab
Adjust Gradle to JUnit 5
manticore-projects Nov 22, 2021
d5a6dca
Do not mark SpeedTest for concurrent execution
manticore-projects Nov 24, 2021
a9d0503
Remove unused imports
manticore-projects Nov 28, 2021
6dfa05f
Adjust Gradle to JUnit 5
manticore-projects Nov 22, 2021
8f0bfe6
Do not mark SpeedTest for concurrent execution
manticore-projects Nov 24, 2021
5cd0974
Remove unused imports
manticore-projects Nov 28, 2021
5f11d3f
Merge remote-tracking branch 'origin/master'
manticore-projects Nov 28, 2021
3ab04b0
Merge https://github.com/JSQLParser/JSqlParser
manticore-projects Dec 21, 2021
de94651
Merge branch 'JSQLParser:master' into master
manticore-projects Jan 24, 2022
84709a9
Merge branch 'master' of github.com:JSQLParser/JSqlParser
manticore-projects Mar 22, 2022
3c8da30
Merge branch 'master' of github.com:JSQLParser/JSqlParser
manticore-projects Apr 4, 2022
be61ae2
Improve JSON Functions
manticore-projects Apr 7, 2022
03a53ae
Improve JSON Functions
manticore-projects Apr 7, 2022
02cac90
Improve JSON Functions
manticore-projects Apr 7, 2022
2429335
Appease Codacy
manticore-projects Apr 7, 2022
7b03568
Let JSON_OBJECT accept Expressions as value
manticore-projects Apr 8, 2022
6ca0e09
set Version = 4.4-SNAPSHOT
manticore-projects Apr 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Appease Codacy
  • Loading branch information
@manticore-projects
manticore-projects committed Apr 7, 2022
commit 2429335c6d9150a7cf33f37266b7654586e7b13f
19 changes: 7 additions & 12 deletions src/test/java/net/sf/jsqlparser/expression/JsonFunctionTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,10 @@
*/
package net.sf.jsqlparser.expression;

import java.util.Objects;
import net.sf.jsqlparser.JSQLParserException;
import net.sf.jsqlparser.parser.CCJSqlParserUtil;
import net.sf.jsqlparser.test.TestUtils;
import org.junit.jupiter.api.Assertions;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;

/**
Expand Down Expand Up @@ -69,17 +64,17 @@ public void testObjectBuilder() throws JSQLParserException {
JsonKeyValuePair keyValuePair2 = new JsonKeyValuePair("foo", "bar", false, false).withUsingKeyKeyword(true).withUsingValueKeyword(true).withUsingFormatJson(false);

// this should work because we compare based on KEY only
assertEquals(keyValuePair1, keyValuePair2);
Assertions.assertEquals(keyValuePair1, keyValuePair2);

// this must fail because all the properties are considered
assertFalse(Objects.equals(keyValuePair1.toString(), keyValuePair2.toString()));
Assertions.assertNotEquals(keyValuePair1.toString(), keyValuePair2.toString());

JsonKeyValuePair keyValuePair3 = new JsonKeyValuePair("foo", "bar", false, false).withUsingKeyKeyword(false).withUsingValueKeyword(false).withUsingFormatJson(false);
assertNotNull(keyValuePair3);
assertEquals(keyValuePair3, keyValuePair3);
assertFalse(Objects.equals(keyValuePair3, f));
Assertions.assertNotNull(keyValuePair3);
Assertions.assertEquals(keyValuePair3, keyValuePair3);
Assertions.assertNotEquals(keyValuePair3, f);

assertTrue(keyValuePair3.hashCode() != 0);
Assertions.assertTrue(keyValuePair3.hashCode() != 0);

f.add(keyValuePair2);
}
Expand All @@ -95,7 +90,7 @@ public void testArrayBuilder() throws JSQLParserException {
JsonFunctionExpression expression2 = new JsonFunctionExpression(new NullValue()).withUsingFormatJson(
true);

assertTrue(Objects.equals(expression1.toString(), expression2.toString()));
Assertions.assertEquals(expression1.toString(), expression2.toString());

f.add(expression1);
f.add(expression2);
Expand Down