From 051abb82dc11fa793f1c7cb58a13bf42e2f6de86 Mon Sep 17 00:00:00 2001 From: Philzen Date: Sun, 2 Jun 2024 15:42:02 +0200 Subject: [PATCH] Bugfix/activate helidon versionutil tests (#18815) * Reactivate tests Contrary to Junit5, classes containing TestNG tests need to have public visibility, otherwise the tests will not be discovered and run. * Reformat tests for readability * Rewrite tests using fluent assertions --- .../languages/HelidonCommonCodegenTest.java | 35 +++++++------------ 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/languages/HelidonCommonCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/languages/HelidonCommonCodegenTest.java index 961e5a2a9e..09f1dabd86 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/languages/HelidonCommonCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/languages/HelidonCommonCodegenTest.java @@ -16,37 +16,26 @@ */ package org.openapitools.codegen.languages; +import org.testng.annotations.Test; + import java.util.List; -import org.testng.Assert; -import org.testng.annotations.Test; +import static org.assertj.core.api.Assertions.assertThat; // This test class is in this package, not org.openapitools.codegen.java.helidon, so it can refer to elements of // JavaHelidonCommonCodegen without making them public; package-private is sufficient and we don't want to expose those methods // more broadly. -class HelidonCommonCodegenTest { +public class HelidonCommonCodegenTest { - @Test - void checkMajorVersionMatch() { - Assert.assertEquals("1.2.3", - JavaHelidonCommonCodegen.VersionUtil.instance().chooseVersion("1", - List.of("3.2.1", - "3.2.0", - "2.0.4", - "1.2.3", - "1.2.2", - "1.1.0"))); + JavaHelidonCommonCodegen.VersionUtil test = JavaHelidonCommonCodegen.VersionUtil.instance(); + + @Test void checkMajorVersionMatch() { + assertThat(test.chooseVersion("1", List.of("3.2.1", "3.2.0", "2.0.4", "1.2.3", "1.2.2", "1.1.0"))) + .isEqualTo("1.2.3"); } - @Test - void checkExactMatch() { - Assert.assertEquals("1.2.2", - JavaHelidonCommonCodegen.VersionUtil.instance().chooseVersion("1.2.2", - List.of("3.2.1", - "3.2.0", - "2.0.4", - "1.2.3", - "1.2.2", - "1.1.0"))); + @Test void checkExactMatch() { + assertThat(test.chooseVersion("1.2.2", List.of("3.2.1", "3.2.0", "2.0.4", "1.2.3", "1.2.2", "1.1.0"))) + .isEqualTo("1.2.2"); } }