Skip to content

Commit 53cfcb4

Browse files
committed
ACC-2685 hide RepeatCount when event only occurs once
Log line looked weird since Duration is always 0
1 parent fb6c553 commit 53cfcb4

1 file changed

Lines changed: 8 additions & 2 deletions

File tree

contentgrid-junit-jupiter-k8s/src/main/java/com/contentgrid/junit/jupiter/k8s/log/KubernetesLoggerExtension.java

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import static com.contentgrid.junit.jupiter.helpers.FieldHelper.getFieldValue;
55

66
import com.contentgrid.junit.jupiter.helpers.FieldHelper;
7+
import com.contentgrid.junit.jupiter.k8s.resource.AwaitableResource.Event.RepeatCount;
78
import io.fabric8.junit.jupiter.HasKubernetesClient;
89
import java.lang.reflect.Field;
910
import java.lang.reflect.Modifier;
@@ -63,12 +64,17 @@ private void dumpLogs(ExtensionContext context, boolean isStatic) throws Illegal
6364
logger.logs()
6465
.forEachOrdered(line -> log.info("[{}] {} {} >>> {}", line.resource(), line.timestamp(), line.container(), line.line()));
6566
logger.events()
66-
.forEachOrdered(event -> log.info("[{}] {} {} >>> [{}] {} (×{} in {}s)",
67-
event.resource(), event.timestamp(), event.type(), event.reason(), event.message(), event.repeat().count(), event.repeat().period().getSeconds()));
67+
.forEachOrdered(event -> log.info("[{}] {} {} >>> [{}] {}{}",
68+
event.resource(), event.timestamp(), event.type(), event.reason(), event.message(),
69+
event.repeat().count() > 1 ? formatRepeatCount(event.repeat()) : ""));
6870
}
6971
}
7072
}
7173

74+
private static String formatRepeatCount(RepeatCount repeat) {
75+
return " (×%s in %ss)".formatted(repeat.count(), repeat.period().getSeconds());
76+
}
77+
7278
@Override
7379
public void handleBeforeEachMethodExecutionException(ExtensionContext context, Throwable throwable)
7480
throws Throwable {

0 commit comments

Comments
 (0)