From 2d7754caeadbf322cebfaa764bfeb20d4d05710a Mon Sep 17 00:00:00 2001 From: soezen Date: Sat, 17 Oct 2020 10:18:52 +0200 Subject: [PATCH 1/6] Update PositionWithChanges.java # Fix #107 --- .../java/org/assertj/db/navigation/PositionWithChanges.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/assertj/db/navigation/PositionWithChanges.java b/src/main/java/org/assertj/db/navigation/PositionWithChanges.java index 42dc760e..df23b270 100644 --- a/src/main/java/org/assertj/db/navigation/PositionWithChanges.java +++ b/src/main/java/org/assertj/db/navigation/PositionWithChanges.java @@ -125,7 +125,7 @@ public E getChangesInstance(Changes changes, ChangeType changeType, String table } try { - Class clazz = Class.forName(myself.getClass().getName().replaceAll("\\$\\$.*", "")); + Class clazz = Class.forName(myself.getClass().getName().replaceAll("\\$.*", "")); Constructor constructor = actualElementClass.getDeclaredConstructor(clazz, Changes.class); instance = constructor.newInstance(myself, nextChanges); instance.as(getChangesDescription(changeType, tableName)); From 2927aecd90c95189cf94c532a77b04dc4b0fad59 Mon Sep 17 00:00:00 2001 From: soezen Date: Sat, 17 Oct 2020 10:43:36 +0200 Subject: [PATCH 2/6] Update SoftAssertions_Test.java --- src/test/java/org/assertj/db/api/SoftAssertions_Test.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/java/org/assertj/db/api/SoftAssertions_Test.java b/src/test/java/org/assertj/db/api/SoftAssertions_Test.java index b0315e73..149111a5 100644 --- a/src/test/java/org/assertj/db/api/SoftAssertions_Test.java +++ b/src/test/java/org/assertj/db/api/SoftAssertions_Test.java @@ -104,6 +104,7 @@ public void test_soft_assert_changes() { final SoftAssertions softly = new SoftAssertions(); softly.assertThat(changes).change().column("var1").hasValues(0); softly.assertThat(changes).change().rowAtStartPoint().changeOfModification().column("var1").hasValues(0); + softly.assertThat(changes).ofCreationOnTable("test").hasNumberOfChanges(1); assertThat(softly.wasSuccess()).isFalse(); assertThat(softly.errorsCollected()).hasSize(2); From 6b5f3cc4f16af6ee0f721c1156addc31a0e4a2ae Mon Sep 17 00:00:00 2001 From: soezen Date: Sat, 17 Oct 2020 10:44:22 +0200 Subject: [PATCH 3/6] revert changes, check failing test --- .../java/org/assertj/db/navigation/PositionWithChanges.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/assertj/db/navigation/PositionWithChanges.java b/src/main/java/org/assertj/db/navigation/PositionWithChanges.java index df23b270..42dc760e 100644 --- a/src/main/java/org/assertj/db/navigation/PositionWithChanges.java +++ b/src/main/java/org/assertj/db/navigation/PositionWithChanges.java @@ -125,7 +125,7 @@ public E getChangesInstance(Changes changes, ChangeType changeType, String table } try { - Class clazz = Class.forName(myself.getClass().getName().replaceAll("\\$.*", "")); + Class clazz = Class.forName(myself.getClass().getName().replaceAll("\\$\\$.*", "")); Constructor constructor = actualElementClass.getDeclaredConstructor(clazz, Changes.class); instance = constructor.newInstance(myself, nextChanges); instance.as(getChangesDescription(changeType, tableName)); From bc519b60dcb4ca3e242662bf3feccb262d3a819c Mon Sep 17 00:00:00 2001 From: soezen Date: Sat, 17 Oct 2020 13:50:11 +0200 Subject: [PATCH 4/6] Fix test --- src/test/java/org/assertj/db/api/SoftAssertions_Test.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/assertj/db/api/SoftAssertions_Test.java b/src/test/java/org/assertj/db/api/SoftAssertions_Test.java index 149111a5..83f30e5e 100644 --- a/src/test/java/org/assertj/db/api/SoftAssertions_Test.java +++ b/src/test/java/org/assertj/db/api/SoftAssertions_Test.java @@ -104,7 +104,7 @@ public void test_soft_assert_changes() { final SoftAssertions softly = new SoftAssertions(); softly.assertThat(changes).change().column("var1").hasValues(0); softly.assertThat(changes).change().rowAtStartPoint().changeOfModification().column("var1").hasValues(0); - softly.assertThat(changes).ofCreationOnTable("test").hasNumberOfChanges(1); + softly.assertThat(changes).ofModificationOnTable("test").hasNumberOfChanges(1); assertThat(softly.wasSuccess()).isFalse(); assertThat(softly.errorsCollected()).hasSize(2); From fbc67d6311f83035e5d45560f30b5087d8c8c7c4 Mon Sep 17 00:00:00 2001 From: soezen Date: Sat, 17 Oct 2020 13:50:53 +0200 Subject: [PATCH 5/6] Update PositionWithChanges.java --- .../java/org/assertj/db/navigation/PositionWithChanges.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/assertj/db/navigation/PositionWithChanges.java b/src/main/java/org/assertj/db/navigation/PositionWithChanges.java index 42dc760e..df23b270 100644 --- a/src/main/java/org/assertj/db/navigation/PositionWithChanges.java +++ b/src/main/java/org/assertj/db/navigation/PositionWithChanges.java @@ -125,7 +125,7 @@ public E getChangesInstance(Changes changes, ChangeType changeType, String table } try { - Class clazz = Class.forName(myself.getClass().getName().replaceAll("\\$\\$.*", "")); + Class clazz = Class.forName(myself.getClass().getName().replaceAll("\\$.*", "")); Constructor constructor = actualElementClass.getDeclaredConstructor(clazz, Changes.class); instance = constructor.newInstance(myself, nextChanges); instance.as(getChangesDescription(changeType, tableName)); From 514cad62a353b02ac9c48ba96e018ed6ca17e510 Mon Sep 17 00:00:00 2001 From: soezen Date: Sat, 17 Oct 2020 16:45:00 +0200 Subject: [PATCH 6/6] Update PositionWithChanges.java --- .../java/org/assertj/db/navigation/PositionWithChanges.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/assertj/db/navigation/PositionWithChanges.java b/src/main/java/org/assertj/db/navigation/PositionWithChanges.java index df23b270..e789f2a1 100644 --- a/src/main/java/org/assertj/db/navigation/PositionWithChanges.java +++ b/src/main/java/org/assertj/db/navigation/PositionWithChanges.java @@ -125,7 +125,7 @@ public E getChangesInstance(Changes changes, ChangeType changeType, String table } try { - Class clazz = Class.forName(myself.getClass().getName().replaceAll("\\$.*", "")); + Class clazz = unProxy(myself.getClass()); Constructor constructor = actualElementClass.getDeclaredConstructor(clazz, Changes.class); instance = constructor.newInstance(myself, nextChanges); instance.as(getChangesDescription(changeType, tableName));