It's a long way, but is it also useful?

Kai Reinhard

28.10.2018 34de8e3ff4872c7e48e78d1fa102aa029ac2b261

 borgbutler-core/src/test/java/de/micromata/borgbutler/DiffToolTest.java

@@ -1,6 +1,6 @@
package de.micromata.borgbutler;

import de.micromata.borgbutler.json.borg.BorgFilesystemItem;
import de.micromata.borgbutler.cache.FilesystemItem;
import org.junit.jupiter.api.Test;

import java.util.ArrayList;
@@ -12,8 +12,8 @@
public class DiffToolTest {
    @Test
    void differencesTest() {
        BorgFilesystemItem i1 = create("etc", true, "drwx------", 0, "2018-11-21");
        BorgFilesystemItem i2 = create("etc", true, "drwx------", 0, "2018-11-21");
        FilesystemItem i1 = create("etc", true, "drwx------", 0, "2018-11-21");
        FilesystemItem i2 = create("etc", true, "drwx------", 0, "2018-11-21");
        assertTrue(i1.equals(i2));
        i1.setType("-").setMode("drwxrwxrwx").setMtime("2018-11-22");
        assertFalse(i1.equals(i2));
@@ -23,19 +23,19 @@

    @Test
    void diffToolTest() {
        List<BorgFilesystemItem> l1 = null;
        List<BorgFilesystemItem> l2 = null;
        List<BorgFilesystemItem> result;
        List<FilesystemItem> l1 = null;
        List<FilesystemItem> l2 = null;
        List<FilesystemItem> result;
        assertEquals(0, DiffTool.extractDifferences(l1, l2).size());
        l1 = create();
        result = DiffTool.extractDifferences(l1, l2);
        assertEquals(7, result.size());
        assertEquals(BorgFilesystemItem.DiffStatus.NEW, result.get(0).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.NEW, result.get(1).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.NEW, result.get(0).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.NEW, result.get(1).getDiffStatus());
        result = DiffTool.extractDifferences(l2, l1);
        assertEquals(7, result.size());
        assertEquals(BorgFilesystemItem.DiffStatus.REMOVED, result.get(0).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.REMOVED, result.get(1).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.REMOVED, result.get(0).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.REMOVED, result.get(1).getDiffStatus());

        l1 = create();
        l2 = create();
@@ -47,17 +47,17 @@
        get(l1, "home/kai/.borgbutler/borgbutler-config.json").setSize(712).setMtime("2018-11-22"); // 3
        result = DiffTool.extractDifferences(l1, l2);
        assertEquals(4, result.size());
        assertEquals(BorgFilesystemItem.DiffStatus.NEW, result.get(0).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.NEW, result.get(1).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.REMOVED, result.get(2).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.MODIFIED, result.get(3).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.NEW, result.get(0).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.NEW, result.get(1).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.REMOVED, result.get(2).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.MODIFIED, result.get(3).getDiffStatus());

        result = DiffTool.extractDifferences(l2, l1);
        assertEquals(4, result.size());
        assertEquals(BorgFilesystemItem.DiffStatus.REMOVED, result.get(0).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.REMOVED, result.get(1).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.NEW, result.get(2).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.MODIFIED, result.get(3).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.REMOVED, result.get(0).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.REMOVED, result.get(1).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.NEW, result.get(2).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.MODIFIED, result.get(3).getDiffStatus());

        l1 = create();
        l2 = create();
@@ -66,14 +66,14 @@
        remove(l1, "home/kai/.borgbutler/borgbutler-config.json"); // 2
        result = DiffTool.extractDifferences(l1, l2);
        assertEquals(3, result.size());
        assertEquals(BorgFilesystemItem.DiffStatus.NEW, result.get(0).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.NEW, result.get(1).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.REMOVED, result.get(2).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.NEW, result.get(0).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.NEW, result.get(1).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.REMOVED, result.get(2).getDiffStatus());
        result = DiffTool.extractDifferences(l2, l1);
        assertEquals(3, result.size());
        assertEquals(BorgFilesystemItem.DiffStatus.REMOVED, result.get(0).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.REMOVED, result.get(1).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.NEW, result.get(2).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.REMOVED, result.get(0).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.REMOVED, result.get(1).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.NEW, result.get(2).getDiffStatus());


        l1 = create();
@@ -82,12 +82,12 @@
        remove(l2, "home/kai/.borgbutler/borgbutler-config.json");
        result = DiffTool.extractDifferences(l1, l2);
        assertEquals(2, result.size());
        assertEquals(BorgFilesystemItem.DiffStatus.REMOVED, result.get(0).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.NEW, result.get(1).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.REMOVED, result.get(0).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.NEW, result.get(1).getDiffStatus());
        result = DiffTool.extractDifferences(l2, l1);
        assertEquals(2, result.size());
        assertEquals(BorgFilesystemItem.DiffStatus.NEW, result.get(0).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.REMOVED, result.get(1).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.NEW, result.get(0).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.REMOVED, result.get(1).getDiffStatus());

        l1 = create();
        l2 = create();
@@ -96,18 +96,18 @@
        remove(l2, "home/kai/.borgbutler/borgbutler-config-bak.json");
        result = DiffTool.extractDifferences(l1, l2);
        assertEquals(3, result.size());
        assertEquals(BorgFilesystemItem.DiffStatus.REMOVED, result.get(0).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.REMOVED, result.get(1).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.NEW, result.get(2).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.REMOVED, result.get(0).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.REMOVED, result.get(1).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.NEW, result.get(2).getDiffStatus());
        result = DiffTool.extractDifferences(l2, l1);
        assertEquals(3, result.size());
        assertEquals(BorgFilesystemItem.DiffStatus.NEW, result.get(0).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.NEW, result.get(1).getDiffStatus());
        assertEquals(BorgFilesystemItem.DiffStatus.REMOVED, result.get(2).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.NEW, result.get(0).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.NEW, result.get(1).getDiffStatus());
        assertEquals(FilesystemItem.DiffStatus.REMOVED, result.get(2).getDiffStatus());
    }

    private BorgFilesystemItem create(String path, boolean directory, String mode, long size, String mtime) {
        return new BorgFilesystemItem()
    private FilesystemItem create(String path, boolean directory, String mode, long size, String mtime) {
        return (FilesystemItem)new FilesystemItem()
                .setPath(path)
                .setType(directory ? "d" : "-")
                .setMode(mode)
@@ -115,8 +115,8 @@
                .setMtime(mtime);
    }

    private List<BorgFilesystemItem> create() {
        List<BorgFilesystemItem> list = new ArrayList<>();
    private List<FilesystemItem> create() {
        List<FilesystemItem> list = new ArrayList<>();
        list.add(create("etc", true, "drwx------", 0, "2018-11-21"));
        list.add(create("etc/passwd", false, "-rwx------", 100, "2018-11-21"));
        list.add(create("home", true, "drwx------", 0, "2018-11-21"));
@@ -128,13 +128,13 @@
        return list;
    }

    private void remove(List<BorgFilesystemItem> list, String path) {
        BorgFilesystemItem item = get(list, path);
    private void remove(List<FilesystemItem> list, String path) {
        FilesystemItem item = get(list, path);
        list.remove(item);
    }

    private BorgFilesystemItem get(List<BorgFilesystemItem> list, String path) {
        for (BorgFilesystemItem item : list) {
    private FilesystemItem get(List<FilesystemItem> list, String path) {
        for (FilesystemItem item : list) {
            if (item.getPath().equals(path)) {
                return item;
            }