1 files changed, 2 insertions, 14 deletions
diff --git a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java
index d720ed95..9d3b036c 100644
--- a/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java
+++ b/main/src/test/java/org/onap/cli/main/OnapCliMainTest.java
@@ -16,6 +16,8 @@
 
 package org.onap.cli.main;
 
+import static org.junit.Assert.fail;
+
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
@@ -24,7 +26,6 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.aspectj.lang.annotation.After;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.onap.cli.fw.OnapCommand;
@@ -37,24 +38,11 @@ import jline.console.ConsoleReader;
 import mockit.Invocation;
 import mockit.Mock;
 import mockit.MockUp;
-import static org.junit.Assert.fail;
 
 public class OnapCliMainTest {
 
     OnapCli cli = null;
 
-    /**
-     * Clean up.
-     */
-    @After(value = "")
-    public void cleanup() {
-        if (this.cli != null) {
-            if (cli.getExitCode() != 0) {
-                // Fail test case
-            }
-        }
-    }
-
     private void handle(String[] args) {
         cli = new OnapCli(args);
         cli.handle();