From b9495b8d9fd25121ce1f11cdfe59363f1f1e5776 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 29 Dec 2018 22:42:41 +0000
Subject: [PATCH] differences between two file items fixed.
---
borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/BorgFilesystemItem.java | 4 +++-
borgbutler-core/src/test/java/de/micromata/borgbutler/DiffToolTest.java | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/BorgFilesystemItem.java b/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/BorgFilesystemItem.java
index 72ab6bb..61f6381 100644
--- a/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/BorgFilesystemItem.java
+++ b/borgbutler-core/src/main/java/de/micromata/borgbutler/json/borg/BorgFilesystemItem.java
@@ -32,10 +32,12 @@
@Setter
private String mode;
@Getter
+ @Setter
private String user;
@Getter
private String group;
@Getter
+ @Setter
private long uid;
@Getter
private long gid;
@@ -186,7 +188,7 @@
if (sb.length() > 0) {
sb.append(", ");
}
- sb.append(field + ": ['" + current + "' -> '" + other + "']");
+ sb.append(field + ":['" + other + "'->'" + current + "']");
}
@Override
diff --git a/borgbutler-core/src/test/java/de/micromata/borgbutler/DiffToolTest.java b/borgbutler-core/src/test/java/de/micromata/borgbutler/DiffToolTest.java
index 24a87c8..5fd2940 100644
--- a/borgbutler-core/src/test/java/de/micromata/borgbutler/DiffToolTest.java
+++ b/borgbutler-core/src/test/java/de/micromata/borgbutler/DiffToolTest.java
@@ -15,10 +15,12 @@
BorgFilesystemItem i1 = create("etc", true, "drwx------", 0, "2018-11-21");
BorgFilesystemItem i2 = create("etc", true, "drwx------", 0, "2018-11-21");
assertTrue(i1.equals(i2));
- i1.setType("-").setMode("drwxrwxrwx").setMtime("2018-11-22");
+ i1.setType("-").setMode("drwxrwxrwx").setMtime("2018-11-22").setUser("kai").setUid(501);
+ i2.setUser("root").setUid(0);
assertFalse(i1.equals(i2));
i1.setDiffItem(i2).buildDifferencesString();
- assertEquals("type:['d'->'-'], mode:['drwx------'->'drwxrwxrwx'], mtime:['2018-11-21'->'2018-11-22']", i1.getDifferences());
+ // Mode and mtime are not part of differences (they will be displayed especially in a separate column).
+ assertEquals("type:['d'->'-'], user:['root'->'kai'], uid:['0'->'501']", i1.getDifferences());
}
@Test
--
Gitblit v1.10.0