Fix tests

Author: nscuro

pom.xml

@@ -68,6 +68,7 @@
         <lib.datanucleus-rdbms.version>6.0.8</lib.datanucleus-rdbms.version>
         <lib.junit-jupiter.version>5.11.0</lib.junit-jupiter.version>
         <lib.postgresql.version>42.7.4</lib.postgresql.version>
+        <lib.slf4j.version>2.0.16</lib.slf4j.version>
         <lib.testcontainers.version>1.20.1</lib.testcontainers.version>
 
         <!-- Default SCM Properties -->
@@ -127,6 +128,12 @@
                 <artifactId>postgresql</artifactId>
                 <version>${lib.testcontainers.version}</version>
             </dependency>
+
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-simple</artifactId>
+                <version>${lib.slf4j.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 

test/pom.xml

@@ -64,6 +64,12 @@
             <artifactId>postgresql</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-simple</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

test/src/main/java/io/github/nscuro/datanucleus/postgresql/test/model/Person.java

@@ -40,7 +40,7 @@ public class Person {
             @Extension(vendorName = "datanucleus", key = "insert-function", value = "(?::JSONB)"),
             @Extension(vendorName = "datanucleus", key = "update-function", value = "(?::JSONB)")
     })
-    private String propertiesJson;
+    private String properties;
 
     public long getId() {
         return id;
@@ -58,12 +58,12 @@ public void setName(final String name) {
         this.name = name;
     }
 
-    public String getPropertiesJson() {
-        return propertiesJson;
+    public String getProperties() {
+        return properties;
     }
 
-    public void setPropertiesJson(final String propertiesJson) {
-        this.propertiesJson = propertiesJson;
+    public void setProperties(final String properties) {
+        this.properties = properties;
     }
 
 }

test/src/test/java/io/github/nscuro/datanucleus/postgresql/method/JsonbContainsMethodTest.java

@@ -78,7 +78,7 @@ static void afterAll() {
     @Test
     void shouldMatchWithStringParameter() {
         final var person = new Person();
-        person.setPropertiesJson(/* language=JSON */ """
+        person.setProperties(/* language=JSON */ """
                 [
                   {
                     "foo": "bar",
@@ -89,7 +89,7 @@ void shouldMatchWithStringParameter() {
         pm.makePersistent(person);
 
         final Query<Person> query = pm.newQuery(Person.class);
-        query.setFilter("addressesJson.jsonbContains(:foo)");
+        query.setFilter("properties.jsonbContains(:foo)");
         query.setParameters("[{\"baz\":111}]");
 
         final Person queryResult = query.executeUnique();
@@ -99,7 +99,7 @@ void shouldMatchWithStringParameter() {
     @Test
     void shouldMatchWithStringLiteral() {
         final var person = new Person();
-        person.setPropertiesJson(/* language=JSON */ """
+        person.setProperties(/* language=JSON */ """
                 [
                   {
                     "foo": "bar",
@@ -110,7 +110,7 @@ void shouldMatchWithStringLiteral() {
         pm.makePersistent(person);
 
         final Query<Person> query = pm.newQuery(Person.class);
-        query.setFilter("addressesJson.jsonbContains('[{\"baz\":111}]')");
+        query.setFilter("properties.jsonbContains('[{\"baz\":111}]')");
 
         final Person queryResult = query.executeUnique();
         assertThat(queryResult).isNotNull();
@@ -119,7 +119,7 @@ void shouldMatchWithStringLiteral() {
     @Test
     void shouldThrowForNonJsonStringArgument() {
         final var person = new Person();
-        person.setPropertiesJson(/* language=JSON */ """
+        person.setProperties(/* language=JSON */ """
                 [
                   {
                     "foo": "bar",
@@ -130,7 +130,7 @@ void shouldThrowForNonJsonStringArgument() {
         pm.makePersistent(person);
 
         final Query<Person> query = pm.newQuery(Person.class);
-        query.setFilter("addressesJson.jsonbContains('not-json')");
+        query.setFilter("properties.jsonbContains('not-json')");
         query.setParameters(123);
 
         assertThatExceptionOfType(JDOException.class)
@@ -140,14 +140,14 @@ void shouldThrowForNonJsonStringArgument() {
                 .withMessage("""
                         ERROR: invalid input syntax for type json
                           Detail: Token "not" is invalid.
-                          Position: 189
+                          Position: 172
                           Where: JSON data, line 1: not...""");
     }
 
     @Test
     void shouldThrowForNonStringArgument() {
         final var person = new Person();
-        person.setPropertiesJson(/* language=JSON */ """
+        person.setProperties(/* language=JSON */ """
                 [
                   {
                     "foo": "bar",
@@ -158,7 +158,7 @@ void shouldThrowForNonStringArgument() {
         pm.makePersistent(person);
 
         final Query<Person> query = pm.newQuery(Person.class);
-        query.setFilter("addressesJson.jsonbContains(:foo)");
+        query.setFilter("properties.jsonbContains(:foo)");
         query.setParameters(123);
 
         assertThatExceptionOfType(JDOException.class)