You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jdo-commits@db.apache.org by ti...@apache.org on 2025/03/02 16:44:48 UTC
(db-jdo) branch JDO-848-remove-XML-parser updated (7578cd61 -> 630c70e1)
This is an automated email from the ASF dual-hosted git repository.
tilmannz pushed a change to branch JDO-848-remove-XML-parser
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
from 7578cd61 MyLibTest w/o XML - WIP
new 70cd8733 Fixed concurrency issue when running ResultClassRequirementsMap query test
new b9c65a0a Fix query.conf failure
new 630c70e1 Fixed concurrency issue when running query.Variable test
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/jdo/tck/pc/mylib/MylibReader.java | 2 +-
tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java | 14 +++++++-------
.../java/org/apache/jdo/tck/query/result/Variable.java | 15 ++++++++-------
3 files changed, 16 insertions(+), 15 deletions(-)
(db-jdo) 02/03: Fix query.conf failure
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tilmannz pushed a commit to branch JDO-848-remove-XML-parser
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit b9c65a0a28278d7e89ea182ba6e5b2f9e2d52ad1
Author: Tilmann <zo...@gmx.de>
AuthorDate: Sun Mar 2 17:43:34 2025 +0100
Fix query.conf failure
---
tck/src/main/java/org/apache/jdo/tck/query/result/Variable.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/Variable.java b/tck/src/main/java/org/apache/jdo/tck/query/result/Variable.java
index fd9fb6ac..3e333878 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/Variable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/Variable.java
@@ -212,7 +212,7 @@ public class Variable extends QueryTest {
/** */
@SuppressWarnings("unchecked")
@Test
- @Execution(ExecutionMode.CONCURRENT)
+ //@Execution(ExecutionMode.CONCURRENT)
public void testNoNavigation() {
List<Employee> expected =
getTransientCompanyModelInstancesAsList(
@@ -296,7 +296,7 @@ public class Variable extends QueryTest {
/** */
@SuppressWarnings("unchecked")
@Test
- @Execution(ExecutionMode.CONCURRENT)
+ //@Execution(ExecutionMode.CONCURRENT)
public void testNavigationWithCompanyAndDepartmentAndEmployeeAndProject() {
Object expected =
Arrays.asList(
@@ -352,7 +352,7 @@ public class Variable extends QueryTest {
/** */
@SuppressWarnings("unchecked")
@Test
- @Execution(ExecutionMode.CONCURRENT)
+ //@Execution(ExecutionMode.CONCURRENT) // TODO this fixed it
public void testNavigationWithCompanyAndEmployeeAndProject() {
Object expected =
Arrays.asList(
@@ -652,7 +652,7 @@ public class Variable extends QueryTest {
/** */
@SuppressWarnings("unchecked")
@Test
- @Execution(ExecutionMode.CONCURRENT)
+ //@Execution(ExecutionMode.CONCURRENT)
public void testNavigationWithCompanyConstraint() {
Object expected =
Arrays.asList(
(db-jdo) 03/03: Fixed concurrency issue when running query.Variable test
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tilmannz pushed a commit to branch JDO-848-remove-XML-parser
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit 630c70e18e8112b3af4e30a35580dd32769db508
Author: Tilmann <zo...@gmx.de>
AuthorDate: Sun Mar 2 17:44:41 2025 +0100
Fixed concurrency issue when running query.Variable test
---
tck/src/main/java/org/apache/jdo/tck/query/result/Variable.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/result/Variable.java b/tck/src/main/java/org/apache/jdo/tck/query/result/Variable.java
index 3e333878..f2d54605 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/result/Variable.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/result/Variable.java
@@ -18,6 +18,7 @@
package org.apache.jdo.tck.query.result;
import java.util.Arrays;
+import java.util.Collections;
import java.util.List;
import javax.jdo.JDOQLTypedQuery;
import javax.jdo.PersistenceManager;
@@ -130,7 +131,7 @@ public class Variable extends QueryTest {
@Execution(ExecutionMode.CONCURRENT)
public void testDistinctNavigation() {
Object elem = new Object[] {Long.valueOf(1), "orange"};
- Object expected = Arrays.asList(elem);
+ Object expected = Collections.singletonList(elem);
PersistenceManager pm = getPMF().getPersistenceManager();
try {
JDOQLTypedQuery<Employee> query = pm.newJDOQLTypedQuery(Employee.class);
@@ -263,7 +264,7 @@ public class Variable extends QueryTest {
JDOQLTypedQuery<Department> query = pm.newJDOQLTypedQuery(Department.class);
QDepartment cand = QDepartment.candidate("this");
QEmployee e = QEmployee.variable("e");
- query.filter(cand.deptid.eq(2l).and(cand.employees.contains(e)));
+ query.filter(cand.deptid.eq(2L).and(cand.employees.contains(e)));
query.result(false, e);
// SELECT e FROM Department WHERE deptid==2 & employees.contains(e) VARIABLES Employee e
@@ -620,7 +621,7 @@ public class Variable extends QueryTest {
QDepartment cand = QDepartment.candidate("this");
QEmployee e = QEmployee.variable("e");
QProject p = QProject.variable("p");
- query.filter(cand.deptid.eq(1l).and(cand.employees.contains(e)).and(e.projects.contains(p)));
+ query.filter(cand.deptid.eq(1L).and(cand.employees.contains(e)).and(e.projects.contains(p)));
query.result(false, e, p);
QueryElementHolder<Department> holder =
(db-jdo) 01/03: Fixed concurrency issue when running ResultClassRequirementsMap query test
Posted by ti...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
tilmannz pushed a commit to branch JDO-848-remove-XML-parser
in repository https://gitbox.apache.org/repos/asf/db-jdo.git
commit 70cd873396f4e2a804f36a6015e66223dd8e0358
Author: Tilmann <zo...@gmx.de>
AuthorDate: Sun Mar 2 17:28:03 2025 +0100
Fixed concurrency issue when running ResultClassRequirementsMap query test
---
.../main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java | 2 +-
tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
index 68a04381..4a1f2ff1 100644
--- a/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
+++ b/tck/src/main/java/org/apache/jdo/tck/pc/mylib/MylibReader.java
@@ -45,7 +45,7 @@ public class MylibReader extends DefaultListableBeanFactory {
*
* @param resourceName the name of the resource
*/
- private MylibReader(String resourceName) {
+ public MylibReader(String resourceName) {
// Use the class loader of the PrimitiveTypes class to find the resource
this(resourceName, PrimitiveTypes.class.getClassLoader());
}
diff --git a/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java b/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
index ec9b4153..9c293070 100644
--- a/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
+++ b/tck/src/main/java/org/apache/jdo/tck/query/QueryTest.java
@@ -83,13 +83,13 @@ public abstract class QueryTest extends AbstractReaderTest {
* The mylib reader is used to read mylib instances from an XML file. Instances refered by this
* reader are made persistent by {@link QueryTest#loadAndPersistMylib(PersistenceManager)}.
*/
- private MylibReader2 mylibReaderForPersistentInstances;
+ private MylibReader mylibReaderForPersistentInstances;
/**
* The mylib reader is used to read mylib instances from an XML file. Instances refered by this
* reader are made persistent by
*/
- private MylibReader2 mylibReaderForTransientInstances;
+ private MylibReader mylibReaderForTransientInstances;
// Helper methods to create persistent PCPoint instances
@@ -205,9 +205,9 @@ public abstract class QueryTest extends AbstractReaderTest {
*
* @return the mylib reader for persistent instances.
*/
- private MylibReader2 getMylibReaderForPersistentInstances() {
+ private MylibReader getMylibReaderForPersistentInstances() {
if (mylibReaderForPersistentInstances == null) {
- mylibReaderForPersistentInstances = new MylibReader2(MYLIB_TESTDATA);
+ mylibReaderForPersistentInstances = new MylibReader(MYLIB_TESTDATA);
}
return mylibReaderForPersistentInstances;
}
@@ -217,9 +217,9 @@ public abstract class QueryTest extends AbstractReaderTest {
*
* @return the mylib reader for transient instances.
*/
- private MylibReader2 getMylibReaderForTransientInstances() {
+ private MylibReader getMylibReaderForTransientInstances() {
if (mylibReaderForTransientInstances == null) {
- mylibReaderForTransientInstances = new MylibReader2(MYLIB_TESTDATA);
+ mylibReaderForTransientInstances = new MylibReader(MYLIB_TESTDATA);
}
return mylibReaderForTransientInstances;
}
@@ -245,7 +245,7 @@ public abstract class QueryTest extends AbstractReaderTest {
* @param pm the PersistenceManager
* @return mylib reader
*/
- public MylibReader2 loadAndPersistMylib(PersistenceManager pm) {
+ public MylibReader loadAndPersistMylib(PersistenceManager pm) {
makePersistentAll(pm, getRootList(getMylibReaderForPersistentInstances()));
return getMylibReaderForPersistentInstances();
}