From 3cfb4c1cbd56cc9ac593c8e40d8e0cf0ccfd8728 Mon Sep 17 00:00:00 2001 From: Roman Korostinskiy <70313618+c71n93@users.noreply.github.com> Date: Tue, 7 May 2024 18:48:59 +0300 Subject: [PATCH 1/2] #2978 enabled tests for dataized logs --- eo-runtime/src/test/java/org/eolang/DataizedTest.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/eo-runtime/src/test/java/org/eolang/DataizedTest.java b/eo-runtime/src/test/java/org/eolang/DataizedTest.java index b2f856968f..70f2be7a51 100644 --- a/eo-runtime/src/test/java/org/eolang/DataizedTest.java +++ b/eo-runtime/src/test/java/org/eolang/DataizedTest.java @@ -33,20 +33,16 @@ import org.hamcrest.MatcherAssert; import org.hamcrest.Matchers; import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; /** * Test case for {@link Dataized}. * * @since 0.22 - * @todo #2931:30min Enable the disabled tests. The tests were disabled after \rho attribute - * became immutable. Need to find out what's going on and resolve the tests. */ final class DataizedTest { @Test - @Disabled void logsCorrectly() { final Logger log = Logger.getLogger("logsCorrectly"); final Level before = log.getLevel(); @@ -68,7 +64,6 @@ void logsCorrectly() { } @Test - @Disabled void logsWhenException() { final Logger log = Logger.getLogger("logsWhenException"); final Level before = log.getLevel(); @@ -79,7 +74,7 @@ void logsWhenException() { final Phi wrong = new PhIncorrect(Phi.Φ); IntStream.range(0, 5).forEach( i -> Assertions.assertThrows( - IllegalStateException.class, + ExFailure.class, () -> new Dataized(wrong).take(), AtCompositeTest.TO_ADD_MESSAGE ) From 5b1f54a2ca801165d84033191f4f9876e1f2e957 Mon Sep 17 00:00:00 2001 From: Roman Korostinskiy <70313618+c71n93@users.noreply.github.com> Date: Tue, 7 May 2024 18:51:42 +0300 Subject: [PATCH 2/2] #2978 add assertion messages --- eo-runtime/src/test/java/org/eolang/DataizedTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/eo-runtime/src/test/java/org/eolang/DataizedTest.java b/eo-runtime/src/test/java/org/eolang/DataizedTest.java index 70f2be7a51..563955d563 100644 --- a/eo-runtime/src/test/java/org/eolang/DataizedTest.java +++ b/eo-runtime/src/test/java/org/eolang/DataizedTest.java @@ -54,7 +54,7 @@ void logsCorrectly() { log.setLevel(before); log.removeHandler(hnd); MatcherAssert.assertThat( - AtCompositeTest.TO_ADD_MESSAGE, + "Expected correct logs for object dataization", logs.get(0).getMessage(), Matchers.allOf( Matchers.containsString("intν"), @@ -76,14 +76,14 @@ void logsWhenException() { i -> Assertions.assertThrows( ExFailure.class, () -> new Dataized(wrong).take(), - AtCompositeTest.TO_ADD_MESSAGE + "Expected failure with ExFailure exception on incorrect object dataization" ) ); new Dataized(new Data.ToPhi(1L), log).take(); log.setLevel(before); log.removeHandler(hnd); MatcherAssert.assertThat( - AtCompositeTest.TO_ADD_MESSAGE, + "Expected correct logs for object dataization", logs.get(0).getMessage(), Matchers.allOf( Matchers.containsString("intν"),