Re #53: Moved test helper code out of main sources.

tkowalcz · Jun 18, 2021 · a2b5625 · a2b5625
1 parent e0dfd67
commit a2b5625
Show file tree

Hide file tree

Showing 12 changed files with 47 additions and 40 deletions.
diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/LabelSerializer.java b/core/src/main/java/pl/tkowalcz/tjahzi/LabelSerializer.java
@@ -47,11 +47,14 @@ public void finishAppendingLabelValue() {
                 cursor - lastSizePosition - Integer.BYTES);
     }
 
-    public void appendLabel(String key, String value) {
+    public LabelSerializer appendLabel(String key, String value) {
         appendLabelName(key);
+
         startAppendingLabelValue();
         appendPartialLabelValue(value);
         finishAppendingLabelValue();
+
+        return this;
     }
 
     public DirectBuffer getBuffer() {

diff --git a/core/src/main/java/pl/tkowalcz/tjahzi/LabelSerializers.java b/core/src/main/java/pl/tkowalcz/tjahzi/LabelSerializers.java
@@ -1,7 +1,5 @@
 package pl.tkowalcz.tjahzi;
 
-import java.util.Map;
-
 public class LabelSerializers {
 
     private static final ThreadLocal<LabelSerializer> THREAD_LOCAL = ThreadLocal.withInitial(LabelSerializer::new);
@@ -12,27 +10,4 @@ public static LabelSerializer threadLocal() {
 
         return result;
     }
-
-    // @VisibleForTests
-    public static LabelSerializer from(Map<String, String> labels, String... moreLabels) {
-        LabelSerializer labelSerializer = threadLocal();
-
-        labels.forEach(labelSerializer::appendLabel);
-        for (int i = 0; i < moreLabels.length; i += 2) {
-            labelSerializer.appendLabel(moreLabels[i], moreLabels[i + 1]);
-        }
-
-        return labelSerializer;
-    }
-
-    // @VisibleForTests
-    public static LabelSerializer from(String... labels) {
-        LabelSerializer labelSerializer = threadLocal();
-
-        for (int i = 0; i < labels.length; i += 2) {
-            labelSerializer.appendLabel(labels[i], labels[i + 1]);
-        }
-
-        return labelSerializer;
-    }
 }
diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/HeadersTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/HeadersTest.java
@@ -41,7 +41,7 @@ void setUp() {
         initializer = new TjahziInitializer();
         monitoringModule = new StandardMonitoringModule();
 
-        labelSerializer = LabelSerializers.from("level", "warn");
+        labelSerializer = LabelSerializerCreator.from("level", "warn");
     }
 
     @AfterEach

diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/LabelSerializerCreator.java b/core/src/test/java/pl/tkowalcz/tjahzi/LabelSerializerCreator.java
@@ -0,0 +1,27 @@
+package pl.tkowalcz.tjahzi;
+
+import java.util.Map;
+
+class LabelSerializerCreator {
+
+    public static LabelSerializer from(Map<String, String> labels, String... moreLabels) {
+        LabelSerializer labelSerializer = LabelSerializers.threadLocal();
+
+        labels.forEach(labelSerializer::appendLabel);
+        for (int i = 0; i < moreLabels.length; i += 2) {
+            labelSerializer.appendLabel(moreLabels[i], moreLabels[i + 1]);
+        }
+
+        return labelSerializer;
+    }
+
+    public static LabelSerializer from(String... labels) {
+        LabelSerializer labelSerializer = LabelSerializers.threadLocal();
+
+        for (int i = 0; i < labels.length; i += 2) {
+            labelSerializer.appendLabel(labels[i], labels[i + 1]);
+        }
+
+        return labelSerializer;
+    }
+}
diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferAgentTest.java
@@ -55,7 +55,7 @@ void shouldSendDataIfOverSizeLimit() throws IOException {
         for (int i = 0; i < 100; i++) {
             logger.log(
                     42L,
-                    LabelSerializers.from(Map.of()),
+                    LabelSerializerCreator.from(Map.of()),
                     ByteBuffer.wrap((
                             "Cupcake ipsum dolor sit amet cake wafer. " +
                                     "Soufflé jelly beans biscuit topping. " +
@@ -95,7 +95,7 @@ void shouldNotSendDataBelowSizeLimit() throws IOException {
 
         logger.log(
                 42L,
-                LabelSerializers.from(Map.of()),
+                LabelSerializerCreator.from(Map.of()),
                 ByteBuffer.wrap("Test".getBytes())
         );
 
@@ -164,15 +164,15 @@ void shouldSendDataBelowSizeLimitIfTimeoutExpires() throws IOException {
         // When
         logger.log(
                 42L,
-                LabelSerializers.from(Map.of()),
+                LabelSerializerCreator.from(Map.of()),
                 ByteBuffer.wrap("Test".getBytes())
         );
         clock.tick(wait5s + 1);
         agent.doWork();
 
         logger.log(
                 42L,
-                LabelSerializers.from(Map.of()),
+                LabelSerializerCreator.from(Map.of()),
                 ByteBuffer.wrap("Test".getBytes())
         );
         clock.tick(wait5s + 1);

diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerDeserializerTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerDeserializerTest.java
@@ -84,7 +84,7 @@ void shouldSerializeMessage(
         UnsafeBuffer buffer = new UnsafeBuffer(ByteBuffer.wrap(new byte[expectedSize]));
         LogBufferSerializer serializer = new LogBufferSerializer(buffer);
 
-        LabelSerializer labelSerializer = LabelSerializers.from(labels);
+        LabelSerializer labelSerializer = LabelSerializerCreator.from(labels);
         if (logLevelLabel != null) {
             labelSerializer.appendLabel(logLevelLabel, logLevel);
         }

diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferSerializerTest.java
@@ -24,7 +24,7 @@ void shouldCalculateSizeOfMessage(
         UnsafeBuffer buffer = new UnsafeBuffer(new byte[expectedSize]);
         LogBufferSerializer serializer = new LogBufferSerializer(buffer);
 
-        LabelSerializer labelSerializer = LabelSerializers.from(labels);
+        LabelSerializer labelSerializer = LabelSerializerCreator.from(labels);
         if (logLevelLabel != null) {
             labelSerializer.appendLabel(logLevelLabel, logLevel);
         }

diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferTranscoderTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LogBufferTranscoderTest.java
@@ -40,7 +40,7 @@ void shouldDeserializeMessageAndAddStaticLabels(
         );
         LogBufferSerializer serializer = new LogBufferSerializer(buffer);
 
-        LabelSerializer labelSerializer = LabelSerializers.from(labels);
+        LabelSerializer labelSerializer = LabelSerializerCreator.from(labels);
         if (logLevelLabel != null) {
             labelSerializer.appendLabel(logLevelLabel, logLevel);
         }
@@ -115,7 +115,7 @@ void shouldOverrideStaticLabelsWithIncoming() throws InvalidProtocolBufferExcept
         UnsafeBuffer buffer = new UnsafeBuffer(ByteBuffer.wrap(new byte[256]));
         LogBufferSerializer serializer = new LogBufferSerializer(buffer);
 
-        LabelSerializer labelSerializer = LabelSerializers.from(incomingLabels);
+        LabelSerializer labelSerializer = LabelSerializerCreator.from(incomingLabels);
         labelSerializer.appendLabelName("log_level");
         labelSerializer.appendLabelName("WARN");
 

diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemSanityCheckTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemSanityCheckTest.java
@@ -89,7 +89,7 @@ void sendData() {
         long timestamp = System.currentTimeMillis();
         TjahziLogger logger = loggingSystem.createLogger();
 
-        LabelSerializer labelSerializer = LabelSerializers.from("level", "warn");
+        LabelSerializer labelSerializer = LabelSerializerCreator.from("level", "warn");
 
         // When
         logger.log(

diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/LoggingSystemTest.java
@@ -97,7 +97,7 @@ void sendData() {
         for (int i = 0; i < 1000; i++) {
             logger.log(
                     timestamp + i,
-                    LabelSerializers.from(
+                    LabelSerializerCreator.from(
                             Map.of("level", "warn")
                     ),
                     ByteBuffer.wrap(("Test" + i).getBytes())

diff --git a/core/src/test/java/pl/tkowalcz/tjahzi/ReconnectTest.java b/core/src/test/java/pl/tkowalcz/tjahzi/ReconnectTest.java
@@ -44,7 +44,7 @@ void setUp() {
         initializer = new TjahziInitializer();
         monitoringModule = new StandardMonitoringModule();
 
-        labelSerializer = LabelSerializers.from("level", "warn");
+        labelSerializer = LabelSerializerCreator.from("level", "warn");
     }
 
     @AfterEach

diff --git a/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogicTest.java b/log4j2-appender/src/test/java/pl/tkowalcz/tjahzi/log4j2/AppenderLogicTest.java
@@ -42,7 +42,8 @@ void shouldWorkWithNoDynamicLabels() {
         logEvent.setTimeMillis(timestamp);
         logEvent.setContextData(new JdkMapAdapterStringMap(Map.of()));
 
-        LabelSerializer labelSerializer = LabelSerializers.from(logLevelLabel, "INFO");
+        LabelSerializer labelSerializer = LabelSerializers.threadLocal()
+                .appendLabel(logLevelLabel, "INFO");
 
         // When
         logic.accept(logEvent, ByteBuffer.allocate(1024));
@@ -98,7 +99,8 @@ void shouldPerformSubstitutionOnDynamicLabels() {
         logEvent.setTimeMillis(timestamp);
         logEvent.setContextData(new JdkMapAdapterStringMap(contextMap));
 
-        LabelSerializer labelSerializer = LabelSerializers.from(logLevelLabel, "INFO");
+        LabelSerializer labelSerializer = LabelSerializers.threadLocal()
+                .appendLabel(logLevelLabel, "INFO");
 
         // When
         logic.accept(logEvent, ByteBuffer.allocate(1024));