From bcd810498395759aa3519b8a4e021c049918b2dc Mon Sep 17 00:00:00 2001
From: mmis <michael.morris@ericsson.com>
Date: Fri, 16 Mar 2018 09:44:46 +0000
Subject: Removed checkstyle warnings

Removed checkstyle warnings in policy/common/utils

Issue-ID: POLICY-695
Change-Id: I831b74c889d44784d6328619d88eb92fb524ce74
Signed-off-by: mmis <michael.morris@ericsson.com>
---
 .../common/utils/jpa/EntityMgrCloserTest.java      | 152 ++++++++++-----------
 1 file changed, 75 insertions(+), 77 deletions(-)

(limited to 'utils/src/test/java/org/onap/policy/common/utils/jpa/EntityMgrCloserTest.java')

diff --git a/utils/src/test/java/org/onap/policy/common/utils/jpa/EntityMgrCloserTest.java b/utils/src/test/java/org/onap/policy/common/utils/jpa/EntityMgrCloserTest.java
index abc8d93f..e791e084 100644
--- a/utils/src/test/java/org/onap/policy/common/utils/jpa/EntityMgrCloserTest.java
+++ b/utils/src/test/java/org/onap/policy/common/utils/jpa/EntityMgrCloserTest.java
@@ -29,84 +29,82 @@ import javax.persistence.EntityManager;
 
 import org.junit.Before;
 import org.junit.Test;
-import org.onap.policy.common.utils.jpa.EntityMgrCloser;
 
 public class EntityMgrCloserTest {
-	
-	private EntityManager mgr;
-	
-
-	@Before
-	public void setUp() throws Exception {
-		mgr = mock(EntityManager.class);
-	}
-
-
-	/**
-	 * Verifies that the constructor does not do anything extra before
-	 * being closed.
-	 */
-	@Test
-	public void testEntityMgrCloser() {
-		EntityMgrCloser c = new EntityMgrCloser(mgr);
-		
-		assertEquals(mgr, c.getManager());
-
-		// verify not closed yet
-		verify(mgr, never()).close();
-		
-		c.close();
-
-		verify(mgr).close();
-	}
-
-	@Test
-	public void testGetManager() {
-		try(EntityMgrCloser c = new EntityMgrCloser(mgr)) {
-			assertEquals(mgr, c.getManager());
-		}
-	}
-	
-	/**
-	 * Verifies that the manager gets closed when close() is invoked.
-	 */
-	@Test
-	public void testClose() {
-		EntityMgrCloser c = new EntityMgrCloser(mgr);
-		
-		c.close();
-		
-		// should be closed
-		verify(mgr).close();
-	}
-
-	/**
-	 * Ensures that the manager gets closed when "try" block exits normally.
-	 */
-	@Test
-	public void testClose_TryWithoutExcept() {
-		try(EntityMgrCloser c = new EntityMgrCloser(mgr)) {
-			
-		}
-		
-		verify(mgr).close();
-	}
-
-	/**
-	 * Ensures that the manager gets closed when "try" block throws an
-	 * exception.
-	 */
-	@Test
-	public void testClose_TryWithExcept() {
-		try {
-			try(EntityMgrCloser c = new EntityMgrCloser(mgr)) {
-				throw new Exception("expected exception");
-			}
-			
-		} catch (Exception e) {
-		}
-		
-		verify(mgr).close();
-	}
+
+    private EntityManager mgr;
+
+
+    @Before
+    public void setUp() throws Exception {
+        mgr = mock(EntityManager.class);
+    }
+
+
+    /**
+     * Verifies that the constructor does not do anything extra before being closed.
+     */
+    @Test
+    public void testEntityMgrCloser() {
+        EntityMgrCloser entityMgrCloser = new EntityMgrCloser(mgr);
+
+        assertEquals(mgr, entityMgrCloser.getManager());
+
+        // verify not closed yet
+        verify(mgr, never()).close();
+
+        entityMgrCloser.close();
+
+        verify(mgr).close();
+    }
+
+    @Test
+    public void testGetManager() {
+        try (EntityMgrCloser c = new EntityMgrCloser(mgr)) {
+            assertEquals(mgr, c.getManager());
+        }
+    }
+
+    /**
+     * Verifies that the manager gets closed when close() is invoked.
+     */
+    @Test
+    public void testClose() {
+        EntityMgrCloser entityMgrCloser = new EntityMgrCloser(mgr);
+
+        entityMgrCloser.close();
+
+        // should be closed
+        verify(mgr).close();
+    }
+
+    /**
+     * Ensures that the manager gets closed when "try" block exits normally.
+     */
+    @Test
+    public void testClose_TryWithoutExcept() {
+        try (EntityMgrCloser entityMgrCloser = new EntityMgrCloser(mgr)) {
+            // No need to do anything in the try block
+        }
+
+        verify(mgr).close();
+    }
+
+    /**
+     * Ensures that the manager gets closed when "try" block throws an exception.
+     */
+    @Test
+    public void testClose_TryWithExcept() {
+        try {
+            try (EntityMgrCloser c = new EntityMgrCloser(mgr)) {
+                throw new Exception("expected exception");
+            }
+
+        } catch (Exception exception) {
+            // Ignore the exception
+        }
+
+        verify(mgr).close();
+    }
 
 }
-- 
cgit 1.2.3-korg