[vividus] Rename o.v.report.MetadataLogger into o.v.log.TestInfoLogger (

#2417)
vividus-framework · Jan 27, 2022 · a8b86c6 · a8b86c6
1 parent 8b35d2d
commit a8b86c6
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 36 deletions.
diff --git a/vividus/src/main/java/org/vividus/configuration/Vividus.java b/vividus/src/main/java/org/vividus/configuration/Vividus.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,7 +25,7 @@
 
 import org.apache.logging.log4j.core.config.ConfigurationFactory;
 import org.slf4j.bridge.SLF4JBridgeHandler;
-import org.vividus.report.MetadataLogger;
+import org.vividus.log.TestInfoLogger;
 import org.vividus.util.json.JsonPathUtils;
 
 import io.github.classgraph.ClassGraph;
@@ -44,7 +44,7 @@ public static void init()
         configureLog4j2();
         createJulToSlf4jBridge();
         configureFreemarkerLogger();
-        MetadataLogger.drawBanner();
+        TestInfoLogger.drawBanner();
         BeanFactory.open();
 
         // Load JsonPathUtils to configure JsonPath SPI

diff --git a/...va/org/vividus/report/MetadataLogger.java → .../java/org/vividus/log/TestInfoLogger.java b/...va/org/vividus/report/MetadataLogger.java → .../java/org/vividus/log/TestInfoLogger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.vividus.report;
+package org.vividus.log;
 
 import java.util.Collections;
 import java.util.Comparator;
@@ -42,20 +42,20 @@
 import de.vandermeer.asciitable.CWC_LongestLine;
 import de.vandermeer.skb.interfaces.transformers.textformat.TextAlignment;
 
-public final class MetadataLogger
+public final class TestInfoLogger
 {
     private static final int MAX_CELL_WIDTH = 50;
     private static final int MARGIN = 3;
     private static final String HYPHEN = "-";
     private static final int HEADER_SIZE = 40;
     private static final String CATEGORY_FORMAT = "%s%n %s:%n";
     private static final String NEW_LINE = "%n";
-    private static final Logger LOGGER = LoggerFactory.getLogger(MetadataLogger.class);
+    private static final Logger LOGGER = LoggerFactory.getLogger(TestInfoLogger.class);
     private static final Pattern SECURE_KEY_PATTERN = Pattern
             .compile(".*(password|((access|api|private)-)?(key|secret|token)).*", Pattern.CASE_INSENSITIVE);
     private static final int HORIZONTAL_RULE_LENGTH = 60;
 
-    private MetadataLogger()
+    private TestInfoLogger()
     {
     }
 
@@ -157,7 +157,7 @@ public static void logPropertiesSecurely(Properties properties)
                 .stream()
                 .map(e -> Map.entry((String) e.getKey(), e.getValue()))
                 .sorted(Entry.comparingByKey())
-                .forEach(MetadataLogger::logPropertySecurely);
+                .forEach(TestInfoLogger::logPropertySecurely);
     }
 
     private static void logPropertySecurely(Entry<String, Object> entry)

diff --git a/vividus/src/main/java/org/vividus/runner/GenericRunner.java b/vividus/src/main/java/org/vividus/runner/GenericRunner.java
@@ -39,7 +39,7 @@
 import org.vividus.Status;
 import org.vividus.configuration.BeanFactory;
 import org.vividus.configuration.Vividus;
-import org.vividus.report.MetadataLogger;
+import org.vividus.log.TestInfoLogger;
 
 public class GenericRunner extends JUnitStories
 {
@@ -57,8 +57,8 @@ public GenericRunner()
         Vividus.init();
         batchedPathFinder = BeanFactory.getBean(IBatchedPathFinder.class);
         embedder = BeanFactory.getBean(embedderBeanName, Embedder.class);
-        MetadataLogger.logPropertiesSecurely(System.getProperties());
-        MetadataLogger.logPropertiesSecurely(BeanFactory.getBean("properties", Properties.class));
+        TestInfoLogger.logPropertiesSecurely(System.getProperties());
+        TestInfoLogger.logPropertiesSecurely(BeanFactory.getBean("properties", Properties.class));
     }
 
     protected static void setEmbedderBeanName(String embedderBeanName)

diff --git a/vividus/src/main/java/org/vividus/steps/SetupSteps.java b/vividus/src/main/java/org/vividus/steps/SetupSteps.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,13 +17,13 @@
 package org.vividus.steps;
 
 import org.jbehave.core.annotations.AfterStories;
-import org.vividus.report.MetadataLogger;
+import org.vividus.log.TestInfoLogger;
 
 public class SetupSteps
 {
     @AfterStories
     public void afterStories()
     {
-        MetadataLogger.logEnvironmentMetadata();
+        TestInfoLogger.logEnvironmentMetadata();
     }
 }
diff --git a/vividus/src/test/java/org/vividus/configuration/VividusTests.java b/vividus/src/test/java/org/vividus/configuration/VividusTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -29,7 +29,7 @@
 import org.mockito.MockedConstruction;
 import org.mockito.MockedStatic;
 import org.mockito.Mockito;
-import org.vividus.report.MetadataLogger;
+import org.vividus.log.TestInfoLogger;
 
 import io.github.classgraph.ClassGraph;
 import io.github.classgraph.ResourceList;
@@ -41,7 +41,7 @@ class VividusTests
     void shouldDrawBannerAfterLoggerConfigurations()
     {
         try (MockedStatic<BeanFactory> beanFactory = mockStatic(BeanFactory.class);
-                MockedStatic<MetadataLogger> metadataLogger = mockStatic(MetadataLogger.class);
+                MockedStatic<TestInfoLogger> metadataLogger = mockStatic(TestInfoLogger.class);
                 MockedConstruction<ClassGraph> classGraph = mockConstruction(ClassGraph.class, (mock, context) -> {
                     when(mock.acceptPackagesNonRecursive("")).thenReturn(mock);
                     ScanResult scanResult = Mockito.mock(ScanResult.class);
@@ -53,7 +53,7 @@ void shouldDrawBannerAfterLoggerConfigurations()
             List<ClassGraph> constructedScanners = classGraph.constructed();
             assertThat(constructedScanners, hasSize(1));
             verify(classGraph.constructed().get(0)).scan();
-            metadataLogger.verify(MetadataLogger::drawBanner);
+            metadataLogger.verify(TestInfoLogger::drawBanner);
             beanFactory.verify(BeanFactory::open);
         }
     }

diff --git a/...g/vividus/report/MetadataLoggerTests.java → .../org/vividus/log/TestInfoLoggerTests.java b/...g/vividus/report/MetadataLoggerTests.java → .../org/vividus/log/TestInfoLoggerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.vividus.report;
+package org.vividus.log;
 
 import static com.github.valfirst.slf4jtest.LoggingEvent.info;
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -54,9 +54,9 @@
 import org.vividus.util.ResourceUtils;
 
 @ExtendWith(TestLoggerFactoryExtension.class)
-class MetadataLoggerTests
+class TestInfoLoggerTests
 {
-    private static final TestLogger LOGGER = TestLoggerFactory.getTestLogger(MetadataLogger.class);
+    private static final TestLogger LOGGER = TestLoggerFactory.getTestLogger(TestInfoLogger.class);
     private static final String FORMAT = "{}={}";
     private static final String MESSAGE = "This is a very long message that should be wrapped to defined cell size "
             + "and with special char: %";
@@ -74,7 +74,7 @@ void testLogPropertiesSecurely(String key)
     {
         Properties properties = new Properties();
         properties.put(key, "value");
-        MetadataLogger.logPropertiesSecurely(properties);
+        TestInfoLogger.logPropertiesSecurely(properties);
         assertThat(LOGGER.getLoggingEvents(), is(List.of(info(FORMAT, key, "****"))));
     }
 
@@ -88,7 +88,7 @@ void testLogPropertiesSecurelyPlainProperties()
         Properties properties = new Properties();
         properties.put(keyString, valueString);
         properties.put(keyInt, valueInt);
-        MetadataLogger.logPropertiesSecurely(properties);
+        TestInfoLogger.logPropertiesSecurely(properties);
         assertThat(LOGGER.getLoggingEvents(), is(List.of(
                 info(FORMAT, keyString, valueString),
                 info(FORMAT, keyInt, valueInt)
@@ -135,7 +135,7 @@ void shouldLogMetadata(String failuresMessage, List<Failure> failures)
                            NodeType.SCENARIO, statistic,
                            NodeType.STEP, statistic));
             reporter.when(StatisticsStoryReporter::getFailures).thenReturn(failures);
-            MetadataLogger.logEnvironmentMetadata();
+            TestInfoLogger.logEnvironmentMetadata();
             ImmutableList<LoggingEvent> loggingEvents = LOGGER.getLoggingEvents();
             assertThat(loggingEvents, hasSize(1));
             assertThat(loggingEvents.get(0).getMessage(), matchesRegex(
@@ -180,7 +180,7 @@ private static Failure createFailure(String storyName, String scenatioTitle, Str
     @Test
     void shouldPrintBanner()
     {
-        MetadataLogger.drawBanner();
+        TestInfoLogger.drawBanner();
         assertThat(LOGGER.getLoggingEvents(), is(List.of(info("\n{}", ResourceUtils.loadResource("banner.vividus")))));
     }
 }
diff --git a/vividus/src/test/java/org/vividus/runner/GenericRunnerTests.java b/vividus/src/test/java/org/vividus/runner/GenericRunnerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@
 import org.vividus.IBatchedPathFinder;
 import org.vividus.configuration.BeanFactory;
 import org.vividus.configuration.Vividus;
-import org.vividus.report.MetadataLogger;
+import org.vividus.log.TestInfoLogger;
 
 class GenericRunnerTests
 {
@@ -39,7 +39,7 @@ void shouldPerformInitInInstanceInitializationBlock()
         GenericRunner.setEmbedderBeanName(embedderBeanName);
         try (MockedStatic<Vividus> vividus = mockStatic(Vividus.class);
                 MockedStatic<BeanFactory> beanFactory = mockStatic(BeanFactory.class);
-                MockedStatic<MetadataLogger> metadataLogger = mockStatic(MetadataLogger.class))
+                MockedStatic<TestInfoLogger> metadataLogger = mockStatic(TestInfoLogger.class))
         {
             IBatchedPathFinder batchedPathFinder = mock(IBatchedPathFinder.class);
             beanFactory.when(() -> BeanFactory.getBean(IBatchedPathFinder.class)).thenReturn(batchedPathFinder);
@@ -51,8 +51,8 @@ void shouldPerformInitInInstanceInitializationBlock()
             GenericRunner genericRunner = new GenericRunner();
             assertEquals(embedder, genericRunner.configuredEmbedder());
             vividus.verify(Vividus::init);
-            metadataLogger.verify(() -> MetadataLogger.logPropertiesSecurely(systemProperties));
-            metadataLogger.verify(() -> MetadataLogger.logPropertiesSecurely(springProperties));
+            metadataLogger.verify(() -> TestInfoLogger.logPropertiesSecurely(systemProperties));
+            metadataLogger.verify(() -> TestInfoLogger.logPropertiesSecurely(springProperties));
         }
     }
 }
diff --git a/vividus/src/test/java/org/vividus/steps/SetupStepsTests.java b/vividus/src/test/java/org/vividus/steps/SetupStepsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2019-2021 the original author or authors.
+ * Copyright 2019-2022 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,17 +20,17 @@
 
 import org.junit.jupiter.api.Test;
 import org.mockito.MockedStatic;
-import org.vividus.report.MetadataLogger;
+import org.vividus.log.TestInfoLogger;
 
 class SetupStepsTests
 {
     @Test
     void shouldLogEnvironmentMetadataAfterStories()
     {
-        try (MockedStatic<MetadataLogger> metadataLogger = mockStatic(MetadataLogger.class))
+        try (MockedStatic<TestInfoLogger> metadataLogger = mockStatic(TestInfoLogger.class))
         {
             new SetupSteps().afterStories();
-            metadataLogger.verify(MetadataLogger::logEnvironmentMetadata);
+            metadataLogger.verify(TestInfoLogger::logEnvironmentMetadata);
         }
     }
 }