From 8e2de30e69ca74d7689b60144c87035b41c63223 Mon Sep 17 00:00:00 2001
From: Kai Reinhard <K.Reinhard@micromata.de>
Date: Sat, 08 Dec 2018 12:19:14 +0000
Subject: [PATCH] AbstractCache...

---
 borgbutler-core/src/test/java/de/micromata/borgbutler/cache/CacheTest.java |   26 ++++++++++++++++++++------
 1 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/borgbutler-core/src/test/java/de/micromata/borgbutler/cache/CacheTest.java b/borgbutler-core/src/test/java/de/micromata/borgbutler/cache/CacheTest.java
index 8cb9370..6bdc42a 100644
--- a/borgbutler-core/src/test/java/de/micromata/borgbutler/cache/CacheTest.java
+++ b/borgbutler-core/src/test/java/de/micromata/borgbutler/cache/CacheTest.java
@@ -5,6 +5,7 @@
 import de.micromata.borgbutler.config.Configuration;
 import de.micromata.borgbutler.config.ConfigurationHandler;
 import de.micromata.borgbutler.json.borg.RepoInfo;
+import de.micromata.borgbutler.json.borg.RepoList;
 import org.junit.jupiter.api.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -17,7 +18,7 @@
     private static Logger log = LoggerFactory.getLogger(CacheTest.class);
 
     @Test
-    void reposCachetest() {
+    void reposCacheTest() {
         ConfigurationHandler configHandler = ConfigurationHandler.getInstance();
         configHandler.read();
         Configuration config = ConfigurationHandler.getConfiguration();
@@ -26,17 +27,30 @@
             return;
         }
         RepoInfoCache cache = ButlerCache.getReposCache();
+        cache.read();
+        if (cache.getElements().size() != config.getRepos().size()) {
+            refreshReposCache(config, cache);
+        }
+        refreshRepoListsCache(config);
+        assertEquals(config.getRepos().size(), cache.getElements().size());
+    }
+
+    private void refreshReposCache(Configuration config, RepoInfoCache cache) {
         for (BorgRepoConfig repo : config.getRepos()) {
             log.info("Processing repo '" + repo + "'");
             RepoInfo repoInfo = BorgCommands.info(repo);
             cache.upsert(repoInfo);
-            repoInfo = cache.getRepoInfo(repoInfo.getRepository().getId());
+            repoInfo = cache.get(repoInfo.getRepository().getId());
             assertNotNull(repoInfo);
-            //RepoList repoList = BorgCommands.list(repo);
-            //log.info("Repo list: " + repoList);
         }
         cache.save();
-        cache.read();
-        assertEquals(config.getRepos().size(), cache.getRepositories().size());
+    }
+
+    private void refreshRepoListsCache(Configuration config) {
+        for (BorgRepoConfig repo : config.getRepos()) {
+            log.info("Processing repo '" + repo + "'");
+            RepoList repoList = BorgCommands.list(repo);
+            log.info("repoList: " + repoList);
+        }
     }
 }

--
Gitblit v1.10.0