Merge pull request #487 from ISISComputingGroup/Ticket2023_dae_crashing_if_disconnected

Ticket2023 dae crashing if disconnected

Author: DominicOram

base/uk.ac.stfc.isis.ibex.dae.tests/src/uk/ac/stfc/isis/ibex/dae/tests/periods/WritingXmlFromPeriodSettingsTest.java

@@ -20,7 +20,7 @@
 package uk.ac.stfc.isis.ibex.dae.tests.periods;
 
 import static org.hamcrest.CoreMatchers.*;
-import static org.junit.Assert.assertThat;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.net.MalformedURLException;
@@ -116,6 +116,20 @@ public void setup_source_is_updated() {
 		assertThat(periodSettings.getSetupSource(), is(newValue));
 	}
 
+	@Test
+    public void setup_source_is_not_updated_if_null() {
+
+        // Arrange: Check that null is not the current setup source.
+        assertNotEquals(periodSettings.getSetupSource(), null);
+        
+        // Act: Try to set a setup source as null.
+        periodSettings.setSetupSource(null);
+        reloadSettingsFromCurrentValues();
+        
+        // Assert: Check that null has been ignored.
+        assertNotEquals(periodSettings.getSetupSource(), null);       
+    }
+	
 
 	@Test
 	public void period_file_is_updated() {
@@ -139,6 +153,20 @@ public void period_control_type_is_updated() {
 		assertThat(periodSettings.getPeriodType(), is(newValue));		
 	}
 
+	@Test
+    public void period_control_type_is_not_updated_if_null() {
+
+	    // Arrange: Check that null is not the current period type.
+        assertNotEquals(periodSettings.getPeriodType(), null);
+        
+        // Act: Try to set a period type as null.
+        periodSettings.setPeriodType(null);
+        reloadSettingsFromCurrentValues();
+        
+        // Assert: Check that null has been ignored.
+        assertNotEquals(periodSettings.getPeriodType(), null);       
+    }
+	
 	@Test
 	public void software_periods_is_updated() {	
 		int newValue = 12121;

base/uk.ac.stfc.isis.ibex.dae/src/uk/ac/stfc/isis/ibex/dae/experimentsetup/periods/XMLBackedPeriodSettings.java

@@ -33,6 +33,9 @@
 import uk.ac.stfc.isis.ibex.dae.xml.XmlNode;
 import uk.ac.stfc.isis.ibex.logger.IsisLog;
 
+/**
+ * Gets the DAE period settings from XML.
+ */
 public class XMLBackedPeriodSettings extends PeriodSettings {
 
     private static final Logger LOG = IsisLog.getLogger(XMLBackedPeriodSettings.class);
@@ -51,6 +54,9 @@ public class XMLBackedPeriodSettings extends PeriodSettings {
 
 	private final ArrayList<XmlBackedPeriod> periods = new ArrayList<>();
 
+	/**
+	 * Constructor.
+	 */
 	public XMLBackedPeriodSettings() {
 		nodes.add(setupSource);
 		nodes.add(periodFile);
@@ -68,45 +74,79 @@ public XMLBackedPeriodSettings() {
 		xmlFile = new XmlFile(nodes);
 	}
 
+	/**
+	 * Sets the xml.
+	 * @param xml the xml to set
+	 */
 	public void setXml(String xml) {
 		xmlFile.setXml(xml);
 		initialiseFromXml();
 	}
 
+	/**
+	 * Gets the xml from file.
+	 * @return the xml
+	 */
 	public String xml() {
 		return xmlFile.toString();
 	}	
 
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override
 	public void setSetupSource(PeriodSetupSource value) {
+	    if (value == null) {
+            LOG.info("Error, attempted to set a null PeriodSetupSource.");
+            return;
+        }
 		super.setSetupSource(value);
 		setupSource.setValue(value);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override
 	public void setNewPeriodFile(String value) {
 		super.setNewPeriodFile(value);
 		periodFile.setValue(value);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override
 	public void setPeriodType(PeriodControlType value) {
+	    if (value == null) {
+	        LOG.info("Error, attempted to set a null PeriodControlType.");
+	        return;
+	    }
 		super.setPeriodType(value);
 		periodType.setValue(value);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override
 	public void setSoftwarePeriods(int value) {
 		super.setSoftwarePeriods(value);
 		softwarePeriods.setValue(value);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override
 	public void setHardwarePeriods(double value) {
 		super.setHardwarePeriods(value);
 		hardwarePeriods.setValue(value);
 	}
 
+	/**
+	 * {@inheritDoc}
+	 */
 	@Override
 	public void setOutputDelay(double value) {
 		super.setOutputDelay(value);