Add test

Author: Tom-Willemsen

base/uk.ac.stfc.isis.ibex.ui.configserver.tests/META-INF/MANIFEST.MF

@@ -12,5 +12,6 @@ Require-Bundle: org.junit;bundle-version="4.11.0",
  org.hamcrest.generator;bundle-version="1.3.0",
  org.hamcrest.integration;bundle-version="1.3.0",
  org.hamcrest.library;bundle-version="1.3.0",
- org.hamcrest.text;bundle-version="1.1.0"
+ org.hamcrest.text;bundle-version="1.1.0",
+ uk.ac.stfc.isis.ibex.configserver
 Automatic-Module-Name: uk.ac.stfc.isis.ibex.ui.configserver.tests

base/uk.ac.stfc.isis.ibex.ui.configserver.tests/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/iocs/tests/TempIocTest.java

@@ -23,10 +23,14 @@
 
 import static org.junit.Assert.*;
 
+import java.util.List;
+
 import org.junit.Before;
 import org.junit.Test;
 
 import uk.ac.stfc.isis.ibex.configserver.configuration.Ioc;
+import uk.ac.stfc.isis.ibex.configserver.configuration.Macro;
+import uk.ac.stfc.isis.ibex.configserver.configuration.Macro.HasDefault;
 import uk.ac.stfc.isis.ibex.configserver.configuration.SimLevel;
 import uk.ac.stfc.isis.ibex.configserver.editing.EditableIoc;
 import uk.ac.stfc.isis.ibex.ui.configserver.editing.iocs.dialog.TempEditableIoc;
@@ -158,4 +162,32 @@ public void GIVEN_ioc_set_WHEN_changing_viewmodel_values_and_saving_ioc_THEN_ioc
         // Assert
         assertEquals(expected, actual);
     }
+    
+    @Test
+    public void GIVEN_ioc_set_WHEN_changing_macros_THEN_macros_do_not_write_through_to_underlying_ioc_until_saved() {
+        var testMacros = List.of(
+            new Macro("name_ignored", "inital_value", "", "", "", HasDefault.NO)
+        );
+        
+        var underlyingIoc = new EditableIoc(new Ioc(""), "");
+        underlyingIoc.setMacros(testMacros);
+        
+        var tempEditableIoc = new TempEditableIoc(underlyingIoc);
+        
+        // Set value in the Temp IOC
+        for (Macro macro : tempEditableIoc.getMacros()) {
+            macro.setValue("some_new_value");
+        }
+        
+        // Before saving the temp IOC, the value should not have propagated down to the underlying IOC.
+        for (Macro macro : underlyingIoc.getMacros()) {
+            assertEquals("inital_value", macro.getValue());
+        }
+        
+        // After saving, the new value should be seen in the underlying IOC.
+        tempEditableIoc.saveIoc();  
+        for (Macro macro : underlyingIoc.getMacros()) {
+            assertEquals("some_new_value", macro.getValue());
+        }
+    }
 }

base/uk.ac.stfc.isis.ibex.ui.configserver/src/uk/ac/stfc/isis/ibex/ui/configserver/editing/iocs/dialog/TempEditableIoc.java

@@ -23,9 +23,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Collections;
-import java.util.stream.Collectors;
-
 import uk.ac.stfc.isis.ibex.configserver.configuration.Macro;
 import uk.ac.stfc.isis.ibex.configserver.editing.EditableIoc;
 
@@ -50,11 +47,17 @@ public TempEditableIoc(EditableIoc ioc) {
         this.macros = deepCopyMacros(editingIoc.getMacros());
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public Collection<Macro> getMacros() {
         return macros;
     }
 
+    /**
+     * {@inheritDoc}
+     */
     @Override
     public void setMacros(final Collection<Macro> macros) {
         this.macros = deepCopyMacros(macros);