Remove useless imports and vars

[policy/engine.git] / ONAP-PAP-REST / src / test / java / org / onap / policy / pap / xacml / rest / components / OptimizationConfigPolicyTest.java

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/OptimizationConfigPolicyTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/OptimizationConfigPolicyTest.java
index 7b9be68..40c2d4b 100644 (file)
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/OptimizationConfigPolicyTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/components/OptimizationConfigPolicyTest.java
@@ -7,9 +7,9 @@
  * 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.
@@ -20,7 +20,6 @@
 package org.onap.policy.pap.xacml.rest.components;
 
 import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 import static org.mockito.Matchers.anyString;
@@ -41,65 +40,65 @@ import java.util.Collections;
 
 @RunWith(PowerMockRunner.class)
 public class OptimizationConfigPolicyTest {
-       @Rule
+    @Rule
     public ExpectedException thrown = ExpectedException.none();
 
-       @Test
-       public void testConstructor1() {
-               thrown.expect(NullPointerException.class);
-               OptimizationConfigPolicy policy = new OptimizationConfigPolicy();
-               policy.getCorrectPolicyDataObject();
-               fail("Expected an exception");
-       }
-       
-       @Test
-       public void testConstructor2() {
-               PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
-               OptimizationConfigPolicy policy = new OptimizationConfigPolicy(policyAdapter);
-               assertNull(policy.getCorrectPolicyDataObject());
-       }
-       
-       @PrepareForTest({OptimizationConfigPolicy.class})
-       @Test
-       public void testPrepareToSave() throws Exception {
-               // Need to mock internal dictionary retrieval
-               CommonClassDaoImpl impl = Mockito.mock(CommonClassDaoImpl.class);
-               PowerMockito.whenNew(CommonClassDaoImpl.class).withNoArguments().thenReturn(impl);
-               when(impl.getDataById(any(), anyString(), anyString())).thenReturn(null);
-               
-               PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
-               OptimizationConfigPolicy policy = new OptimizationConfigPolicy(policyAdapter);
-               policyAdapter.setHighestVersion(1);
-               policyAdapter.setPolicyType("Config");
-               policyAdapter.setNewFileName("foo.xml");
-               policyAdapter.setJsonBody("{ \"version\": \"1.0\"}");
-               policyAdapter.setServiceType("foo");
-               policy.prepareToSave();
-               assertEquals(true, policy.isPreparedToSave());
-       }
-       
-       @PrepareForTest({CreateNewOptimizationModel.class})
-       @Test
-       public void testCreateModel() throws Exception {
-               // Mock file retrieval
-               File testFile = new File("testFile");
-               File[] testList = new File[1];
-               testList[0] = testFile;
-               File impl = Mockito.mock(File.class);
-               PowerMockito.whenNew(File.class).withAnyArguments().thenReturn(impl);
-               when(impl.listFiles()).thenReturn(testList);
-               when(impl.isFile()).thenReturn(true);
+    @Test
+    public void testConstructor1() {
+        thrown.expect(NullPointerException.class);
+        OptimizationConfigPolicy policy = new OptimizationConfigPolicy();
+        policy.getCorrectPolicyDataObject();
+        fail("Expected an exception");
+    }
 
-               // Mock internal dictionary retrieval
-               CommonClassDaoImpl daoImpl = Mockito.mock(CommonClassDaoImpl.class);
-               PowerMockito.whenNew(CommonClassDaoImpl.class).withNoArguments().thenReturn(daoImpl);
-               when(daoImpl.getDataById(any(), anyString(), anyString())).thenReturn(Collections.emptyList());
+    @Test
+    public void testConstructor2() {
+        PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
+        OptimizationConfigPolicy policy = new OptimizationConfigPolicy(policyAdapter);
+        assertNull(policy.getCorrectPolicyDataObject());
+    }
 
-               // Test create methods
-               String testFileName = "testFile.zip";
-               String testVal = "testVal";
-               CreateNewOptimizationModel model = new CreateNewOptimizationModel(testFileName, testVal, testVal, testVal, testVal);
-               model.addValuesToNewModel();
-               model.saveImportService();
-       }
+    @PrepareForTest({OptimizationConfigPolicy.class})
+    @Test
+    public void testPrepareToSave() throws Exception {
+        // Need to mock internal dictionary retrieval
+        CommonClassDaoImpl impl = Mockito.mock(CommonClassDaoImpl.class);
+        PowerMockito.whenNew(CommonClassDaoImpl.class).withNoArguments().thenReturn(impl);
+        when(impl.getDataById(any(), anyString(), anyString())).thenReturn(null);
+
+        PolicyRestAdapter policyAdapter = new PolicyRestAdapter();
+        OptimizationConfigPolicy policy = new OptimizationConfigPolicy(policyAdapter);
+        policyAdapter.setHighestVersion(1);
+        policyAdapter.setPolicyType("Config");
+        policyAdapter.setNewFileName("foo.xml");
+        policyAdapter.setJsonBody("{ \"version\": \"1.0\"}");
+        policyAdapter.setServiceType("foo");
+        policy.prepareToSave();
+        assertEquals(true, policy.isPreparedToSave());
+    }
+
+    @PrepareForTest({CreateNewOptimizationModel.class})
+    @Test
+    public void testCreateModel() throws Exception {
+        // Mock file retrieval
+        File testFile = new File("testFile");
+        File[] testList = new File[1];
+        testList[0] = testFile;
+        File impl = Mockito.mock(File.class);
+        PowerMockito.whenNew(File.class).withAnyArguments().thenReturn(impl);
+        when(impl.listFiles()).thenReturn(testList);
+        when(impl.isFile()).thenReturn(true);
+
+        // Mock internal dictionary retrieval
+        CommonClassDaoImpl daoImpl = Mockito.mock(CommonClassDaoImpl.class);
+        PowerMockito.whenNew(CommonClassDaoImpl.class).withNoArguments().thenReturn(daoImpl);
+        when(daoImpl.getDataById(any(), anyString(), anyString())).thenReturn(Collections.emptyList());
+
+        // Test create methods
+        String testFileName = "testFile.zip";
+        String testVal = "testVal";
+        CreateNewOptimizationModel model = new CreateNewOptimizationModel(testFileName, testVal, testVal, testVal, testVal);
+        model.addValuesToNewModel();
+        model.saveImportService();
+    }
 }