From 4e67c7dec86c6a63313be1a8461888c98a38d270 Mon Sep 17 00:00:00 2001 From: Keong Lim Date: Thu, 1 Nov 2018 17:04:28 +1100 Subject: [PATCH] AAI-1523 checkstyle warnings for aai-core exceptio Issue-ID: AAI-1523 re-indent code with spaces to clean up some checkstyle warnings for aai-core test exceptions (part of 24k lines of output) Change-Id: Ib577b1b26604e47b75466ff980c7aab0dcebebc3 Signed-off-by: Keong Lim --- .../org/onap/aai/exceptions/AAIExceptionTest.java | 166 +++++++-------- .../aai/exceptions/AAIExceptionWithInfoTest.java | 228 ++++++++++----------- 2 files changed, 197 insertions(+), 197 deletions(-) diff --git a/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java b/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java index 02fb8fa2..99597f7f 100644 --- a/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java +++ b/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionTest.java @@ -26,87 +26,87 @@ import static org.junit.Assert.assertEquals; public class AAIExceptionTest extends AAISetup { - private static final String code = "4004"; - private static final String details = "This is a detailed description of the exception."; - private static final Throwable cause = new RuntimeException("This is a runtime exception."); - private static final Throwable noMessage = new RuntimeException(); - - /** - * Test constructor with 0 params. - * - * @throws Exception the exception - */ - @Test - public void testConstructorWith0Params() throws Exception { - AAIException exception = new AAIException(); - assertEquals(exception, exception); - } - - /** - * Test constructor with 1 params. - * - * @throws Exception the exception - */ - @Test - public void testConstructorWith1Params() throws Exception { - AAIException exception = new AAIException(code); - assertEquals(exception, exception); - } - - /** - * Test constructor with 2 params details. - * - * @throws Exception the exception - */ - @Test - public void testConstructorWith2ParamsDetails() throws Exception { - AAIException exception = new AAIException(code, details); - assertEquals(details, exception.getMessage()); - } - - /** - * Test constructor with 2 params cause. - * - * @throws Exception the exception - */ - @Test - public void testConstructorWith2ParamsCause() throws Exception { - AAIException exception = new AAIException(code, cause); - assertEquals("java.lang.RuntimeException: This is a runtime exception.", exception.getMessage()); - } - - /** - * Test constructor with 2 params null message. - * - * @throws Exception the exception - */ - @Test - public void testConstructorWith2ParamsNullMessage() throws Exception { - AAIException exception = new AAIException(code, noMessage); - assertEquals(noMessage.toString(), exception.getMessage()); - } - - /** - * Test constructor with 3 params. - * - * @throws Exception the exception - */ - @Test - public void testConstructorWith3Params() throws Exception { - AAIException exception = new AAIException(code, cause, details); - String details = "This is a detailed description of the exception."; - assertEquals(details, exception.getMessage()); - } - - /** - * Test constructor with 3 params null message. - * - * @throws Exception the exception - */ - @Test - public void testConstructorWith3ParamsNullMessage() throws Exception { - AAIException exception = new AAIException(code, noMessage, details); - String detailString = new String(details); - assertEquals(detailString, exception.getMessage()); - } + private static final String code = "4004"; + private static final String details = "This is a detailed description of the exception."; + private static final Throwable cause = new RuntimeException("This is a runtime exception."); + private static final Throwable noMessage = new RuntimeException(); + + /** + * Test constructor with 0 params. + * + * @throws Exception the exception + */ + @Test + public void testConstructorWith0Params() throws Exception { + AAIException exception = new AAIException(); + assertEquals(exception, exception); + } + + /** + * Test constructor with 1 params. + * + * @throws Exception the exception + */ + @Test + public void testConstructorWith1Params() throws Exception { + AAIException exception = new AAIException(code); + assertEquals(exception, exception); + } + + /** + * Test constructor with 2 params details. + * + * @throws Exception the exception + */ + @Test + public void testConstructorWith2ParamsDetails() throws Exception { + AAIException exception = new AAIException(code, details); + assertEquals(details, exception.getMessage()); + } + + /** + * Test constructor with 2 params cause. + * + * @throws Exception the exception + */ + @Test + public void testConstructorWith2ParamsCause() throws Exception { + AAIException exception = new AAIException(code, cause); + assertEquals("java.lang.RuntimeException: This is a runtime exception.", exception.getMessage()); + } + + /** + * Test constructor with 2 params null message. + * + * @throws Exception the exception + */ + @Test + public void testConstructorWith2ParamsNullMessage() throws Exception { + AAIException exception = new AAIException(code, noMessage); + assertEquals(noMessage.toString(), exception.getMessage()); + } + + /** + * Test constructor with 3 params. + * + * @throws Exception the exception + */ + @Test + public void testConstructorWith3Params() throws Exception { + AAIException exception = new AAIException(code, cause, details); + String details = "This is a detailed description of the exception."; + assertEquals(details, exception.getMessage()); + } + + /** + * Test constructor with 3 params null message. + * + * @throws Exception the exception + */ + @Test + public void testConstructorWith3ParamsNullMessage() throws Exception { + AAIException exception = new AAIException(code, noMessage, details); + String detailString = new String(details); + assertEquals(detailString, exception.getMessage()); + } } diff --git a/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionWithInfoTest.java b/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionWithInfoTest.java index 3489c257..b0727813 100644 --- a/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionWithInfoTest.java +++ b/aai-core/src/test/java/org/onap/aai/exceptions/AAIExceptionWithInfoTest.java @@ -28,119 +28,119 @@ import static org.junit.Assert.assertEquals; public class AAIExceptionWithInfoTest extends AAISetup { - - private static final HashMap map = new HashMap(); - - { - map.put("itemInteger", 1); - map.put("itemString", "Two"); - map.put("itemThree", Boolean.TRUE); - } - - private static final String info = "An error has occurred."; - private static final String code = "AAI_4004"; - private static final String details = "This is a detailed description of the exception."; - private static final Throwable cause = new RuntimeException("This is a runtime exception."); - - /** - * Test constructor with 2 params. - * - * @throws Exception the exception - */ - @Test - public void testConstructorWith2Params() throws Exception { - AAIExceptionWithInfo exception = new AAIExceptionWithInfo(map, info); - - assertEquals(map, exception.getInfoHash()); - assertEquals(info, exception.getInfo()); - } - - /** - * Test constructor with 3 params. - * - * @throws Exception the exception - */ - @Test - public void testConstructorWith3Params() throws Exception { - AAIExceptionWithInfo exception = new AAIExceptionWithInfo(code, map, info); - - assertEquals("4004", exception.getErrorObject().getErrorCode()); - assertEquals(map, exception.getInfoHash()); - assertEquals(info, exception.getInfo()); - } - - /** - * Test constructor with 4 params I. - * - * @throws Exception the exception - */ - @Test - public void testConstructorWith4ParamsI() throws Exception { - AAIExceptionWithInfo exception = new AAIExceptionWithInfo(code, details, map, info); - - assertEquals("4004", exception.getErrorObject().getErrorCode()); - assertEquals(details, exception.getMessage()); - assertEquals(map, exception.getInfoHash()); - assertEquals(info, exception.getInfo()); - } - - /** - * Test constructor with 4 params II. - * - * @throws Exception the exception - */ - @Test - public void testConstructorWith4ParamsII() throws Exception { - AAIExceptionWithInfo exception = new AAIExceptionWithInfo(code, cause, map, info); - - assertEquals("4004", exception.getErrorObject().getErrorCode()); - assertEquals(cause.toString(), exception.getMessage()); - assertEquals(map, exception.getInfoHash()); - assertEquals(info, exception.getInfo()); - } - - /** - * Test constructor with 5 params. - * - * @throws Exception the exception - */ - @Test - public void testConstructorWith5Params() throws Exception { - AAIExceptionWithInfo exception = new AAIExceptionWithInfo(code, cause, details, map, info); - - assertEquals("4004", exception.getErrorObject().getErrorCode()); - assertEquals(details, exception.getMessage()); - assertEquals(map, exception.getInfoHash()); - assertEquals(info, exception.getInfo()); - } - - /** - * Test set info hash. - */ - @Test - public void testSetInfoHash() { - AAIExceptionWithInfo exception = new AAIExceptionWithInfo(map, info); - - HashMap newMap = new HashMap(); - newMap.put("itemInteger", 2); - exception.setInfoHash(newMap); - - assertEquals(newMap, exception.getInfoHash()); - assertEquals(info, exception.getInfo()); - } - - /** - * Test set info. - */ - @Test - public void testSetInfo() { - AAIExceptionWithInfo exception = new AAIExceptionWithInfo(map, info); - - String newInfo = "This is updated info."; - exception.setInfo(newInfo); - - assertEquals(map, exception.getInfoHash()); - assertEquals(newInfo, exception.getInfo()); - } + + private static final HashMap map = new HashMap(); + + { + map.put("itemInteger", 1); + map.put("itemString", "Two"); + map.put("itemThree", Boolean.TRUE); + } + + private static final String info = "An error has occurred."; + private static final String code = "AAI_4004"; + private static final String details = "This is a detailed description of the exception."; + private static final Throwable cause = new RuntimeException("This is a runtime exception."); + + /** + * Test constructor with 2 params. + * + * @throws Exception the exception + */ + @Test + public void testConstructorWith2Params() throws Exception { + AAIExceptionWithInfo exception = new AAIExceptionWithInfo(map, info); + + assertEquals(map, exception.getInfoHash()); + assertEquals(info, exception.getInfo()); + } + + /** + * Test constructor with 3 params. + * + * @throws Exception the exception + */ + @Test + public void testConstructorWith3Params() throws Exception { + AAIExceptionWithInfo exception = new AAIExceptionWithInfo(code, map, info); + + assertEquals("4004", exception.getErrorObject().getErrorCode()); + assertEquals(map, exception.getInfoHash()); + assertEquals(info, exception.getInfo()); + } + + /** + * Test constructor with 4 params I. + * + * @throws Exception the exception + */ + @Test + public void testConstructorWith4ParamsI() throws Exception { + AAIExceptionWithInfo exception = new AAIExceptionWithInfo(code, details, map, info); + + assertEquals("4004", exception.getErrorObject().getErrorCode()); + assertEquals(details, exception.getMessage()); + assertEquals(map, exception.getInfoHash()); + assertEquals(info, exception.getInfo()); + } + + /** + * Test constructor with 4 params II. + * + * @throws Exception the exception + */ + @Test + public void testConstructorWith4ParamsII() throws Exception { + AAIExceptionWithInfo exception = new AAIExceptionWithInfo(code, cause, map, info); + + assertEquals("4004", exception.getErrorObject().getErrorCode()); + assertEquals(cause.toString(), exception.getMessage()); + assertEquals(map, exception.getInfoHash()); + assertEquals(info, exception.getInfo()); + } + + /** + * Test constructor with 5 params. + * + * @throws Exception the exception + */ + @Test + public void testConstructorWith5Params() throws Exception { + AAIExceptionWithInfo exception = new AAIExceptionWithInfo(code, cause, details, map, info); + + assertEquals("4004", exception.getErrorObject().getErrorCode()); + assertEquals(details, exception.getMessage()); + assertEquals(map, exception.getInfoHash()); + assertEquals(info, exception.getInfo()); + } + + /** + * Test set info hash. + */ + @Test + public void testSetInfoHash() { + AAIExceptionWithInfo exception = new AAIExceptionWithInfo(map, info); + + HashMap newMap = new HashMap(); + newMap.put("itemInteger", 2); + exception.setInfoHash(newMap); + + assertEquals(newMap, exception.getInfoHash()); + assertEquals(info, exception.getInfo()); + } + + /** + * Test set info. + */ + @Test + public void testSetInfo() { + AAIExceptionWithInfo exception = new AAIExceptionWithInfo(map, info); + + String newInfo = "This is updated info."; + exception.setInfo(newInfo); + + assertEquals(map, exception.getInfoHash()); + assertEquals(newInfo, exception.getInfo()); + } } -- 2.16.6