Remove useless imports and vars

[policy/engine.git] / ONAP-SDK-APP / src / test / java / org / onap / portalapp / scheduler / RegisterTest.java

diff --git a/ONAP-SDK-APP/src/test/java/org/onap/portalapp/scheduler/RegisterTest.java b/ONAP-SDK-APP/src/test/java/org/onap/portalapp/scheduler/RegisterTest.java
index ec7724c..6845411 100644 (file)
--- a/ONAP-SDK-APP/src/test/java/org/onap/portalapp/scheduler/RegisterTest.java
+++ b/ONAP-SDK-APP/src/test/java/org/onap/portalapp/scheduler/RegisterTest.java
@@ -4,12 +4,14 @@
  * ================================================================================
  * Copyright (C) 2018 AT&T Intellectual Property
  * ================================================================================
+ * Modifications Copyright (C) 2019 Samsung
+ * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -24,34 +26,40 @@ import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.fail;
 import java.util.ArrayList;
 import java.util.List;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.ExpectedException;
 import org.quartz.Trigger;
 import org.quartz.TriggerBuilder;
 
 public class RegisterTest {
-       @Rule 
-       public final ExpectedException thrown = ExpectedException.none();
+    @Test
+    public void testRegister() {
+        Register register = new Register();
+        TriggerBuilder<Trigger> triggerBuilder = TriggerBuilder.newTrigger();
+        Trigger trigger = triggerBuilder.build();
+        List<Trigger> triggers = new ArrayList<Trigger>();
+        triggers.add(trigger);
+
+        register.setScheduleTriggers(triggers);
+        assertEquals(triggers, register.getScheduleTriggers());
+        assertEquals(1, register.getTriggers().length);
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testRegisterNegativeCase() {
+        Register register = new Register();
+        register.registerTriggers();
+        fail("Expecting an exception.");
+    }
+
+    @Test(expected = NullPointerException.class)
+    public void testRegisterNegativeCase2() {
+        // Setup test data
+        Register register = new Register();
+        List<Trigger> triggers = new ArrayList<Trigger>();
+        register.setScheduleTriggers(triggers);
 
-       @Test
-       public void testRegister() {
-               Register register = new Register();
-               TriggerBuilder<Trigger> triggerBuilder = TriggerBuilder.newTrigger();
-               Trigger trigger = triggerBuilder.build();
-               List<Trigger> triggers = new ArrayList<Trigger>();
-               triggers.add(trigger);
-               
-               register.setScheduleTriggers(triggers);
-               assertEquals(register.getScheduleTriggers(), triggers);
-               assertEquals(register.getTriggers().length, 1);
-       }
-       
-       @Test
-       public void testRegisterNegativeCase() {
-               thrown.expect(NullPointerException.class);
-               Register register = new Register();
-               register.registerTriggers();
-               fail("Expecting an exception.");
-       }
+        // Test register
+        register.registerTriggers();
+        fail("Expecting an exception.");
+    }
 }