From 0b1ab6faa386490f43c171e4c296b817075604d8 Mon Sep 17 00:00:00 2001 From: Siphalor Date: Fri, 17 Jul 2020 22:54:43 +0200 Subject: [PATCH] Improve lang unit test --- src/test/java/de/siphalor/was/ContentTests.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/test/java/de/siphalor/was/ContentTests.java b/src/test/java/de/siphalor/was/ContentTests.java index c6d4455..5468dd7 100644 --- a/src/test/java/de/siphalor/was/ContentTests.java +++ b/src/test/java/de/siphalor/was/ContentTests.java @@ -38,12 +38,19 @@ public class ContentTests { InputStream inputStream = contentManager.getResource("lang/en_us.lang").orElseThrow().getInputStream(); properties.load(inputStream); - contentManager.getResources("lang", "lang").forEach(resource -> { - if (!resource.getId().equals("lang/en_us.lang")) { - Properties props = new Properties(); - Assertions.assertDoesNotThrow(() -> props.load(resource.getInputStream())); - Assertions.assertEquals(properties.keySet(), props.keySet(), "Missing lang keys for " + resource.getId()); + Assertions.assertAll(contentManager.getResources("lang", "lang").flatMap(resource -> { + if (resource.getId().equals("lang/en_us.lang")) { + return Stream.empty(); } + Properties props = new Properties(); + return Stream.of(() -> { + Assertions.assertDoesNotThrow(() -> props.load(resource.getInputStream())); + Assertions.assertAll(properties.keySet().stream().map(key -> () -> + Assertions.assertTrue(props.containsKey(key), "Missing lang key " + key + " for file " + resource.getId()) + )); + }); + })); + contentManager.getResources("lang", "lang").forEach(resource -> { }); }