From c0b2bf61e27d46b7aeee1082ac7d2eaadf7d2461 Mon Sep 17 00:00:00 2001
From: yichen88 <tang.yichenyves@gmail.com>
Date: Wed, 6 Sep 2017 09:12:12 +0200
Subject: [PATCH] Assert not null for ComputationManager and close FileSystem
 in test

---
 .../contigencies/TapChangeActionTest.java     | 21 +++++++++++--------
 .../itesla_project/online/StateAnalyzer.java  |  1 +
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/modules/src/test/java/eu/itesla_project/modules/contigencies/TapChangeActionTest.java b/modules/src/test/java/eu/itesla_project/modules/contigencies/TapChangeActionTest.java
index 2014d963..446303cb 100644
--- a/modules/src/test/java/eu/itesla_project/modules/contigencies/TapChangeActionTest.java
+++ b/modules/src/test/java/eu/itesla_project/modules/contigencies/TapChangeActionTest.java
@@ -53,18 +53,21 @@ public void testToTask() throws Exception {
         PhaseTapChanger tapChanger = network.getTwoWindingsTransformer("PS1").getPhaseTapChanger();
         assertEquals(1, tapChanger.getTapPosition());
 
+
         TapChangeAction action = new TapChangeAction("PS1", 2);
         ModificationTask task = action.toTask();
-        FileSystem fileSystem = Jimfs.newFileSystem(Configuration.unix());
-        Path localDir = fileSystem.getPath("/tmp");
-        ComputationManager computationManager = new LocalComputationManager(localDir);
-        task.modify(network, computationManager);
-        assertEquals(2, tapChanger.getTapPosition());
+        try (FileSystem fileSystem = Jimfs.newFileSystem(Configuration.unix())) {
+            Path localDir = fileSystem.getPath("/tmp");
+            ComputationManager computationManager = new LocalComputationManager(localDir);
+            task.modify(network, computationManager);
+            assertEquals(2, tapChanger.getTapPosition());
 
-        try {
-            action.toTask(null);
-            fail();
-        } catch (UnsupportedOperationException exc) {
+            try {
+                action.toTask(null);
+                fail();
+            } catch (UnsupportedOperationException exc) {
+            }
         }
+
     }
 }
diff --git a/online-workflow/src/main/java/eu/itesla_project/online/StateAnalyzer.java b/online-workflow/src/main/java/eu/itesla_project/online/StateAnalyzer.java
index 18b0c825..5a313ea5 100644
--- a/online-workflow/src/main/java/eu/itesla_project/online/StateAnalyzer.java
+++ b/online-workflow/src/main/java/eu/itesla_project/online/StateAnalyzer.java
@@ -77,6 +77,7 @@ public StateAnalyzer(OnlineWorkflowContext context, MontecarloSampler sampler, L
         Objects.requireNonNull(stateListener);
         Objects.requireNonNull(constraintsModifier);
         Objects.requireNonNull(parameters);
+        Objects.requireNonNull(computationManager);
         this.context = context;
         this.sampler = sampler;
         this.loadFlow = loadFlow;