From 72a9ab9e886cdeabc4b43418a7054a5796a0ff55 Mon Sep 17 00:00:00 2001
From: sliard <samuel.liard@gmail.com>
Date: Mon, 12 Apr 2021 15:58:22 +0200
Subject: [DMAAP-CLIENT] First sonar issues review part2

update Copyright informations
fix checkstyle warning and fix code review comments
remove Prop

Issue-ID: DMAAP-1585
Change-Id: I445ca5d0888a555acbac70af7ed571be26d74f79
Signed-off-by: sliard <samuel.liard@gmail.com>
---
 .../onap/dmaap/mr/tools/ClusterCommandTest.java    | 111 +++++++++++----------
 1 file changed, 56 insertions(+), 55 deletions(-)

(limited to 'src/test/java/org/onap/dmaap/mr/tools/ClusterCommandTest.java')

diff --git a/src/test/java/org/onap/dmaap/mr/tools/ClusterCommandTest.java b/src/test/java/org/onap/dmaap/mr/tools/ClusterCommandTest.java
index 5d78488..e503e21 100644
--- a/src/test/java/org/onap/dmaap/mr/tools/ClusterCommandTest.java
+++ b/src/test/java/org/onap/dmaap/mr/tools/ClusterCommandTest.java
@@ -4,12 +4,14 @@
  * ================================================================================
  * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
  * ================================================================================
+ * Modifications Copyright © 2021 Orange.
+ * ================================================================================
  * 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,12 +22,7 @@
 
 package org.onap.dmaap.mr.tools;
 
-import static org.junit.Assert.assertTrue;
-
-import java.io.FileNotFoundException;
-import java.io.PrintStream;
-import java.util.Arrays;
-
+import com.att.nsa.cmdtool.CommandNotReadyException;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -37,72 +34,76 @@ import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import com.att.nsa.cmdtool.CommandNotReadyException;
+import java.io.FileNotFoundException;
+import java.io.PrintStream;
+import java.util.Arrays;
+
+import static org.junit.Assert.assertTrue;
 
 @RunWith(PowerMockRunner.class)
 @PowerMockIgnore("jdk.internal.reflect.*")
 public class ClusterCommandTest {
-	@InjectMocks
-	private ClusterCommand command;
-	@Mock
-	private MRCommandContext context;
-	@Mock
-	private PrintStream printStream;
+    @InjectMocks
+    private ClusterCommand command;
+    @Mock
+    private MRCommandContext context;
+    @Mock
+    private PrintStream printStream;
 
-	@Before
-	public void setUp() throws Exception {
-		MockitoAnnotations.initMocks(this);
-		PowerMockito.when(context.getCluster()).thenReturn(Arrays.asList("localhost"));
-	}
+    @Before
+    public void setUp() throws Exception {
+        MockitoAnnotations.initMocks(this);
+        PowerMockito.when(context.getCluster()).thenReturn(Arrays.asList("localhost"));
+    }
 
-	@After
-	public void tearDown() throws Exception {
+    @After
+    public void tearDown() throws Exception {
 
-	}
+    }
 
-	@Test
-	public void testGetMatches() {
+    @Test
+    public void testGetMatches() {
 
-		command.getMatches();
-		assertTrue(true);
+        command.getMatches();
+        assertTrue(true);
 
-	}
+    }
 
-	@Test
-	public void testCheckReady() {
+    @Test
+    public void testCheckReady() {
 
-		try {
-			command.checkReady(context);
-		} catch (CommandNotReadyException e) {
-			// TODO Auto-generated catch block
-			e.printStackTrace();
-		}
-		assertTrue(true);
+        try {
+            command.checkReady(context);
+        } catch (CommandNotReadyException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        assertTrue(true);
 
-	}
+    }
 
-	@Test
-	public void testExecute() throws FileNotFoundException, CommandNotReadyException {
-		String[] parts = { "create", "testtopic", "1", "1" };
-		command.execute(parts, context, printStream);
-		assertTrue(true);
+    @Test
+    public void testExecute() throws FileNotFoundException, CommandNotReadyException {
+        String[] parts = {"create", "testtopic", "1", "1"};
+        command.execute(parts, context, printStream);
+        assertTrue(true);
 
-	}
+    }
 
-	@Test
-	public void testExecute1() throws FileNotFoundException, CommandNotReadyException {
-		String[] parts = {};
-		command.execute(parts, context, printStream);
-		assertTrue(true);
+    @Test
+    public void testExecute1() throws FileNotFoundException, CommandNotReadyException {
+        String[] parts = {};
+        command.execute(parts, context, printStream);
+        assertTrue(true);
 
-	}
+    }
 
-	@Test
-	public void testDisplayHelp() {
+    @Test
+    public void testDisplayHelp() {
 
-		command.displayHelp(printStream);
-		assertTrue(true);
+        command.displayHelp(printStream);
+        assertTrue(true);
 
-	}
+    }
 
 }
-- 
cgit 1.2.3-korg