From ab062635075d1cb6703de996ed7621309625cf53 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 2 Sep 2017 10:29:10 +0200
Subject: [PATCH 1/2] Add store extraction to Runtime

This is necessary to be able to re-build a Runtime object with an new
set of "commandline arguments". For example if a test wants to test two
calls to imag, for example a "add" operation followed by a "remove" operation.

These functions are feature-gated therefor and should only be used in
tests.
---
 lib/core/libimagrt/Cargo.toml      |  8 ++++++++
 lib/core/libimagrt/src/runtime.rs  | 23 +++++++++++++++++++++++
 lib/etc/libimagutil/src/testing.rs | 12 ++++++++++++
 3 files changed, 43 insertions(+)

diff --git a/lib/core/libimagrt/Cargo.toml b/lib/core/libimagrt/Cargo.toml
index 1cdd8cc4..25e95ff0 100644
--- a/lib/core/libimagrt/Cargo.toml
+++ b/lib/core/libimagrt/Cargo.toml
@@ -27,3 +27,11 @@ toml-query = "0.3.0"
 libimagstore = { version = "0.4.0", path = "../../../lib/core/libimagstore" }
 libimagerror = { version = "0.4.0", path = "../../../lib/core/libimagerror" }
 libimagutil  = { version = "0.4.0", path = "../../../lib/etc/libimagutil" }
+
+[features]
+default = []
+
+# Enable testing functionality. Used for building the libimagrt for testing CLI
+# apps. Do not use in production!
+testing = []
+
diff --git a/lib/core/libimagrt/src/runtime.rs b/lib/core/libimagrt/src/runtime.rs
index 1b5f3f7c..d30ca3aa 100644
--- a/lib/core/libimagrt/src/runtime.rs
+++ b/lib/core/libimagrt/src/runtime.rs
@@ -315,6 +315,29 @@ impl<'a> Runtime<'a> {
         "generate-completion"
     }
 
+    /// Extract the Store object from the Runtime object, destroying the Runtime object
+    ///
+    /// # Warning
+    ///
+    /// This function is for testing _only_! It can be used to re-build a Runtime object with an
+    /// alternative Store.
+    #[cfg(feature = "testing")]
+    pub fn extract_store(self) -> Store {
+        self.store
+    }
+
+    /// Re-set the Store object within
+    ///
+    /// # Warning
+    ///
+    /// This function is for testing _only_! It can be used to re-build a Runtime object with an
+    /// alternative Store.
+    #[cfg(feature = "testing")]
+    pub fn with_store(mut self, s: Store) -> Self {
+        self.store = s;
+        self
+    }
+
     /// Initialize the internal logger
     fn init_logger(is_debugging: bool, is_verbose: bool, colored: bool) {
         use std::env::var as env_var;
diff --git a/lib/etc/libimagutil/src/testing.rs b/lib/etc/libimagutil/src/testing.rs
index 13a70d99..e739f531 100644
--- a/lib/etc/libimagutil/src/testing.rs
+++ b/lib/etc/libimagutil/src/testing.rs
@@ -108,6 +108,18 @@ macro_rules! make_mock_app {
                 let cli_app = MockLinkApp::new(cli_args);
                 Runtime::with_configuration(cli_app, generate_minimal_test_config())
             }
+
+            pub fn reset_test_runtime<'a>(mut args: Vec<&'static str>, old_runtime: Runtime)
+                -> Result<Runtime<'a>, RuntimeError>
+            {
+                let mut cli_args = vec![$appname, "--rtp", "/tmp"];
+
+                cli_args.append(&mut args);
+
+                let cli_app = MockLinkApp::new(cli_args);
+                Runtime::with_configuration(cli_app, generate_minimal_test_config())
+                    .map(|rt| rt.with_store(old_runtime.extract_store()))
+            }
         }
     };
 

From b55f46764f2d8121029d33ffae14c13b45e7af05 Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Sat, 2 Sep 2017 14:04:47 +0200
Subject: [PATCH 2/2] Fix dependency spec: libimagrt must be used with
 "testing" enabled for tests

---
 bin/core/imag-tag/Cargo.toml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/bin/core/imag-tag/Cargo.toml b/bin/core/imag-tag/Cargo.toml
index bb00f889..e1bf382a 100644
--- a/bin/core/imag-tag/Cargo.toml
+++ b/bin/core/imag-tag/Cargo.toml
@@ -35,3 +35,9 @@ path             = "../../../lib/etc/libimagutil"
 default-features = false
 features         = ["testing"]
 
+[dev-dependencies.libimagrt]
+version          = "0.4.0"
+path             = "../../../lib/core/libimagrt"
+default-features = false
+features         = ["testing"]
+