From 3a9e112fe76e7dfa9152ecbf914e30196ed77f4a Mon Sep 17 00:00:00 2001 From: Radek Felcman Date: Thu, 27 Feb 2025 10:29:11 +0100 Subject: [PATCH] Random JPA WDF test failures - TestFlush and TestGetReference entity collisions (#2372) Signed-off-by: Radek Felcman --- .../wdf/jpa1/entitymanager/TestFlush.java | 18 +++++++++--------- .../jpa1/entitymanager/TestGetReference.java | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFlush.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFlush.java index ffb61ebaee1..ff307320cd5 100644 --- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFlush.java +++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestFlush.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2025 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2015 SAP. All rights reserved. * * This program and the accompanying materials are made available under the @@ -49,9 +49,9 @@ public void testRelationshipToNew() { EntityManager em = env.getEntityManager(); try { // case 1: direct relationship Employee -> Cubicle (new) - 1:1 - Department dep = new Department(1, "dep"); - Employee emp1 = new Employee(2, "first", "last", dep); - Cubicle cub1 = new Cubicle(3, 3, "color", emp1); + Department dep = new Department(501, "dep"); + Employee emp1 = new Employee(502, "first", "last", dep); + Cubicle cub1 = new Cubicle(503, 503, "color", emp1); emp1.setCubicle(cub1); env.beginTransaction(em); em.persist(dep); @@ -79,8 +79,8 @@ public void testRelationshipToNew() { verify(!env.isTransactionActive(em), "Transaction still active"); verify(flushFailed, "flush succeeded although there is a relation to an unmanaged entity"); // case 2: direct relationship Employee -> Project (new) - n:m - dep = new Department(4, "dep"); - emp1 = new Employee(5, "first", "last", dep); + dep = new Department(504, "dep"); + emp1 = new Employee(505, "first", "last", dep); Project proj = new Project("project"); Set emp1Projects = new HashSet(); emp1Projects.add(proj); @@ -114,9 +114,9 @@ public void testRelationshipToNew() { verify(!env.isTransactionActive(em), "Transaction still active"); verify(flushFailed, "flush succeeded although there is a relation to an unmanaged entity"); // case 3: indirect relationship Employee -> Project -> Employee (new) - dep = new Department(7, "dep"); - emp1 = new Employee(8, "first1", "last1", dep); - Employee emp2 = new Employee(9, "first2", "last2", dep); + dep = new Department(507, "dep"); + emp1 = new Employee(508, "first1", "last1", dep); + Employee emp2 = new Employee(509, "first2", "last2", dep); proj = new Project("project"); emp1Projects = new HashSet(); emp1Projects.add(proj); diff --git a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestGetReference.java b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestGetReference.java index 310567200e5..c923d06ef35 100644 --- a/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestGetReference.java +++ b/jpa/eclipselink.jpa.wdf.test/src/it/java/org/eclipse/persistence/testing/tests/wdf/jpa1/entitymanager/TestGetReference.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2021 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2025 Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, 2015 SAP. All rights reserved. * * This program and the accompanying materials are made available under the @@ -187,7 +187,7 @@ public void testNegativ() { boolean operationFailed = false; env.beginTransaction(em); try { - employee = em.getReference(Employee.class, 17 + 4); + employee = em.getReference(Employee.class, 741); // does not exist } catch (EntityNotFoundException e) { // $JL-EXC$ expected behavior operationFailed = true;