This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cayenne.git
The following commit(s) were added to refs/heads/master by this push:
new 2cbd704e9 tests cleanup
2cbd704e9 is described below
commit 2cbd704e9ea50ca92a3119979a5a6c19c3e7393a
Author: Andrus Adamchik <[email protected]>
AuthorDate: Sat May 16 15:23:29 2026 -0400
tests cleanup
---
.../java/org/apache/cayenne/CayenneDOTestBase.java | 7 ++--
.../test/java/org/apache/cayenne/CayenneIT.java | 39 ++++++++++------------
.../CayennePersistentObjectFlattenedRelIT.java | 21 ++++++------
.../apache/cayenne/CayennePersistentObjectIT.java | 30 ++++++++---------
.../CayennePersistentObjectInContextIT.java | 7 +---
.../CayennePersistentObjectRelationshipsIT.java | 22 +++++-------
6 files changed, 53 insertions(+), 73 deletions(-)
diff --git a/cayenne/src/test/java/org/apache/cayenne/CayenneDOTestBase.java
b/cayenne/src/test/java/org/apache/cayenne/CayenneDOTestBase.java
index a638a8b46..af299abb7 100644
--- a/cayenne/src/test/java/org/apache/cayenne/CayenneDOTestBase.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CayenneDOTestBase.java
@@ -1,5 +1,3 @@
-package org.apache.cayenne;
-
/*****************************************************************
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -18,6 +16,7 @@ package org.apache.cayenne;
* specific language governing permissions and limitations
* under the License.
****************************************************************/
+package org.apache.cayenne;
import org.apache.cayenne.query.ObjectSelect;
import org.apache.cayenne.testdo.testmap.Artist;
@@ -72,13 +71,13 @@ public abstract class CayenneDOTestBase {
protected Painting fetchPainting() {
List<Painting> pts = ObjectSelect.query(Painting.class,
Painting.PAINTING_TITLE.eq(paintingName)).select(context);
- return (pts.size() > 0) ? pts.get(0) : null;
+ return (!pts.isEmpty()) ? pts.getFirst() : null;
}
protected PaintingInfo fetchPaintingInfo() {
// we are using "LIKE" comparison, since Sybase does not allow
// "=" comparisons on "text" columns
List<PaintingInfo> pts = ObjectSelect.query(PaintingInfo.class,
PaintingInfo.TEXT_REVIEW.like(textReview)).select(context);
- return (pts.size() > 0) ? pts.get(0) : null;
+ return !pts.isEmpty() ? pts.getFirst() : null;
}
}
diff --git a/cayenne/src/test/java/org/apache/cayenne/CayenneIT.java
b/cayenne/src/test/java/org/apache/cayenne/CayenneIT.java
index ba65c0778..5f4ba188c 100644
--- a/cayenne/src/test/java/org/apache/cayenne/CayenneIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CayenneIT.java
@@ -42,11 +42,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
public class CayenneIT {
@@ -115,7 +111,7 @@ public class CayenneIT {
Object object = Cayenne.objectForQuery(env.context(), query);
assertNotNull(object);
- assertTrue(object instanceof Number);
+ assertInstanceOf(Number.class, object);
assertEquals(2, ((Number) object).intValue());
}
@@ -127,8 +123,7 @@ public class CayenneIT {
EJBQLQuery query = new EJBQLQuery(ejbql);
Object object = Cayenne.objectForQuery(env.context(), query);
assertNotNull(object);
- assertTrue(object instanceof Number,
- "Object class: " + object.getClass().getName());
+ assertInstanceOf(Number.class, object, "Object class: " +
object.getClass().getName());
assertEquals(2, ((Number) object).intValue());
}
@@ -150,7 +145,7 @@ public class CayenneIT {
Object object = Cayenne.objectForQuery(env.context(), new
ObjectIdQuery(id));
assertNotNull(object);
- assertTrue(object instanceof Artist);
+ assertInstanceOf(Artist.class, object);
assertEquals("artist2", ((Artist) object).getArtistName());
}
@@ -167,7 +162,7 @@ public class CayenneIT {
}
@Test
- public void objectForQueryNoObject() throws Exception {
+ public void objectForQueryNoObject() {
ObjectId id = ObjectId.of("Artist", Artist.ARTIST_ID_PK_COLUMN, 44001);
@@ -185,7 +180,7 @@ public class CayenneIT {
}
@Test
- public void objectForPKTemporary() throws Exception {
+ public void objectForPKTemporary() {
Persistent o1 = env.context().newObject(Artist.class);
Persistent o2 = env.context().newObject(Artist.class);
@@ -205,7 +200,7 @@ public class CayenneIT {
33002));
assertNotNull(object);
- assertTrue(object instanceof Artist);
+ assertInstanceOf(Artist.class, object);
assertEquals("artist2", ((Artist) object).getArtistName());
}
@@ -213,11 +208,11 @@ public class CayenneIT {
public void objectForPKClassInt() throws Exception {
createOneArtist();
- Object object = Cayenne.objectForPK(env.context(), Artist.class,
33002);
+ Artist object = Cayenne.objectForPK(env.context(), Artist.class,
33002);
assertNotNull(object);
- assertTrue(object instanceof Artist);
- assertEquals("artist2", ((Artist) object).getArtistName());
+ assertInstanceOf(Artist.class, object);
+ assertEquals("artist2", object.getArtistName());
}
@Test
@@ -227,7 +222,7 @@ public class CayenneIT {
Object object = Cayenne.objectForPK(env.context(), "Artist", 33002);
assertNotNull(object);
- assertTrue(object instanceof Artist);
+ assertInstanceOf(Artist.class, object);
assertEquals("artist2", ((Artist) object).getArtistName());
}
@@ -238,11 +233,11 @@ public class CayenneIT {
Map<String, Integer> pk = Collections.singletonMap(
Artist.ARTIST_ID_PK_COLUMN,
33002);
- Object object = Cayenne.objectForPK(env.context(), Artist.class, pk);
+ Artist object = Cayenne.objectForPK(env.context(), Artist.class, pk);
assertNotNull(object);
- assertTrue(object instanceof Artist);
- assertEquals("artist2", ((Artist) object).getArtistName());
+ assertTrue(true);
+ assertEquals("artist2", object.getArtistName());
}
@Test
@@ -251,7 +246,7 @@ public class CayenneIT {
List<Artist> objects =
ObjectSelect.query(Artist.class).select(env.context());
assertEquals(1, objects.size());
- Persistent object = objects.get(0);
+ Persistent object = objects.getFirst();
assertEquals(33002, Cayenne.intPKForObject(object));
}
@@ -262,7 +257,7 @@ public class CayenneIT {
List<Artist> objects =
ObjectSelect.query(Artist.class).select(env.context());
assertEquals(1, objects.size());
- Persistent object = objects.get(0);
+ Persistent object = objects.getFirst();
assertEquals(33002L, Cayenne.pkForObject(object));
}
@@ -273,7 +268,7 @@ public class CayenneIT {
List<?> objects = env.context().performQuery(new EJBQLQuery("select a
from Artist a"));
assertEquals(1, objects.size());
- Artist object = (Artist) objects.get(0);
+ Artist object = (Artist) objects.getFirst();
assertEquals(33002L, Cayenne.pkForObject(object));
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java
b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java
index 36aa657be..9974cf755 100644
---
a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectFlattenedRelIT.java
@@ -92,8 +92,8 @@ public class CayennePersistentObjectFlattenedRelIT {
List<ArtGroup> groupList = a1.getGroupArray();
assertNotNull(groupList);
assertEquals(1, groupList.size());
- assertEquals(PersistenceState.COMMITTED,
groupList.get(0).getPersistenceState());
- assertEquals("g1", groupList.get(0).getName());
+ assertEquals(PersistenceState.COMMITTED,
groupList.getFirst().getPersistenceState());
+ assertEquals("g1", groupList.getFirst().getName());
}
@Test
@@ -108,13 +108,13 @@ public class CayennePersistentObjectFlattenedRelIT {
assertEquals(1, results.size());
assertFalse(env.context().hasChanges());
- ArtGroup group = results.get(0);
+ ArtGroup group = results.getFirst();
a1.addToGroupArray(group);
assertTrue(env.context().hasChanges());
List<?> groupList = a1.getGroupArray();
assertEquals(1, groupList.size());
- assertEquals("g1", ((ArtGroup) groupList.get(0)).getName());
+ assertEquals("g1", ((ArtGroup) groupList.getFirst()).getName());
// Ensure that the commit doesn't fail
a1.getObjectContext().commitChanges();
@@ -127,7 +127,7 @@ public class CayennePersistentObjectFlattenedRelIT {
a1 = Cayenne.objectForPK(context2, Artist.class, 33001);
groupList = a1.getGroupArray();
assertEquals(1, groupList.size());
- assertEquals("g1", ((ArtGroup) groupList.get(0)).getName());
+ assertEquals("g1", ((ArtGroup) groupList.getFirst()).getName());
}
// Test case to show up a bug in committing more than once
@@ -140,12 +140,12 @@ public class CayennePersistentObjectFlattenedRelIT {
List<ArtGroup> results = ObjectSelect.query(ArtGroup.class,
ArtGroup.NAME.eq("g1")).select(env.context());
assertEquals(1, results.size());
- ArtGroup group = results.get(0);
+ ArtGroup group = results.getFirst();
a1.addToGroupArray(group);
List<?> groupList = a1.getGroupArray();
assertEquals(1, groupList.size());
- assertEquals("g1", ((ArtGroup) groupList.get(0)).getName());
+ assertEquals("g1", ((ArtGroup) groupList.getFirst()).getName());
// Ensure that the commit doesn't fail
a1.getObjectContext().commitChanges();
@@ -160,7 +160,7 @@ public class CayennePersistentObjectFlattenedRelIT {
Artist a1 = Cayenne.objectForPK(env.context(), Artist.class, 33001);
- ArtGroup group = a1.getGroupArray().get(0);
+ ArtGroup group = a1.getGroupArray().getFirst();
a1.removeFromGroupArray(group);
List<ArtGroup> groupList = a1.getGroupArray();
@@ -182,7 +182,7 @@ public class CayennePersistentObjectFlattenedRelIT {
create1Artist1ArtGroup1ArtistGroupDataSet();
Artist a1 = Cayenne.objectForPK(env.context(), Artist.class, 33001);
- ArtGroup group = a1.getGroupArray().get(0);
+ ArtGroup group = a1.getGroupArray().getFirst();
a1.removeFromGroupArray(group); // Cause the delete of the link record
env.context().deleteObjects(a1); // Cause the deletion of the artist
@@ -197,10 +197,9 @@ public class CayennePersistentObjectFlattenedRelIT {
Artist a1 = Cayenne.objectForPK(env.context(), Artist.class, 33001);
List<ArtGroup> results = ObjectSelect.query(ArtGroup.class,
ArtGroup.NAME.eq("g1")).select(env.context());
- ;
assertEquals(1, results.size());
- ArtGroup group = results.get(0);
+ ArtGroup group = results.getFirst();
a1.addToGroupArray(group);
group.removeFromArtistArray(a1);
diff --git
a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectIT.java
b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectIT.java
index 30dcae561..a79bacd58 100644
--- a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectIT.java
+++ b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectIT.java
@@ -61,7 +61,7 @@ public class CayennePersistentObjectIT {
}
@Test
- public void readNestedProperty1() throws Exception {
+ public void readNestedProperty1() {
Artist a = new Artist();
assertNull(a.readNestedProperty("artistName"));
a.setArtistName("aaa");
@@ -69,7 +69,7 @@ public class CayennePersistentObjectIT {
}
@Test
- public void readNestedPropertyNotPersistentString() throws Exception {
+ public void readNestedPropertyNotPersistentString() {
Artist a = new Artist();
assertNull(a.readNestedProperty("someOtherProperty"));
a.setSomeOtherProperty("aaa");
@@ -77,7 +77,7 @@ public class CayennePersistentObjectIT {
}
@Test
- public void readNestedPropertyNonPersistentNotString() throws Exception {
+ public void readNestedPropertyNonPersistentNotString() {
Artist a = new Artist();
Object object = new Object();
assertNull(a.readNestedProperty("someOtherObjectProperty"));
@@ -100,7 +100,7 @@ public class CayennePersistentObjectIT {
@SuppressWarnings("unchecked")
@Test
- public void readNestedPropertyToManyInMiddle() throws Exception {
+ public void readNestedPropertyToManyInMiddle() {
Artist a = env.context().newObject(Artist.class);
ArtistExhibit ex = env.context().newObject(ArtistExhibit.class);
@@ -113,17 +113,16 @@ public class CayennePersistentObjectIT {
ex.setToArtist(a);
List<String> names = (List<String>)
a.readNestedProperty("paintingArray.paintingTitle");
- assertEquals(names.size(), 2);
- assertEquals(names.get(0), "p1");
- assertEquals(names.get(1), "p2");
+ assertEquals(2, names.size());
+ assertEquals("p1", names.get(0));
+ assertEquals("p2", names.get(1));
List<String> names2 = (List<String>)
ex.readNestedProperty("toArtist.paintingArray.paintingTitle");
assertEquals(names, names2);
}
- @SuppressWarnings("unchecked")
@Test
- public void readNestedPropertyToManyInMiddle1() throws Exception {
+ public void readNestedPropertyToManyInMiddle1() {
Artist a = env.context().newObject(Artist.class);
ArtistExhibit ex = env.context().newObject(ArtistExhibit.class);
@@ -136,9 +135,9 @@ public class CayennePersistentObjectIT {
ex.setToArtist(a);
List<String> names = (List<String>)
a.readNestedProperty("paintingArray+.paintingTitle");
- assertEquals(names.size(), 2);
- assertEquals(names.get(0), "p1");
- assertEquals(names.get(1), "p2");
+ assertEquals(2, names.size());
+ assertEquals("p1", names.get(0));
+ assertEquals("p2", names.get(1));
List<String> names2 = (List<String>)
ex.readNestedProperty("toArtist.paintingArray+.paintingTitle");
assertEquals(names, names2);
@@ -147,7 +146,7 @@ public class CayennePersistentObjectIT {
@Test
public void filterObjects() {
- List<Painting> paintingList = new ArrayList<Painting>();
+ List<Painting> paintingList = new ArrayList<>();
Painting p1 = env.context().newObject(Painting.class);
Artist a1 = env.context().newObject(Artist.class);
a1.setArtistName("dddAd");
@@ -157,13 +156,13 @@ public class CayennePersistentObjectIT {
Expression exp = ExpressionFactory.likeExp("toArtist+.artistName",
"d%");
List<Painting> rezult = exp.filterObjects(paintingList);
- assertEquals(a1, rezult.get(0).getToArtist());
+ assertEquals(a1, rezult.getFirst().getToArtist());
}
@Test
public void filterObjectsResultIsMutable() {
- List<Artist> artistList = new ArrayList<Artist>();
+ List<Artist> artistList = new ArrayList<>();
Artist a = env.context().newObject(Artist.class);
a.setArtistName("Pablo");
@@ -172,6 +171,5 @@ public class CayennePersistentObjectIT {
List<Artist> result = exp.filterObjects(artistList);
assertTrue(result.isEmpty());
result.add(a); // list should be mutable
- assertTrue(!result.isEmpty());
}
}
diff --git
a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectInContextIT.java
b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectInContextIT.java
index 1344e60d3..400d08bb8 100644
---
a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectInContextIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectInContextIT.java
@@ -197,7 +197,7 @@ public class CayennePersistentObjectInContextIT {
List<Artist> artists = ObjectSelect.query(Artist.class,
Artist.ARTIST_NAME.eq("m6")).select(context);
assertEquals(1, artists.size());
- Artist o1 = artists.get(0);
+ Artist o1 = artists.getFirst();
assertNotNull(o1);
assertEquals("m6", o1.getArtistName());
}
@@ -269,11 +269,6 @@ public class CayennePersistentObjectInContextIT {
.getVersion(), artist.getSnapshotVersion());
}
- /**
- * Tests a condition when user substitutes object id of a new object
instead of
- * setting replacement. This is demonstrated here -
- * http://objectstyle.org/cayenne/lists/cayenne-user/2005/01/0210.html
- */
@Test
public void objectsCommittedManualOID() {
diff --git
a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectRelationshipsIT.java
b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectRelationshipsIT.java
index de9b88232..fc2564259 100644
---
a/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectRelationshipsIT.java
+++
b/cayenne/src/test/java/org/apache/cayenne/CayennePersistentObjectRelationshipsIT.java
@@ -36,13 +36,7 @@ import org.junit.jupiter.api.Test;
import java.util.List;
-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.assertNull;
-import static org.junit.jupiter.api.Assertions.assertSame;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.*;
public class CayennePersistentObjectRelationshipsIT {
@@ -91,7 +85,7 @@ public class CayennePersistentObjectRelationshipsIT {
createArtistWithPaintingDataSet();
Painting p1 = Cayenne.objectForPK(env.context(), Painting.class, 6);
- assertTrue(p1.getToArtist().readNestedProperty("paintingArray")
instanceof List<?>);
+ assertInstanceOf(List.class,
p1.getToArtist().readNestedProperty("paintingArray"));
}
@Test
@@ -106,7 +100,7 @@ public class CayennePersistentObjectRelationshipsIT {
List<Painting> paintings = a1.getPaintingArray();
assertEquals(1, paintings.size());
- Painting p2 = paintings.get(0);
+ Painting p2 = paintings.getFirst();
assertSame(p1, p2);
}
@@ -158,8 +152,8 @@ public class CayennePersistentObjectRelationshipsIT {
assertNotNull(plist);
assertEquals(1, plist.size());
- assertEquals(PersistenceState.COMMITTED,
plist.get(0).getPersistenceState());
- assertEquals("pW", plist.get(0).getPaintingTitle());
+ assertEquals(PersistenceState.COMMITTED,
plist.getFirst().getPersistenceState());
+ assertEquals("pW", plist.getFirst().getPaintingTitle());
}
@Test
@@ -293,12 +287,12 @@ public class CayennePersistentObjectRelationshipsIT {
}
@Test
- public void newToMany() throws Exception {
+ public void newToMany() {
Artist artist = env.context().newObject(Artist.class);
artist.setArtistName("test");
- assertTrue(artist.readPropertyDirectly("paintingArray") instanceof
ToManyList);
+ assertInstanceOf(ToManyList.class,
artist.readPropertyDirectly("paintingArray"));
- ToManyList list = (ToManyList)
artist.readPropertyDirectly("paintingArray");
+ ToManyList<?> list = (ToManyList<?>)
artist.readPropertyDirectly("paintingArray");
assertFalse(list.isFault());
env.context().commitChanges();
