Skip to content
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

Bump org.assertj:assertj-core from 3.11.1 to 3.24.2 #982

Merged
merged 2 commits into from
Oct 16, 2023
Merged

Bump org.assertj:assertj-core from 3.11.1 to 3.24.2 #982

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45b2352
Bump org.assertj:assertj-core from 3.11.1 to 3.24.2
dependabot[bot] Oct 9, 2023
9412c19
Adapt to changes in AssertJ.
michael-simons Oct 16, 2023
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
4 changes: 2 additions & 2 deletions ...gm-integration-tests/src/test/java/org/neo4j/ogm/persistence/model/ArraysMappingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ void shouldSerializeNativeByteArrays() {

byte[] primitive = {1, 2, 3, 4, 5};
Byte[] wrapped = {9, 8, 7, 6, 5};
byte[] helloWorld = {104, 101, 108, 108, 111, 64, 119, 111, 114, 108, 100};

EntityWithNativeByteArrays entityWithNativeByteArrays = new EntityWithNativeByteArrays();
entityWithNativeByteArrays.setPrimitive(primitive);
Expand All @@ -163,7 +162,8 @@ void shouldSerializeNativeByteArrays() {
String someTuple = new String(getBytes(result.get("someTuple")), StandardCharsets.UTF_8);

assertThat(primitiveArray).isEqualTo(primitive);
assertThat(wrappedArray).isEqualTo(wrapped);
assertThat(wrappedArray).containsExactly(wrapped);

assertThat(someTuple).isEqualTo("hello@world");
}

Expand Down
5 changes: 3 additions & 2 deletions ...ntegration-tests/src/test/java/org/neo4j/ogm/persistence/model/EntityGraphMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -866,7 +866,7 @@ void shouldNotMessUpNestedLists() {
assertThat(nestedLists).isInstanceOf(Long[][].class);

Long[][] columns = (Long[][]) nestedLists;
assertThat(columns).hasSize(4);
assertThat(columns.length).isEqualTo(4);
assertThat(columns[0]).isInstanceOf(Long[].class)
.satisfies(c -> assertThat(((Long[]) c)).containsExactly(0L, 1L, 2L));
assertThat(columns[1]).isInstanceOf(Long[].class)
Expand Down Expand Up @@ -938,7 +938,8 @@ void shouldNotMessUpMixedTypedLists() {

assertThat(row.get("n"))
.isInstanceOf(Teacher.class)
.extracting("name").first().isEqualTo("Jim");
.extracting("name")
.isEqualTo("Jim");
});
}

Expand Down
6 changes: 3 additions & 3 deletions ...egration-tests/src/test/java/org/neo4j/ogm/persistence/model/RelationshipMappingTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,7 +586,7 @@ void patternComprehensionShouldBeMappedToCorrectRelationships() {
// GH-666
@Test
void shouldNotMessUpNodes() {
assertMapping(MessedUpNode1.class, node -> node.getRef(), false);
assertMapping(MessedUpNode1.class, MessedUpNode1::getRef, false);
}

// GH-666
Expand Down Expand Up @@ -637,9 +637,9 @@ private static void assertCorrectRelationShip(Iterable<Map<String, Object>> resu
assertThat(result).allSatisfy(row -> {
assertThat(row).containsKeys("n1");
if (expectedNode != null) {
assertThat(row.get("n1")).extracting("ref").extracting("id").containsExactly(expectedNode.getId());
assertThat(row.get("n1")).extracting("ref").extracting("id").isEqualTo(expectedNode.getId());
} else {
assertThat(row.get("n1")).extracting("ref").hasSize(1).containsOnlyNulls();
assertThat(row.get("n1")).extracting("ref").isNull();
}
});
}
Expand Down
3 changes: 2 additions & 1 deletion ...sts/neo4j-ogm-integration-tests/src/test/kotlin/org/neo4j/ogm/kotlin/KotlinInteropTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,8 @@ class KotlinInteropTest {

val nameFilter = Filter("userId", ComparisonOperator.EQUALS, userId).ignoreCase()
val loadedUsers = sessionFactory.openSession().loadAll(User::class.java, nameFilter);
assertThat(loadedUsers).hasSize(1).extracting<StringID>(User::userId).containsOnly(userId)
assertThat(loadedUsers).hasSize(1);
assertThat(loadedUsers).first().extracting(User::userId).isEqualTo(userId)

val loadedUser = sessionFactory.openSession().queryForObject<User>("MATCH (u:User) RETURN u", mapOf(Pair("userId", userId)))!!
assertThat(loadedUser).isNotNull().extracting {user -> user.userId}.isEqualTo(userId)
Expand Down
10 changes: 9 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@
<java-module-name></java-module-name> <!-- to be overridden in sub modules -->
<java.version>17</java.version>

<assertj.version>3.11.1</assertj.version>
<assertj.version>3.24.2</assertj.version>
<caffeine.version>3.1.8</caffeine.version>
<checkstyle.version>10.12.4</checkstyle.version>
<commons-codec.version>1.11</commons-codec.version>
Expand Down Expand Up @@ -226,6 +226,7 @@
<maven.compiler.parameters>true</maven.compiler.parameters>
<maven.compiler.release>${java.version}</maven.compiler.release>
<jakarta.activation.version>1.2.2</jakarta.activation.version>
<byte-buddy.version>1.14.8</byte-buddy.version>
</properties>

<dependencyManagement>
Expand Down Expand Up @@ -332,6 +333,13 @@
<artifactId>reactive-streams</artifactId>
<version>${reactive-streams.version}</version>
</dependency>

<!-- AssertJ and mockk-jvm have different versions -->
<dependency>
<groupId>net.bytebuddy</groupId>
<artifactId>byte-buddy</artifactId>
<version>${byte-buddy.version}</version>
</dependency>
</dependencies>
</dependencyManagement>

Expand Down
Loading