Skip to content

Use Values#areEqual when looking for modified columns #331

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

Open
fl0rian-p wants to merge 1 commit into
base: main
Choose a base branch
from
+22 −9
Open

Use Values#areEqual when looking for modified columns #331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 1 addition & 4 deletions src/main/java/org/assertj/db/util/Changes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,9 @@ public static Integer[] getIndexesOfModifiedColumns(Change change) {
int index = 0;
for (Value valueAtStartPoint : valuesListAtStartPoint) {
Value valueAtEndPoint = iteratorAtEndPoint.next();
Object objectAtStartPoint = valueAtStartPoint.getValue();
Object objectAtEndPoint = valueAtEndPoint.getValue();

if ((objectAtStartPoint == null && objectAtEndPoint != null) ||
(objectAtStartPoint != null && !objectAtStartPoint.equals(objectAtEndPoint))) {

if (!Values.areEqual(valueAtStartPoint, objectAtEndPoint)) {
indexesList.add(index);
}
index++;
Expand Down
26 changes: 21 additions & 5 deletions src/test/java/org/assertj/db/util/Changes_GetIndexesOfModifiedColumns_Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,17 +43,31 @@ public void test_get_indexes_of_modified_columns() throws Exception {

Change modificationChange = getChange(DataType.TABLE, "test", ChangeType.MODIFICATION,
getRow(Arrays.asList("var1"),
Arrays.asList("var1", "var2", "var3", "var4"),
Arrays.asList("var1", "var2", "var3", "var4", "var11"),
Arrays.asList(getValue("var1", 1),
getValue("var2", null),
getValue("var3", "text1"),
getValue("var4", null))),
getValue("var4", null),
getValue("var11", "bytes".getBytes()))),
getRow(Arrays.asList("var1"),
Arrays.asList("var1", "var2", "var3", "var4"),
Arrays.asList("var1", "var2", "var3", "var4", "var11"),
Arrays.asList(getValue("var1", 1),
getValue("var2", "test"),
getValue("var3", null),
getValue("var4", null))));
getValue("var4", null),
getValue("var11", "bytes".getBytes()))));

Change modificationWithActualBytesChange = getChange(DataType.TABLE, "test", ChangeType.MODIFICATION,
getRow(Arrays.asList("var1"),
Arrays.asList("var1", "var2", "var11"),
Arrays.asList(getValue("var1", 1),
getValue("var2", "value"),
getValue("var11", "before".getBytes()))),
getRow(Arrays.asList("var1"),
Arrays.asList("var1", "var2", "var11"),
Arrays.asList(getValue("var1", 1),
getValue("var2", "value"),
getValue("var11", "after".getBytes()))));

Change deletionChange = getChange(DataType.TABLE, "test", ChangeType.DELETION,
getRow(Arrays.asList("var1"),
Expand All @@ -65,10 +79,12 @@ public void test_get_indexes_of_modified_columns() throws Exception {

Integer[] creationIndexes = Changes.getIndexesOfModifiedColumns(creationChange);
Integer[] modificationIndexes = Changes.getIndexesOfModifiedColumns(modificationChange);
Integer[] modificationWithActualBytesIndexes = Changes.getIndexesOfModifiedColumns(modificationWithActualBytesChange);
Integer[] deletionIndexes = Changes.getIndexesOfModifiedColumns(deletionChange);

Assertions.assertThat(creationIndexes).contains(0, 1);
Assertions.assertThat(modificationIndexes).contains(1, 2);
Assertions.assertThat(modificationIndexes).containsOnly(1, 2);
Assertions.assertThat(modificationWithActualBytesIndexes).containsOnly(2);
Assertions.assertThat(deletionIndexes).contains(0, 1);
}
}