remove visibility modifiers from tests

Author: EddeCCC

components/inspectit-ocelot-configdocsgenerator/src/test/java/inspectit/ocelot/configdocsgenerator/ConfigDocsGeneratorTest.java

@@ -19,24 +19,24 @@
 
 class ConfigDocsGeneratorTest {
 
-    private static ActionDocs actionWithDocInYaml;
+    static ActionDocs actionWithDocInYaml;
 
-    private static ActionDocs actionWithoutDocInYaml;
+    static ActionDocs actionWithoutDocInYaml;
 
-    private static BaseDocs scopeDoc;
+    static BaseDocs scopeDoc;
 
-    private static RuleDocs ruleDocChild;
+    static RuleDocs ruleDocChild;
 
-    private static RuleDocs ruleDocParent;
+    static RuleDocs ruleDocParent;
 
-    private static MetricDocs metricDoc;
+    static MetricDocs metricDoc;
 
-    private final static ConfigDocsGenerator configDocsGenerator = new ConfigDocsGenerator();
+    final static ConfigDocsGenerator configDocsGenerator = new ConfigDocsGenerator();
 
     /**
      * Needed to create InspectitConfig Objects to use as input for DocObjectGenerator in tests.
      */
-    private final ConfigParser configParser = new ConfigParser();
+    final ConfigParser configParser = new ConfigParser();
 
     /**
      * Helper method to read Yaml from resources.

components/inspectit-ocelot-configdocsgenerator/src/test/java/inspectit/ocelot/configdocsgenerator/model/RuleDocsTest.java

@@ -11,35 +11,35 @@
 
 public class RuleDocsTest {
 
-    private static final String RULE_1_NAME = "testRule1";
+    static final String RULE_1_NAME = "testRule1";
 
-    private static final String RULE_2_NAME = "testRule2";
+    static final String RULE_2_NAME = "testRule2";
 
-    private static final String RULE_3_NAME = "testRule3";
+    static final String RULE_3_NAME = "testRule3";
 
-    private static final String RULE_4_NAME = "testRule4";
+    static final String RULE_4_NAME = "testRule4";
 
-    private static final String ACTION_FROM_RULE_1 = "a_1";
+    static final String ACTION_FROM_RULE_1 = "a_1";
 
-    private static final String ACTION_FROM_RULE_2 = "a_2";
+    static final String ACTION_FROM_RULE_2 = "a_2";
 
-    private static final String ACTION_FROM_RULE_3 = "a_3";
+    static final String ACTION_FROM_RULE_3 = "a_3";
 
-    private static final String ACTION_FROM_RULE_4 = "a_4";
+    static final String ACTION_FROM_RULE_4 = "a_4";
 
-    private static final String OVERWRITTEN_BY_1 = "overwritten_by_1";
+    static final String OVERWRITTEN_BY_1 = "overwritten_by_1";
 
-    private static final String OVERWRITTEN_BY_2 = "overwritten_by_2";
+    static final String OVERWRITTEN_BY_2 = "overwritten_by_2";
 
-    private static final String OVERWRITTEN_BY_1_AND_2 = "overwritten_by_1_and_2";
+    static final String OVERWRITTEN_BY_1_AND_2 = "overwritten_by_1_and_2";
 
-    private static final String CREATED_BY_3 = "created_by_3";
+    static final String CREATED_BY_3 = "created_by_3";
 
-    private static final String CREATED_BY_4 = "created_by_4";
+    static final String CREATED_BY_4 = "created_by_4";
 
-    private static final String ENTRY_KEY = "entry";
+    static final String ENTRY_KEY = "entry";
 
-    private static final String EXIT_KEY = "exit";
+    static final String EXIT_KEY = "exit";
 
     /**
      * Generate an actionCallsMap for a {@link RuleDocs} object with empty TreeMaps as values.
@@ -195,6 +195,5 @@ void addActionCallsFromIncludedRules() {
 
             assertThat(result).usingRecursiveComparison().isEqualTo(expected);
         }
-
     }
 }

components/inspectit-ocelot-configdocsgenerator/src/test/java/inspectit/ocelot/configdocsgenerator/parsing/ConfigParserTest.java

@@ -29,7 +29,7 @@
 @ExtendWith(MockitoExtension.class)
 class ConfigParserTest {
 
-    private final ConfigParser configParser = new ConfigParser();
+    final ConfigParser configParser = new ConfigParser();
 
     /**
      * Helper method to read Yaml from resources.

components/inspectit-ocelot-configurationserver/src/test/java/rocks/inspectit/ocelot/agentcommunication/AgentCallbackManagerTest.java

@@ -26,7 +26,7 @@
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
-public class AgentCallbackManagerTest {
+class AgentCallbackManagerTest {
 
     @InjectMocks
     AgentCallbackManager agentCallbackManager;
@@ -35,7 +35,7 @@ public class AgentCallbackManagerTest {
     InspectitServerSettings configuration;
 
     @BeforeEach
-    public void beforeEach() {
+    void beforeEach() {
         when(configuration.getAgentCommand().getResponseTimeout()).thenReturn(Duration.ofSeconds(5));
 
         agentCallbackManager.postConstruct();
@@ -45,7 +45,7 @@ public void beforeEach() {
     class AddCallbackCommand {
 
         @Test
-        public void addCallbackCommand() {
+        void addCallbackCommand() {
             UUID id = UUID.randomUUID();
             DeferredResult<ResponseEntity<?>> testResult = new DeferredResult<>();
 
@@ -57,7 +57,7 @@ public void addCallbackCommand() {
         }
 
         @Test
-        public void ignoresNullParams() {
+        void ignoresNullParams() {
             UUID id = UUID.randomUUID();
 
             agentCallbackManager.addCommandCallback(id, null);
@@ -67,7 +67,7 @@ public void ignoresNullParams() {
         }
 
         @Test
-        public void throwsExceptionOnNullId() {
+        void throwsExceptionOnNullId() {
             DeferredResult<ResponseEntity<?>> testResult = new DeferredResult<>();
 
             assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> agentCallbackManager.addCommandCallback(null, testResult))
@@ -79,7 +79,7 @@ public void throwsExceptionOnNullId() {
     class RunNextCommandWithId {
 
         @Test
-        public void hasCommand() {
+        void hasCommand() {
             DeferredResult<ResponseEntity<?>> testResult = new DeferredResult<>();
             UUID id = UUID.randomUUID();
             agentCallbackManager.resultCache.put(id, testResult);
@@ -99,7 +99,7 @@ public void hasCommand() {
         }
 
         @Test
-        public void commandIdNull() {
+        void commandIdNull() {
             agentCallbackManager.resultCache = mock(LoadingCache.class);
 
             assertThatExceptionOfType(IllegalArgumentException.class).isThrownBy(() -> agentCallbackManager.handleCommandResponse(null, null))

components/inspectit-ocelot-configurationserver/src/test/java/rocks/inspectit/ocelot/agentcommunication/AgentCommandManagerTest.java

@@ -22,7 +22,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-public class AgentCommandManagerTest {
+class AgentCommandManagerTest {
 
     @InjectMocks
     AgentCommandManager agentCommandManager;
@@ -31,7 +31,7 @@ public class AgentCommandManagerTest {
     InspectitServerSettings configuration;
 
     @BeforeEach
-    public void beforeEach() {
+    void beforeEach() {
         when(configuration.getAgentCommand().getCommandTimeout()).thenReturn(Duration.ofSeconds(5));
         when(configuration.getAgentCommand().getCommandQueueSize()).thenReturn(10);
 
@@ -42,7 +42,7 @@ public void beforeEach() {
     class AddCommand {
 
         @Test
-        public void addCommandNewAgent() throws ExecutionException {
+        void addCommandNewAgent() throws ExecutionException {
             Command mockAgentCommand = mock(Command.class);
             String agentId = "test-agent";
 
@@ -55,7 +55,7 @@ public void addCommandNewAgent() throws ExecutionException {
         }
 
         @Test
-        public void throwsExeptionOnNullId() throws ExecutionException {
+        void throwsExeptionOnNullId() throws ExecutionException {
             Command mockAgentCommand = mock(Command.class);
 
             try {
@@ -67,7 +67,7 @@ public void throwsExeptionOnNullId() throws ExecutionException {
         }
 
         @Test
-        public void ignoresNullCommand() throws ExecutionException {
+        void ignoresNullCommand() throws ExecutionException {
             String agentId = "test-agent";
 
             agentCommandManager.addCommand(agentId, null);
@@ -81,7 +81,7 @@ public void ignoresNullCommand() throws ExecutionException {
     class GetCommand {
 
         @Test
-        public void noCommandPresent() {
+        void noCommandPresent() {
             String agentId = "test-agent";
 
             Command result = agentCommandManager.getCommand(agentId, false);
@@ -90,7 +90,7 @@ public void noCommandPresent() {
         }
 
         @Test
-        public void commandPresent() {
+        void commandPresent() {
             Command mockAgentCommand = mock(Command.class);
             String agentId = "test-agent";
             BlockingQueue<Command> list = new LinkedBlockingQueue<>();
@@ -106,7 +106,7 @@ public void commandPresent() {
         }
 
         @Test
-        public void commandOfDifferentAgentPresent() {
+        void commandOfDifferentAgentPresent() {
             Command mockAgentCommand = mock(Command.class);
             String agentId = "not-the-test-agent";
             BlockingQueue<Command> list = new LinkedBlockingQueue<>();

components/inspectit-ocelot-configurationserver/src/test/java/rocks/inspectit/ocelot/agentcommunication/handlers/impl/EnvironmentCommandHandlerTest.java

@@ -20,7 +20,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-public class EnvironmentCommandHandlerTest {
+class EnvironmentCommandHandlerTest {
 
     @InjectMocks
     EnvironmentCommandHandler environmentCommandHandler;
@@ -32,7 +32,7 @@ public class EnvironmentCommandHandlerTest {
     class PrepareResponse {
 
         @Test
-        public void cantHandleCommand() {
+        void cantHandleCommand() {
             Command command = null;
             String agentId = "test-id";
 
@@ -45,7 +45,7 @@ public void cantHandleCommand() {
         }
 
         @Test
-        public void preparesResponse() {
+        void preparesResponse() {
             when(configuration.getAgentCommand().getResponseTimeout()).thenReturn(Duration.ofMinutes(1));
             EnvironmentCommand command = new EnvironmentCommand();
             String agentId = "test-id";
@@ -62,7 +62,7 @@ public void preparesResponse() {
     class HandleResponse {
 
         @Test
-        public void handlesResponse() {
+        void handlesResponse() {
             EnvironmentCommand.Response mockResponse = mock(EnvironmentCommand.Response.class);
             DeferredResult<ResponseEntity<?>> result = new DeferredResult<>();
 

components/inspectit-ocelot-configurationserver/src/test/java/rocks/inspectit/ocelot/agentcommunication/handlers/impl/InstrumentationFeedbackCommandHandlerTest.java

@@ -21,7 +21,7 @@
 import static org.mockito.Mockito.when;
 
 @ExtendWith(MockitoExtension.class)
-public class InstrumentationFeedbackCommandHandlerTest {
+class InstrumentationFeedbackCommandHandlerTest {
 
     @InjectMocks
     InstrumentationFeedbackCommandHandler handler;
@@ -33,7 +33,7 @@ public class InstrumentationFeedbackCommandHandlerTest {
     class PrepareResponse {
 
         @Test
-        public void cantHandleCommand() {
+        void cantHandleCommand() {
             Command command = null;
             String agentId = "test-id";
 
@@ -45,7 +45,7 @@ public void cantHandleCommand() {
         }
 
         @Test
-        public void preparesResponse() {
+        void preparesResponse() {
             when(configuration.getAgentCommand().getResponseTimeout()).thenReturn(Duration.ofMinutes(1));
             InstrumentationFeedbackCommand command = new InstrumentationFeedbackCommand();
             String agentId = "test-id";
@@ -60,7 +60,7 @@ public void preparesResponse() {
     class HandleResponse {
 
         @Test
-        public void handlesResponse() {
+        void handlesResponse() {
             InstrumentationFeedbackCommand.Response mockResponse = mock(InstrumentationFeedbackCommand.Response.class);
             DeferredResult<ResponseEntity<?>> result = new DeferredResult<>();
 

components/inspectit-ocelot-configurationserver/src/test/java/rocks/inspectit/ocelot/agentcommunication/handlers/impl/PingCommandHandlerTest.java

@@ -20,7 +20,7 @@
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
-public class PingCommandHandlerTest {
+class PingCommandHandlerTest {
 
     @InjectMocks
     PingCommandHandler pingCommandHandler;
@@ -32,7 +32,7 @@ public class PingCommandHandlerTest {
     class PrepareResponse {
 
         @Test
-        public void cantHandleCommand() {
+        void cantHandleCommand() {
             Command command = null;
             String agentId = "test-id";
 
@@ -45,7 +45,7 @@ public void cantHandleCommand() {
         }
 
         @Test
-        public void preparesResponse() {
+        void preparesResponse() {
             when(configuration.getAgentCommand().getResponseTimeout()).thenReturn(Duration.ofMinutes(1));
             PingCommand command = new PingCommand();
             String agentId = "test-id";
@@ -62,7 +62,7 @@ public void preparesResponse() {
     class HandleResponse {
 
         @Test
-        public void handlesResponse() {
+        void handlesResponse() {
             CommandResponse mockResponse = mock(CommandResponse.class);
             DeferredResult<ResponseEntity<?>> result = new DeferredResult<>();
 

components/inspectit-ocelot-configurationserver/src/test/java/rocks/inspectit/ocelot/agentconfiguration/AgentConfigurationManagerTest.java

@@ -23,7 +23,7 @@
 import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
-public class AgentConfigurationManagerTest {
+class AgentConfigurationManagerTest {
 
     @InjectMocks
     AgentConfigurationManager configManager;
@@ -41,7 +41,7 @@ public class AgentConfigurationManagerTest {
     RevisionAccess fileAccessor;
 
     @BeforeEach
-    public void beforeEach() {
+    void beforeEach() {
         lenient().when(fileManager.getWorkspaceRevision()).thenReturn(fileAccessor);
         lenient().when(serializer.getRevisionAccess()).thenReturn(fileAccessor);
     }

components/inspectit-ocelot-configurationserver/src/test/java/rocks/inspectit/ocelot/agentconfiguration/AgentConfigurationReloadTaskTest.java

@@ -25,7 +25,7 @@
 import static rocks.inspectit.ocelot.file.versioning.Branch.WORKSPACE;
 
 @ExtendWith(MockitoExtension.class)
-public class AgentConfigurationReloadTaskTest {
+class AgentConfigurationReloadTaskTest {
 
     @Mock
     AgentMappingSerializer serializer;
@@ -59,7 +59,7 @@ void beforeEach() {
     class Run {
 
         @Test
-        void runTaskWithValidOutput() throws Exception {
+        void runTaskWithValidOutput() {
             when(workspaceAccessor.readConfigurationFile(anyString())).thenReturn(Optional.of("key: valid"));
 
             AgentMapping mapping = AgentMapping.builder()