http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/JavaxXmlAdaptersTest.java ---------------------------------------------------------------------- diff --git a/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/JavaxXmlAdaptersTest.java b/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/JavaxXmlAdaptersTest.java index f68ccb4..ecc349c 100644 --- a/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/JavaxXmlAdaptersTest.java +++ b/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/JavaxXmlAdaptersTest.java @@ -23,12 +23,12 @@ import org.apache.polygene.api.injection.scope.Service; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.serialization.javaxxml.assembly.JavaxXmlSerializationAssembler; import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; public class JavaxXmlAdaptersTest extends AbstractPolygeneTest {
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/JavaxXmlValueCompositeSerializationTest.java ---------------------------------------------------------------------- diff --git a/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/JavaxXmlValueCompositeSerializationTest.java b/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/JavaxXmlValueCompositeSerializationTest.java index 7ded112..8986601 100644 --- a/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/JavaxXmlValueCompositeSerializationTest.java +++ b/extensions/serialization-javaxxml/src/test/java/org/apache/polygene/serialization/javaxxml/JavaxXmlValueCompositeSerializationTest.java @@ -24,12 +24,12 @@ import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.serialization.javaxxml.assembly.JavaxXmlSerializationAssembler; import org.apache.polygene.spi.serialization.XmlSerialization; import org.apache.polygene.test.serialization.AbstractValueCompositeSerializationTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.xmlunit.diff.DefaultNodeMatcher; import org.xmlunit.diff.ElementSelectors; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; import static org.xmlunit.matchers.CompareMatcher.isSimilarTo; public class JavaxXmlValueCompositeSerializationTest extends AbstractValueCompositeSerializationTest http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/internals/testsupport-internal/build.gradle ---------------------------------------------------------------------- diff --git a/internals/testsupport-internal/build.gradle b/internals/testsupport-internal/build.gradle index f04063b..6a8a1f4 100644 --- a/internals/testsupport-internal/build.gradle +++ b/internals/testsupport-internal/build.gradle @@ -26,6 +26,7 @@ jar { manifest { name = "Apache Polygene⢠Internals - Test Support" } } dependencies { api polygene.core.testsupport - implementation libraries.docker_junit + implementation (libraries.docker_junit ) { exclude group: "junit", module: "junit" } + implementation libraries.junit_vintage runtimeOnly polygene.core.runtime } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java index d5b861b..adfe8ff 100644 --- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java +++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmHistoryImplTest.java @@ -20,8 +20,7 @@ package org.apache.polygene.library.alarm; -import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Test; +import java.util.Map; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.service.ServiceReference; @@ -29,11 +28,14 @@ import org.apache.polygene.api.unitofwork.UnitOfWork; import org.apache.polygene.api.value.ValueBuilder; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; - -import java.util.Map; +import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.core.IsNull.nullValue; public class AlarmHistoryImplTest extends AbstractPolygeneTest @@ -90,9 +92,9 @@ public class AlarmHistoryImplTest AlarmHistory hist = underTest.history(); AlarmEvent event1 = hist.firstEvent(); AlarmEvent event2 = hist.lastEvent(); - assertNull( event1 ); - assertNull( event2 ); - assertEquals( "Activate Counter", 0, hist.activateCounter() ); + assertThat( event1, nullValue() ); + assertThat( event2, nullValue() ); + assertThat( "Activate Counter", hist.activateCounter(), equalTo( 0 ) ); } @Test @@ -105,9 +107,9 @@ public class AlarmHistoryImplTest AlarmHistory hist = underTest.history(); AlarmEvent event1 = hist.firstEvent(); AlarmEvent event2 = hist.lastEvent(); - assertFalse( event1.equals( event2 ) ); - assertEquals( AlarmPoint.STATUS_ACTIVATED, event1.newStatus().get().name(null) ); - assertEquals( AlarmPoint.STATUS_NORMAL, event2.newStatus().get().name(null) ); + assertThat( event1.equals( event2 ), is( false ) ); + assertThat( event1.newStatus().get().name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); + assertThat( event2.newStatus().get().name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); } @Test @@ -124,23 +126,23 @@ public class AlarmHistoryImplTest underTest.trigger( AlarmPoint.TRIGGER_DEACTIVATE ); underTest.trigger( AlarmPoint.TRIGGER_ACTIVATE ); - assertEquals( 5, eventCounter ); - assertEquals( 5, hist.allAlarmEvents().get().size() ); + assertThat( eventCounter, equalTo( 5 ) ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 5 ) ); AlarmEvent event = hist.eventAt( -1 ); - assertNull( event ); + assertThat( event, nullValue() ); event = hist.eventAt( 5 ); - assertNull( event ); + assertThat( event, nullValue() ); event = hist.eventAt( 0 ); - assertEquals( "activation", event.systemName().get() ); + assertThat( event.systemName().get(), equalTo( "activation" ) ); event = hist.eventAt( 1 ); - assertEquals( "deactivation", event.systemName().get() ); + assertThat( event.systemName().get(), equalTo( "deactivation" ) ); event = hist.eventAt( 2 ); - assertEquals( "activation", event.systemName().get() ); + assertThat( event.systemName().get(), equalTo( "activation" ) ); event = hist.eventAt( 3 ); - assertEquals( "deactivation", event.systemName().get() ); + assertThat( event.systemName().get(), equalTo( "deactivation" ) ); event = hist.eventAt( 4 ); - assertEquals( "activation", event.systemName().get() ); + assertThat( event.systemName().get(), equalTo( "activation" ) ); } @Test @@ -157,23 +159,23 @@ public class AlarmHistoryImplTest underTest.trigger( AlarmPoint.TRIGGER_DEACTIVATE ); underTest.trigger( AlarmPoint.TRIGGER_ACTIVATE ); - assertEquals( 5, eventCounter ); - assertEquals( 5, hist.allAlarmEvents().get().size() ); + assertThat( eventCounter, equalTo( 5 ) ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 5 ) ); AlarmEvent event = hist.eventAtEnd( -1 ); - assertNull( event ); + assertThat( event, nullValue() ); event = hist.eventAtEnd( 5 ); - assertNull( event ); + assertThat( event, nullValue() ); event = hist.eventAtEnd( 4 ); - assertEquals( "activation", event.systemName().get() ); + assertThat( event.systemName().get(), equalTo( "activation" ) ); event = hist.eventAtEnd( 3 ); - assertEquals( "deactivation", event.systemName().get() ); + assertThat( event.systemName().get(), equalTo( "deactivation" ) ); event = hist.eventAtEnd( 2 ); - assertEquals( "activation", event.systemName().get() ); + assertThat( event.systemName().get(), equalTo( "activation" ) ); event = hist.eventAtEnd( 1 ); - assertEquals( "deactivation", event.systemName().get() ); + assertThat( event.systemName().get(), equalTo( "deactivation" ) ); event = hist.eventAtEnd( 0 ); - assertEquals( "activation", event.systemName().get() ); + assertThat( event.systemName().get(), equalTo( "activation" ) ); } @Test @@ -203,7 +205,7 @@ public class AlarmHistoryImplTest verifyCounters( counters, 3, 2 ); int activateCounters = hist.activateCounter(); - assertEquals( 3, activateCounters ); + assertThat( activateCounters, equalTo( 3 ) ); hist.resetActivateCounter(); verifyCounters( counters, 0, 2 ); @@ -218,20 +220,20 @@ public class AlarmHistoryImplTest Number n2 = (Number) counters.get( AlarmPoint.TRIGGER_DEACTIVATE ); if( n1 == null ) { - assertEquals( 0, c1 ); + assertThat( c1, equalTo( 0 ) ); } else { - assertEquals( c1, n1 ); + assertThat( n1, equalTo( c1 ) ); } if( n2 == null ) { - assertEquals( 0, c2 ); + assertThat( c2, equalTo( 0 ) ); } else { - assertEquals( c2, n2 ); + assertThat( n2, equalTo( c2 ) ); } } @@ -242,39 +244,39 @@ public class AlarmHistoryImplTest AlarmPoint underTest = createAlarm( "testSetMaxSize" ); alarmSystem.addAlarmListener( this ); AlarmHistory hist = underTest.history(); - assertEquals( 0, hist.allAlarmEvents().get().size() ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 0 ) ); underTest.trigger( AlarmPoint.TRIGGER_ACTIVATE ); - assertEquals( 1, hist.allAlarmEvents().get().size() ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 1 ) ); underTest.trigger( AlarmPoint.TRIGGER_DEACTIVATE ); - assertEquals( 2, hist.allAlarmEvents().get().size() ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 2 ) ); underTest.trigger( AlarmPoint.TRIGGER_ACTIVATE ); - assertEquals( 3, hist.allAlarmEvents().get().size() ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 3 ) ); underTest.trigger( AlarmPoint.TRIGGER_DEACTIVATE ); - assertEquals( 4, hist.allAlarmEvents().get().size() ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 4 ) ); int maxsize = hist.maxSize().get(); - assertEquals( 30, maxsize ); + assertThat( maxsize, equalTo( 30 ) ); hist.maxSize().set( 3 ); // The Polygene version doesn't intercept the maxSize().set() method and purge the old underTest.trigger( AlarmPoint.TRIGGER_ACTIVATE ); // so we do another event to purge. - assertEquals( 3, hist.allAlarmEvents().get().size() ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 3 ) ); hist.maxSize().set( 0 ); underTest.trigger( AlarmPoint.TRIGGER_DEACTIVATE ); // so we do another event to purge. - assertEquals( 0, hist.allAlarmEvents().get().size() ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 0 ) ); underTest.trigger( AlarmPoint.TRIGGER_ACTIVATE ); - assertEquals( 0, hist.allAlarmEvents().get().size() ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 0 ) ); underTest.trigger( AlarmPoint.TRIGGER_DEACTIVATE ); - assertEquals( 0, hist.allAlarmEvents().get().size() ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 0 ) ); hist.maxSize().set( 2 ); - assertEquals( 0, hist.allAlarmEvents().get().size() ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 0 ) ); underTest.trigger( AlarmPoint.TRIGGER_ACTIVATE ); - assertEquals( 1, hist.allAlarmEvents().get().size() ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 1 ) ); underTest.trigger( AlarmPoint.TRIGGER_DEACTIVATE ); - assertEquals( 2, hist.allAlarmEvents().get().size() ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 2 ) ); underTest.trigger( AlarmPoint.TRIGGER_ACTIVATE ); - assertEquals( 2, hist.allAlarmEvents().get().size() ); - assertEquals( 11, eventCounter ); + assertThat( hist.allAlarmEvents().get().size(), equalTo( 2 ) ); + assertThat( eventCounter, equalTo( 11 ) ); } public void alarmFired( AlarmEvent event ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java index 42109fa..174f00f 100644 --- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java +++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmPointImplTest.java @@ -21,8 +21,6 @@ package org.apache.polygene.library.alarm; import java.util.List; import java.util.Locale; -import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Test; import org.apache.polygene.api.constraint.ConstraintViolationException; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.service.ServiceComposite; @@ -31,11 +29,14 @@ import org.apache.polygene.api.unitofwork.UnitOfWork; import org.apache.polygene.api.value.ValueBuilder; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; +import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.core.IsNull.nullValue; +import static org.junit.jupiter.api.Assertions.fail; public class AlarmPointImplTest extends AbstractPolygeneTest implements AlarmListener @@ -118,7 +119,7 @@ public class AlarmPointImplTest extends AbstractPolygeneTest throws Exception { AlarmPoint underTest = createAlarm( "TestCase AlarmPoint" ); - assertEquals( "TestCase AlarmPoint", underTest.name() ); + assertThat( underTest.name(), equalTo( "TestCase AlarmPoint" ) ); } @Test @@ -126,22 +127,22 @@ public class AlarmPointImplTest extends AbstractPolygeneTest throws Exception { AlarmPoint underTest = createAlarm( "TestCase AlarmPoint" ); -// assertEquals( "This is a default Locale description of a testcase AlarmPoint.", underTest.description() ); +// assertThat( underTest.description() , equalTo( "This is a default Locale description of a testcase AlarmPoint.")); Locale swedish = new Locale( "sv" ); - assertEquals( "Detta \u00E5r en svensk beskrivning av ett testlarm.", underTest.description( swedish ) ); + assertThat( underTest.description( swedish ), equalTo( "Detta \u00E5r en svensk beskrivning av ett testlarm." ) ); Locale english = Locale.UK; - assertEquals( "This is a UK Locale description of a testcase Alarm.", underTest.description( english ) ); + assertThat( underTest.description( english ), equalTo( "This is a UK Locale description of a testcase Alarm." ) ); } @Test public void testState() { AlarmPoint underTest = createAlarm( "testState" ); - assertEquals( AlarmPoint.STATUS_NORMAL, underTest.currentStatus().name( null ) ); + assertThat( underTest.currentStatus().name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); boolean condition = underTest.currentCondition(); - assertEquals( false, condition ); + assertThat( condition, equalTo( false ) ); } @Test @@ -150,17 +151,17 @@ public class AlarmPointImplTest extends AbstractPolygeneTest AlarmPoint underTest = createAlarm( "TestCase AlarmPoint" ); String alarmText = underTest.attribute( "text" ); - assertNull( alarmText ); + assertThat( alarmText, nullValue() ); underTest.setAttribute( "text", "TestCase AlarmPoint" ); - assertEquals( "TestCase AlarmPoint", underTest.attribute( "text" ) ); + assertThat( underTest.attribute( "text" ), equalTo( "TestCase AlarmPoint" ) ); List<String> names = underTest.attributeNames(); - assertEquals( 1, names.size() ); + assertThat( names.size(), equalTo( 1 ) ); underTest.setAttribute( "text", null ); names = underTest.attributeNames(); - assertEquals( 0, names.size() ); + assertThat( names.size(), equalTo( 0 ) ); } @Test @@ -186,7 +187,7 @@ public class AlarmPointImplTest extends AbstractPolygeneTest AlarmPoint underTest = createAlarm( "TestCase AlarmPoint" ); alarmSystem.addAlarmListener( this ); underTest.deactivate(); - assertEquals( 0, fired ); + assertThat( fired, equalTo( 0 ) ); } @Test @@ -206,16 +207,16 @@ public class AlarmPointImplTest extends AbstractPolygeneTest alarmSystem.addAlarmListener( this ); underTest.activate(); - assertEquals( 1, fired ); + assertThat( fired, equalTo( 1 ) ); alarmSystem.addAlarmListener( this ); underTest.deactivate(); - assertEquals( 3, fired ); + assertThat( fired, equalTo( 3 ) ); alarmSystem.removeAlarmListener( this ); underTest.activate(); - assertEquals( 4, fired ); + assertThat( fired, equalTo( 4 ) ); alarmSystem.removeAlarmListener( this ); underTest.deactivate(); - assertEquals( 4, fired ); + assertThat( fired, equalTo( 4 ) ); } public void alarmFired( AlarmEvent event ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmProxyTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmProxyTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmProxyTest.java index cd6c292..395ebf8 100644 --- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmProxyTest.java +++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmProxyTest.java @@ -27,11 +27,11 @@ import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.notNullValue; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class AlarmProxyTest extends AbstractPolygeneTest { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java index 0c39afe..549ffcf 100644 --- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java +++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/AlarmServiceTest.java @@ -19,7 +19,7 @@ */ package org.apache.polygene.library.alarm; -import org.junit.Test; +import java.util.List; import org.apache.polygene.api.constraint.ConstraintViolationException; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.service.ServiceComposite; @@ -28,11 +28,13 @@ import org.apache.polygene.api.value.ValueBuilder; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.AbstractPolygeneTest; - -import java.util.List; import org.apache.polygene.test.EntityTestAssembler; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.*; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.core.IsNull.notNullValue; +import static org.junit.jupiter.api.Assertions.fail; public class AlarmServiceTest extends AbstractPolygeneTest @@ -88,8 +90,8 @@ public class AlarmServiceTest { AlarmSystem alarmService = serviceFinder.findService( AlarmSystem.class ).get(); List<AlarmModelDescriptor> models = alarmService.alarmModels(); - assertNotNull( models ); - assertEquals( 2, models.size() ); + assertThat( models, notNullValue() ); + assertThat( models.size(), equalTo( 2 ) ); } @Test @@ -98,11 +100,11 @@ public class AlarmServiceTest { AlarmSystem alarmService = serviceFinder.findService( AlarmSystem.class ).get(); List<AlarmModelDescriptor> models = alarmService.alarmModels(); - assertNotNull( models ); - assertEquals( 2, models.size() ); + assertThat( models, notNullValue() ); + assertThat( models.size(), equalTo( 2 ) ); AlarmModel model = alarmService.defaultAlarmModel(); - assertNotNull( model ); + assertThat( model, notNullValue() ); } @Test @@ -127,7 +129,7 @@ public class AlarmServiceTest { // Expected. If an Error is thrown it should not be captured anywhere. } - assertEquals( 1, listener1.getCounter() ); // One time, because the second listener would not be called. + assertThat( listener1.getCounter(), equalTo( 1 ) ); // One time, because the second listener would not be called. alarmService.removeAlarmListener( listener3 ); alarmService.removeAlarmListener( listener1 ); @@ -135,31 +137,31 @@ public class AlarmServiceTest alarmService.addAlarmListener( listener1 ); // We should now have, 'counting', 'exception', 'counting' in the list. alarm.deactivate(); // No Exception should be thrown. The fireAlarm() should swallow it and ensure that // all listeners are called and then return. - assertEquals( 3, listener1.getCounter() ); + assertThat( listener1.getCounter(), equalTo( 3 ) ); List listeners = alarmService.alarmListeners(); - assertEquals( "Listeners registered.", 3, listeners.size() ); + assertThat( "Listeners registered.", listeners.size(), equalTo( 3 ) ); alarmService.removeAlarmListener( listener1 ); listeners = alarmService.alarmListeners(); - assertEquals( "Listeners registered.", 2, listeners.size() ); + assertThat( "Listeners registered.", listeners.size(), equalTo( 2 ) ); alarmService.removeAlarmListener( listener1 ); listeners = alarmService.alarmListeners(); - assertEquals( "Listeners registered.", 1, listeners.size() ); + assertThat( "Listeners registered.", listeners.size(), equalTo( 1 ) ); alarmService.removeAlarmListener( listener1 ); listeners = alarmService.alarmListeners(); - assertEquals( "Listeners registered.", 1, listeners.size() ); + assertThat( "Listeners registered.", listeners.size(), equalTo( 1 ) ); alarmService.removeAlarmListener( listener2 ); listeners = alarmService.alarmListeners(); System.out.println( listeners ); - assertEquals( "Listeners registered.", 0, listeners.size() ); + assertThat( "Listeners registered.", listeners.size(), equalTo( 0 ) ); alarmService.removeAlarmListener( listener2 ); listeners = alarmService.alarmListeners(); - assertEquals( "Listeners registered.", 0, listeners.size() ); + assertThat( "Listeners registered.", listeners.size(), equalTo( 0 ) ); try { @@ -171,7 +173,7 @@ public class AlarmServiceTest // expected } listeners = alarmService.alarmListeners(); - assertEquals( "Listeners registered.", 0, listeners.size() ); + assertThat( "Listeners registered.", listeners.size(), equalTo( 0 ) ); } private AlarmCategory createCategory( String name ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/ExtendedAlarmModelTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/ExtendedAlarmModelTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/ExtendedAlarmModelTest.java index 56f122a..e2679f5 100644 --- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/ExtendedAlarmModelTest.java +++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/ExtendedAlarmModelTest.java @@ -22,9 +22,8 @@ package org.apache.polygene.library.alarm; import java.time.Instant; import java.util.List; import java.util.Locale; -import org.apache.polygene.api.identity.Identity; -import org.junit.Test; import org.apache.polygene.api.entity.EntityBuilder; +import org.apache.polygene.api.identity.Identity; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.unitofwork.UnitOfWork; @@ -33,12 +32,13 @@ import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.core.IsNull.nullValue; +import static org.junit.jupiter.api.Assertions.fail; public class ExtendedAlarmModelTest extends AbstractPolygeneTest @@ -100,7 +100,7 @@ public class ExtendedAlarmModelTest boolean test9 = provider.modelDescription().toLowerCase().contains( "unblock" ); boolean test10 = provider.modelDescription().toLowerCase().contains( "disable" ); boolean test11 = provider.modelDescription().toLowerCase().contains( "enable" ); - assertTrue( test1 && test2 && test3 && test4 && test5 && test6 && test7 && test8 && test9 && test10 && test11 ); + assertThat( test1 && test2 && test3 && test4 && test5 && test6 && test7 && test8 && test9 && test10 && test11, is( true ) ); Locale english = new Locale( "en" ); test1 = provider.modelDescription( english ).toLowerCase().contains( "normal" ); @@ -114,7 +114,7 @@ public class ExtendedAlarmModelTest test9 = provider.modelDescription( english ).toLowerCase().contains( "unblock" ); test10 = provider.modelDescription( english ).toLowerCase().contains( "disable" ); test11 = provider.modelDescription( english ).toLowerCase().contains( "enable" ); - assertTrue( test1 && test2 && test3 && test4 && test5 && test6 && test7 && test8 && test9 && test10 && test11 ); + assertThat( test1 && test2 && test3 && test4 && test5 && test6 && test7 && test8 && test9 && test10 && test11, is( true ) ); } @Test @@ -124,7 +124,7 @@ public class ExtendedAlarmModelTest AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get(); AlarmPoint underTest = createAlarm( "Test AlarmPoint" ); List<String> triggers = provider.alarmTriggers(); - assertEquals( 7, triggers.size() ); + assertThat( triggers.size(), equalTo( 7 ) ); int result = 0; for( String trigger : triggers ) { @@ -157,8 +157,8 @@ public class ExtendedAlarmModelTest result |= 64; } } - assertEquals( 127, result ); - assertEquals( AlarmPoint.STATUS_NORMAL, underTest.currentStatus().name( null ) ); + assertThat( result, equalTo( 127 ) ); + assertThat( underTest.currentStatus().name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); } @Test @@ -168,31 +168,31 @@ public class ExtendedAlarmModelTest AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get(); AlarmPoint alarm = createAlarm( "Another 1" ); AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE ); - assertEquals( AlarmPoint.EVENT_ACTIVATION, event1.systemName().get() ); + assertThat( event1.systemName().get(), equalTo( AlarmPoint.EVENT_ACTIVATION ) ); alarm = createAlarm( "Another 2" ); AlarmEvent event2 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DEACTIVATE ); - assertNull( event2 ); + assertThat( event2, nullValue() ); alarm = createAlarm( "Another 3" ); AlarmEvent event3 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACKNOWLEDGE ); - assertNull( event3 ); + assertThat( event3, nullValue() ); alarm = createAlarm( "Another 4" ); AlarmEvent event4 = provider.evaluate( alarm, AlarmPoint.TRIGGER_BLOCK ); - assertEquals( AlarmPoint.EVENT_BLOCKING, event4.systemName().get() ); + assertThat( event4.systemName().get(), equalTo( AlarmPoint.EVENT_BLOCKING ) ); alarm = createAlarm( "Another 5" ); AlarmEvent event5 = provider.evaluate( alarm, AlarmPoint.TRIGGER_UNBLOCK ); - assertNull( event5 ); + assertThat( event5, nullValue() ); alarm = createAlarm( "Another 6" ); AlarmEvent event6 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DISABLE ); - assertEquals( AlarmPoint.EVENT_DISABLING, event6.systemName().get() ); + assertThat( event6.systemName().get(), equalTo( AlarmPoint.EVENT_DISABLING ) ); alarm = createAlarm( "Another 7" ); AlarmEvent event7 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ENABLE ); - assertNull( event7 ); + assertThat( event7, nullValue() ); } @Test @@ -204,37 +204,37 @@ public class ExtendedAlarmModelTest alarm.activate(); AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE ); - assertNull( event1 ); + assertThat( event1, nullValue() ); alarm = createAlarm( "Another 2" ); alarm.activate(); AlarmEvent event2 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DEACTIVATE ); - assertEquals( AlarmPoint.EVENT_DEACTIVATION, event2.systemName().get() ); + assertThat( event2.systemName().get(), equalTo( AlarmPoint.EVENT_DEACTIVATION ) ); alarm = createAlarm( "Another 3" ); alarm.activate(); AlarmEvent event3 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACKNOWLEDGE ); - assertEquals( AlarmPoint.EVENT_ACKNOWLEDGEMENT, event3.systemName().get() ); + assertThat( event3.systemName().get(), equalTo( AlarmPoint.EVENT_ACKNOWLEDGEMENT ) ); alarm = createAlarm( "Another 4" ); alarm.activate(); AlarmEvent event4 = provider.evaluate( alarm, AlarmPoint.TRIGGER_BLOCK ); - assertEquals( AlarmPoint.EVENT_BLOCKING, event4.systemName().get() ); + assertThat( event4.systemName().get(), equalTo( AlarmPoint.EVENT_BLOCKING ) ); alarm = createAlarm( "Another 5" ); alarm.activate(); AlarmEvent event5 = provider.evaluate( alarm, AlarmPoint.TRIGGER_UNBLOCK ); - assertNull( event5 ); + assertThat( event5, nullValue() ); alarm = createAlarm( "Another 6" ); alarm.activate(); AlarmEvent event6 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DISABLE ); - assertEquals( AlarmPoint.EVENT_DISABLING, event6.systemName().get() ); + assertThat( event6.systemName().get(), equalTo( AlarmPoint.EVENT_DISABLING ) ); alarm = createAlarm( "Another 7" ); alarm.activate(); AlarmEvent event7 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ENABLE ); - assertNull( event7 ); + assertThat( event7, nullValue() ); } @Test @@ -247,43 +247,43 @@ public class ExtendedAlarmModelTest alarm.acknowledge(); AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE ); - assertNull( event1 ); + assertThat( event1, nullValue() ); alarm = createAlarm( "Another 2" ); alarm.activate(); alarm.acknowledge(); AlarmEvent event2 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DEACTIVATE ); - assertEquals( AlarmPoint.EVENT_DEACTIVATION, event2.systemName().get() ); + assertThat( event2.systemName().get(), equalTo( AlarmPoint.EVENT_DEACTIVATION ) ); alarm = createAlarm( "Another 3" ); alarm.activate(); alarm.acknowledge(); AlarmEvent event3 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACKNOWLEDGE ); - assertNull( event3 ); + assertThat( event3, nullValue() ); alarm = createAlarm( "Another 4" ); alarm.activate(); alarm.acknowledge(); AlarmEvent event4 = provider.evaluate( alarm, AlarmPoint.TRIGGER_BLOCK ); - assertEquals( AlarmPoint.EVENT_BLOCKING, event4.systemName().get() ); + assertThat( event4.systemName().get(), equalTo( AlarmPoint.EVENT_BLOCKING ) ); alarm = createAlarm( "Another 5" ); alarm.activate(); alarm.acknowledge(); AlarmEvent event5 = provider.evaluate( alarm, AlarmPoint.TRIGGER_UNBLOCK ); - assertNull( event5 ); + assertThat( event5, nullValue() ); alarm = createAlarm( "Another 6" ); alarm.activate(); alarm.acknowledge(); AlarmEvent event6 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DISABLE ); - assertEquals( AlarmPoint.EVENT_DISABLING, event6.systemName().get() ); + assertThat( event6.systemName().get(), equalTo( AlarmPoint.EVENT_DISABLING ) ); alarm = createAlarm( "Another 7" ); alarm.activate(); alarm.acknowledge(); AlarmEvent event7 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ENABLE ); - assertNull( event7 ); + assertThat( event7, nullValue() ); } @Test @@ -295,43 +295,43 @@ public class ExtendedAlarmModelTest alarm.activate(); alarm.deactivate(); AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE ); - assertEquals( AlarmPoint.EVENT_ACTIVATION, event1.systemName().get() ); + assertThat( event1.systemName().get(), equalTo( AlarmPoint.EVENT_ACTIVATION ) ); alarm = createAlarm( "Another 2" ); alarm.activate(); alarm.deactivate(); AlarmEvent event2 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DEACTIVATE ); - assertNull( event2 ); + assertThat( event2, nullValue() ); alarm = createAlarm( "Another 3" ); alarm.activate(); alarm.deactivate(); AlarmEvent event3 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACKNOWLEDGE ); - assertEquals( AlarmPoint.EVENT_ACKNOWLEDGEMENT, event3.systemName().get() ); + assertThat( event3.systemName().get(), equalTo( AlarmPoint.EVENT_ACKNOWLEDGEMENT ) ); alarm = createAlarm( "Another 4" ); alarm.activate(); alarm.deactivate(); AlarmEvent event4 = provider.evaluate( alarm, AlarmPoint.TRIGGER_BLOCK ); - assertEquals( AlarmPoint.EVENT_BLOCKING, event4.systemName().get() ); + assertThat( event4.systemName().get(), equalTo( AlarmPoint.EVENT_BLOCKING ) ); alarm = createAlarm( "Another 5" ); alarm.activate(); alarm.deactivate(); AlarmEvent event5 = provider.evaluate( alarm, AlarmPoint.TRIGGER_UNBLOCK ); - assertNull( event5 ); + assertThat( event5, nullValue() ); alarm = createAlarm( "Another 6" ); alarm.activate(); alarm.deactivate(); AlarmEvent event6 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DISABLE ); - assertEquals( AlarmPoint.EVENT_DISABLING, event6.systemName().get() ); + assertThat( event6.systemName().get(), equalTo( AlarmPoint.EVENT_DISABLING ) ); alarm = createAlarm( "Another 7" ); alarm.activate(); alarm.deactivate(); AlarmEvent event7 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ENABLE ); - assertNull( event7 ); + assertThat( event7, nullValue() ); } @Test @@ -343,43 +343,43 @@ public class ExtendedAlarmModelTest alarm.activate(); alarm.trigger( "block" ); AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE ); - assertNull( event1 ); + assertThat( event1, nullValue() ); alarm = createAlarm( "Another 2" ); alarm.activate(); alarm.trigger( "block" ); AlarmEvent event2 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DEACTIVATE ); - assertNull( event2 ); + assertThat( event2, nullValue() ); alarm = createAlarm( "Another 3" ); alarm.activate(); alarm.trigger( "block" ); AlarmEvent event3 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACKNOWLEDGE ); - assertNull( event3 ); + assertThat( event3, nullValue() ); alarm = createAlarm( "Another 4" ); alarm.activate(); alarm.trigger( "block" ); AlarmEvent event4 = provider.evaluate( alarm, AlarmPoint.TRIGGER_BLOCK ); - assertNull( event4 ); + assertThat( event4, nullValue() ); alarm = createAlarm( "Another 5" ); alarm.activate(); alarm.trigger( "block" ); AlarmEvent event5 = provider.evaluate( alarm, AlarmPoint.TRIGGER_UNBLOCK ); - assertEquals( AlarmPoint.EVENT_UNBLOCKING, event5.systemName().get() ); + assertThat( event5.systemName().get(), equalTo( AlarmPoint.EVENT_UNBLOCKING ) ); alarm = createAlarm( "Another 6" ); alarm.activate(); alarm.trigger( "block" ); AlarmEvent event6 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DISABLE ); - assertEquals( AlarmPoint.EVENT_DISABLING, event6.systemName().get() ); + assertThat( event6.systemName().get(), equalTo( AlarmPoint.EVENT_DISABLING ) ); alarm = createAlarm( "Another 7" ); alarm.activate(); alarm.trigger( "block" ); AlarmEvent event7 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ENABLE ); - assertNull( event7 ); + assertThat( event7, nullValue() ); } @Test @@ -391,43 +391,43 @@ public class ExtendedAlarmModelTest alarm.activate(); alarm.trigger( "disable" ); AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE ); - assertNull( event1 ); + assertThat( event1, nullValue() ); alarm = createAlarm( "Another 2" ); alarm.activate(); alarm.trigger( "disable" ); AlarmEvent event2 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DEACTIVATE ); - assertNull( event2 ); + assertThat( event2, nullValue() ); alarm = createAlarm( "Another 3" ); alarm.activate(); alarm.trigger( "disable" ); AlarmEvent event3 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACKNOWLEDGE ); - assertNull( event3 ); + assertThat( event3, nullValue() ); alarm = createAlarm( "Another 4" ); alarm.activate(); alarm.trigger( "disable" ); AlarmEvent event4 = provider.evaluate( alarm, AlarmPoint.TRIGGER_BLOCK ); - assertNull( event4 ); + assertThat( event4, nullValue() ); alarm = createAlarm( "Another 5" ); alarm.activate(); alarm.trigger( "disable" ); AlarmEvent event5 = provider.evaluate( alarm, AlarmPoint.TRIGGER_UNBLOCK ); - assertNull( event5 ); + assertThat( event5, nullValue() ); alarm = createAlarm( "Another 6" ); alarm.activate(); alarm.trigger( "disable" ); AlarmEvent event6 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DISABLE ); - assertNull( event6 ); + assertThat( event6, nullValue() ); alarm = createAlarm( "Another 7" ); alarm.activate(); alarm.trigger( "disable" ); AlarmEvent event7 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ENABLE ); - assertEquals( AlarmPoint.EVENT_ENABLING, event7.systemName().get() ); + assertThat( event7.systemName().get(), equalTo( AlarmPoint.EVENT_ENABLING ) ); } @Test @@ -456,13 +456,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -475,13 +475,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_DEACTIVATED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_DEACTIVATED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -495,13 +495,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_ACKNOWLEDGED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_ACKNOWLEDGED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -516,13 +516,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_DEACTIVATED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_DEACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -537,13 +537,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACKNOWLEDGED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACKNOWLEDGED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -558,13 +558,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_DISABLED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_DISABLED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -579,13 +579,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_BLOCKED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_BLOCKED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -598,13 +598,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_BLOCKED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_BLOCKED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -618,13 +618,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_BLOCKED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_BLOCKED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -639,13 +639,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_DEACTIVATED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_DEACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_BLOCKED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_BLOCKED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -660,13 +660,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACKNOWLEDGED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACKNOWLEDGED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_BLOCKED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_BLOCKED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -679,13 +679,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_DISABLED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_DISABLED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -699,13 +699,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_DISABLED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_DISABLED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -720,13 +720,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_DEACTIVATED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_DEACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_DISABLED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_DISABLED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -741,13 +741,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACKNOWLEDGED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACKNOWLEDGED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_DISABLED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_DISABLED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -762,13 +762,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_BLOCKED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_BLOCKED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_DISABLED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_DISABLED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -783,13 +783,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_DISABLED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_DISABLED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -800,7 +800,7 @@ public class ExtendedAlarmModelTest underTest.updateCondition( false ); AlarmEvent event = underTest.history().lastEvent(); - assertNull( "Generated an event but should have not.", event ); + assertThat( "Generated an event but should have not.", event, nullValue() ); } @Test @@ -813,13 +813,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -833,13 +833,13 @@ public class ExtendedAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_DEACTIVATED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_DEACTIVATED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -848,20 +848,20 @@ public class ExtendedAlarmModelTest { AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get(); AlarmStatus s1 = createStatus( AlarmPoint.STATUS_NORMAL ); - assertFalse( provider.computeCondition( s1 ) ); + assertThat( provider.computeCondition( s1 ), is( false ) ); AlarmStatus s2 = createStatus( AlarmPoint.STATUS_ACTIVATED ); - assertTrue( provider.computeCondition( s2 ) ); + assertThat( provider.computeCondition( s2 ), is( true ) ); AlarmStatus s3 = createStatus( AlarmPoint.STATUS_DEACTIVATED ); - assertFalse( provider.computeCondition( s3 ) ); + assertThat( provider.computeCondition( s3 ), is( false ) ); AlarmStatus s4 = createStatus( AlarmPoint.STATUS_ACKNOWLEDGED ); - assertTrue( provider.computeCondition( s4 ) ); + assertThat( provider.computeCondition( s4 ), is( true ) ); AlarmStatus s5 = createStatus( AlarmPoint.STATUS_DISABLED ); - assertFalse( provider.computeCondition( s5 ) ); + assertThat( provider.computeCondition( s5 ), is( false ) ); AlarmStatus s6 = createStatus( AlarmPoint.STATUS_BLOCKED ); - assertFalse( provider.computeCondition( s6 ) ); + assertThat( provider.computeCondition( s6 ), is( false ) ); AlarmStatus s7 = createStatus( AlarmPoint.STATUS_REACTIVATED ); - assertTrue( provider.computeCondition( s7 ) ); + assertThat( provider.computeCondition( s7 ), is( true ) ); } @Test @@ -872,8 +872,8 @@ public class ExtendedAlarmModelTest AlarmStatus status = createStatus( AlarmPoint.STATUS_NORMAL ); String trigger1 = provider.computeTrigger( status, true ); String trigger2 = provider.computeTrigger( status, false ); - assertEquals( AlarmPoint.TRIGGER_ACTIVATE, trigger1 ); - assertEquals( null, trigger2 ); + assertThat( trigger1, equalTo( AlarmPoint.TRIGGER_ACTIVATE ) ); + assertThat( trigger2, equalTo( null ) ); } @Test @@ -883,8 +883,8 @@ public class ExtendedAlarmModelTest AlarmStatus status = createStatus( AlarmPoint.STATUS_ACTIVATED ); String trigger1 = provider.computeTrigger( status, true ); String trigger2 = provider.computeTrigger( status, false ); - assertEquals( null, trigger1 ); - assertEquals( AlarmPoint.TRIGGER_DEACTIVATE, trigger2 ); + assertThat( trigger1, equalTo( null ) ); + assertThat( trigger2, equalTo( AlarmPoint.TRIGGER_DEACTIVATE ) ); } @Test @@ -894,8 +894,8 @@ public class ExtendedAlarmModelTest AlarmStatus status = createStatus( AlarmPoint.STATUS_DEACTIVATED ); String trigger1 = provider.computeTrigger( status, true ); String trigger2 = provider.computeTrigger( status, false ); - assertEquals( AlarmPoint.TRIGGER_ACTIVATE, trigger1 ); - assertEquals( null, trigger2 ); + assertThat( trigger1, equalTo( AlarmPoint.TRIGGER_ACTIVATE ) ); + assertThat( trigger2, equalTo( null ) ); } @Test @@ -905,8 +905,8 @@ public class ExtendedAlarmModelTest AlarmStatus status = createStatus( AlarmPoint.STATUS_ACKNOWLEDGED ); String trigger1 = provider.computeTrigger( status, true ); String trigger2 = provider.computeTrigger( status, false ); - assertEquals( null, trigger1 ); - assertEquals( AlarmPoint.TRIGGER_DEACTIVATE, trigger2 ); + assertThat( trigger1, equalTo( null ) ); + assertThat( trigger2, equalTo( AlarmPoint.TRIGGER_DEACTIVATE ) ); } @Test @@ -916,8 +916,8 @@ public class ExtendedAlarmModelTest AlarmStatus status = createStatus( AlarmPoint.STATUS_REACTIVATED ); String trigger1 = provider.computeTrigger( status, true ); String trigger2 = provider.computeTrigger( status, false ); - assertEquals( null, trigger1 ); - assertEquals( AlarmPoint.TRIGGER_DEACTIVATE, trigger2 ); + assertThat( trigger1, equalTo( null ) ); + assertThat( trigger2, equalTo( AlarmPoint.TRIGGER_DEACTIVATE ) ); } @Test @@ -927,8 +927,8 @@ public class ExtendedAlarmModelTest AlarmStatus status = createStatus( AlarmPoint.STATUS_BLOCKED ); String trigger1 = provider.computeTrigger( status, true ); String trigger2 = provider.computeTrigger( status, false ); - assertEquals( null, trigger1 ); - assertEquals( null, trigger2 ); + assertThat( trigger1, equalTo( null ) ); + assertThat( trigger2, equalTo( null ) ); } @Test @@ -938,8 +938,8 @@ public class ExtendedAlarmModelTest AlarmStatus status = createStatus( AlarmPoint.STATUS_DISABLED ); String trigger1 = provider.computeTrigger( status, true ); String trigger2 = provider.computeTrigger( status, false ); - assertEquals( null, trigger1 ); - assertEquals( null, trigger2 ); + assertThat( trigger1, equalTo( null ) ); + assertThat( trigger2, equalTo( null ) ); } private AlarmPoint createAlarm( String name ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java index 1c93d2f..82a8ba7 100644 --- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java +++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/SimpleAlarmModelTest.java @@ -22,23 +22,23 @@ package org.apache.polygene.library.alarm; import java.time.Instant; import java.util.List; import java.util.Locale; -import org.apache.polygene.api.identity.Identity; -import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Test; import org.apache.polygene.api.entity.EntityBuilder; +import org.apache.polygene.api.identity.Identity; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.unitofwork.UnitOfWork; import org.apache.polygene.api.value.ValueBuilder; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; +import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.core.IsNull.nullValue; +import static org.junit.jupiter.api.Assertions.fail; public class SimpleAlarmModelTest extends AbstractPolygeneTest @@ -89,7 +89,7 @@ public class SimpleAlarmModelTest throws Exception { SimpleAlarmModelService.SimpleAlarmModelMixin spi = new SimpleAlarmModelService.SimpleAlarmModelMixin(); - assertEquals( "org.apache.polygene.library.alarm.model.simple", spi.modelName() ); + assertThat( spi.modelName(), equalTo( "org.apache.polygene.library.alarm.model.simple" ) ); } @Test @@ -101,14 +101,14 @@ public class SimpleAlarmModelTest boolean test2 = spi.modelDescription().toLowerCase().contains( "activated" ); boolean test3 = spi.modelDescription().toLowerCase().contains( "activation" ); boolean test4 = spi.modelDescription().toLowerCase().contains( "deactivation" ); - assertTrue( test1 && test2 && test3 && test4 ); + assertThat( test1 && test2 && test3 && test4, is( true ) ); Locale english = new Locale( "en" ); test1 = spi.modelDescription( english ).toLowerCase().contains( "normal" ); test2 = spi.modelDescription( english ).toLowerCase().contains( "activated" ); test3 = spi.modelDescription( english ).toLowerCase().contains( "activation" ); test4 = spi.modelDescription( english ).toLowerCase().contains( "deactivation" ); - assertTrue( test1 && test2 && test3 && test4 ); + assertThat( test1 && test2 && test3 && test4, is( true ) ); } @Test @@ -118,7 +118,7 @@ public class SimpleAlarmModelTest AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get(); AlarmPoint underTest = createAlarm( "Test AlarmPoint" ); List<String> triggers = provider.alarmTriggers(); - assertEquals( 2, triggers.size() ); + assertThat( triggers.size(), equalTo( 2 ) ); int result = 0; for( String trigger : triggers ) { @@ -151,8 +151,8 @@ public class SimpleAlarmModelTest result |= 64; } } - assertEquals( 3, result ); - assertEquals( AlarmPoint.STATUS_NORMAL, underTest.currentStatus().name(null) ); + assertThat( result, equalTo( 3 ) ); + assertThat( underTest.currentStatus().name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); } @Test @@ -162,17 +162,17 @@ public class SimpleAlarmModelTest AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get(); AlarmPoint alarm = createAlarm( "Another 1" ); AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE ); - assertEquals( AlarmPoint.EVENT_ACTIVATION, event1.systemName().get() ); + assertThat( event1.systemName().get(), equalTo( AlarmPoint.EVENT_ACTIVATION ) ); alarm = createAlarm( "Another 2" ); AlarmEvent event2 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DEACTIVATE ); - assertNull( event2 ); + assertThat( event2, nullValue() ); try { alarm = createAlarm( "Another 3" ); AlarmEvent event3 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACKNOWLEDGE ); - assertNull( event3 ); + assertThat( event3, nullValue() ); fail( "[Acknowledge] trigger should not be allowed on this model." ); } catch( IllegalArgumentException e ) @@ -190,12 +190,12 @@ public class SimpleAlarmModelTest alarm.activate(); AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE ); - assertNull( event1 ); + assertThat( event1, nullValue() ); alarm = createAlarm( "Another 2" ); alarm.activate(); AlarmEvent event2 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DEACTIVATE ); - assertEquals( AlarmPoint.EVENT_DEACTIVATION, event2.systemName().get() ); + assertThat( event2.systemName().get(), equalTo( AlarmPoint.EVENT_DEACTIVATION ) ); } @Test @@ -224,13 +224,13 @@ public class SimpleAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, oldstate.name(null) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, newstate.name(null) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -243,13 +243,13 @@ public class SimpleAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, oldstate.name(null) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, newstate.name(null) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -259,7 +259,7 @@ public class SimpleAlarmModelTest AlarmPoint underTest = createAlarm( "Test AlarmPoint" ); underTest.updateCondition( false ); AlarmEvent event = underTest.history().lastEvent(); - assertNull( "Generated an event but should have not.", event ); + assertThat( "Generated an event but should have not.", event, nullValue() ); } @Test @@ -271,13 +271,13 @@ public class SimpleAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, oldstate.name(null) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, newstate.name(null) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -290,13 +290,13 @@ public class SimpleAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, oldstate.name(null) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, newstate.name(null) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -305,9 +305,9 @@ public class SimpleAlarmModelTest { AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get(); AlarmStatus s1 = createStatus( AlarmPoint.STATUS_NORMAL ); - assertFalse( provider.computeCondition( s1 ) ); + assertThat( provider.computeCondition( s1 ), is( false ) ); AlarmStatus s2 = createStatus( AlarmPoint.STATUS_ACTIVATED ); - assertTrue( provider.computeCondition( s2 ) ); + assertThat( provider.computeCondition( s2 ), is( true ) ); } @Test @@ -321,10 +321,10 @@ public class SimpleAlarmModelTest String trigger2 = provider.computeTrigger( s2, true ); String trigger5 = provider.computeTrigger( s1, false ); String trigger6 = provider.computeTrigger( s2, false ); - assertEquals( AlarmPoint.TRIGGER_ACTIVATE, trigger1 ); - assertEquals( null, trigger2 ); - assertEquals( null, trigger5 ); - assertEquals( AlarmPoint.TRIGGER_DEACTIVATE, trigger6 ); + assertThat( trigger1, equalTo( AlarmPoint.TRIGGER_ACTIVATE ) ); + assertThat( trigger2, equalTo( null ) ); + assertThat( trigger5, equalTo( null ) ); + assertThat( trigger6, equalTo( AlarmPoint.TRIGGER_DEACTIVATE ) ); } private AlarmPoint createAlarm( String name ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java ---------------------------------------------------------------------- diff --git a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java index 20f6440..c5e77f6 100644 --- a/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java +++ b/libraries/alarm/src/test/java/org/apache/polygene/library/alarm/StandardAlarmModelTest.java @@ -23,24 +23,23 @@ package org.apache.polygene.library.alarm; import java.time.Instant; import java.util.List; import java.util.Locale; -import org.apache.polygene.api.identity.Identity; -import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Assert; -import org.junit.Test; import org.apache.polygene.api.entity.EntityBuilder; +import org.apache.polygene.api.identity.Identity; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.api.unitofwork.UnitOfWork; import org.apache.polygene.api.value.ValueBuilder; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; +import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsEqual.equalTo; +import static org.hamcrest.core.IsNull.nullValue; +import static org.junit.jupiter.api.Assertions.fail; public class StandardAlarmModelTest extends AbstractPolygeneTest @@ -91,7 +90,7 @@ public class StandardAlarmModelTest throws Exception { StandardAlarmModelService.StandardAlarmModelMixin spi = new StandardAlarmModelService.StandardAlarmModelMixin(); - assertEquals( "org.apache.polygene.library.alarm.model.standard", spi.modelName() ); + assertThat( spi.modelName(), equalTo( "org.apache.polygene.library.alarm.model.standard" ) ); } @Test @@ -106,7 +105,7 @@ public class StandardAlarmModelTest boolean test5 = spi.modelDescription().toLowerCase().contains( "activation" ); boolean test6 = spi.modelDescription().toLowerCase().contains( "deactivation" ); boolean test7 = spi.modelDescription().toLowerCase().contains( "acknowledge" ); - assertTrue( test1 && test2 && test3 && test4 && test5 && test6 && test7 ); + assertThat( test1 && test2 && test3 && test4 && test5 && test6 && test7, is( true ) ); Locale english = new Locale( "en" ); test1 = spi.modelDescription( english ).toLowerCase().contains( "normal" ); @@ -116,7 +115,7 @@ public class StandardAlarmModelTest test5 = spi.modelDescription( english ).toLowerCase().contains( "activation" ); test6 = spi.modelDescription( english ).toLowerCase().contains( "deactivation" ); test7 = spi.modelDescription( english ).toLowerCase().contains( "acknowledge" ); - assertTrue( test1 && test2 && test3 && test4 && test5 && test6 && test7 ); + assertThat( test1 && test2 && test3 && test4 && test5 && test6 && test7, is( true ) ); } @Test @@ -126,7 +125,7 @@ public class StandardAlarmModelTest AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get(); AlarmPoint underTest = createAlarm( "Test AlarmPoint" ); List<String> triggers = provider.alarmTriggers(); - assertEquals( 3, triggers.size() ); + assertThat( triggers.size(), equalTo( 3 ) ); int result = 0; for( String trigger : triggers ) { @@ -159,8 +158,8 @@ public class StandardAlarmModelTest result |= 64; } } - assertEquals( 7, result ); - assertEquals( AlarmPoint.STATUS_NORMAL, underTest.currentStatus().name( null ) ); + assertThat( result, equalTo( 7 ) ); + assertThat( underTest.currentStatus().name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); } @Test @@ -170,15 +169,15 @@ public class StandardAlarmModelTest AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get(); AlarmPoint alarm = createAlarm( "Another 1" ); AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE ); - assertEquals( AlarmPoint.EVENT_ACTIVATION, event1.systemName().get() ); + assertThat( event1.systemName().get(), equalTo( AlarmPoint.EVENT_ACTIVATION ) ); alarm = createAlarm( "Another 2" ); AlarmEvent event2 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DEACTIVATE ); - assertNull( event2 ); + assertThat( event2, nullValue() ); alarm = createAlarm( "Another 3" ); AlarmEvent event3 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACKNOWLEDGE ); - assertNull( event3 ); + assertThat( event3, nullValue() ); } @Test @@ -190,17 +189,17 @@ public class StandardAlarmModelTest alarm.activate(); AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE ); - assertNull( event1 ); + assertThat( event1, nullValue() ); alarm = createAlarm( "Another 2" ); alarm.activate(); AlarmEvent event2 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DEACTIVATE ); - assertEquals( AlarmPoint.EVENT_DEACTIVATION, event2.systemName().get() ); + assertThat( event2.systemName().get(), equalTo( AlarmPoint.EVENT_DEACTIVATION ) ); alarm = createAlarm( "Another 3" ); alarm.activate(); AlarmEvent event3 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACKNOWLEDGE ); - assertEquals( AlarmPoint.EVENT_ACKNOWLEDGEMENT, event3.systemName().get() ); + assertThat( event3.systemName().get(), equalTo( AlarmPoint.EVENT_ACKNOWLEDGEMENT ) ); } @Test @@ -213,19 +212,19 @@ public class StandardAlarmModelTest alarm.acknowledge(); AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE ); - assertNull( event1 ); + assertThat( event1, nullValue() ); alarm = createAlarm( "Another 2" ); alarm.activate(); alarm.acknowledge(); AlarmEvent event2 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DEACTIVATE ); - assertEquals( AlarmPoint.EVENT_DEACTIVATION, event2.systemName().get() ); + assertThat( event2.systemName().get(), equalTo( AlarmPoint.EVENT_DEACTIVATION ) ); alarm = createAlarm( "Another 3" ); alarm.activate(); alarm.acknowledge(); AlarmEvent event3 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACKNOWLEDGE ); - assertNull( event3 ); + assertThat( event3, nullValue() ); } @Test @@ -237,19 +236,19 @@ public class StandardAlarmModelTest alarm.activate(); alarm.deactivate(); AlarmEvent event1 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACTIVATE ); - assertEquals( AlarmPoint.EVENT_ACTIVATION, event1.systemName().get() ); + assertThat( event1.systemName().get(), equalTo( AlarmPoint.EVENT_ACTIVATION ) ); alarm = createAlarm( "Another 2" ); alarm.activate(); alarm.deactivate(); AlarmEvent event2 = provider.evaluate( alarm, AlarmPoint.TRIGGER_DEACTIVATE ); - assertNull( event2 ); + assertThat( event2, nullValue() ); alarm = createAlarm( "Another 3" ); alarm.activate(); alarm.deactivate(); AlarmEvent event3 = provider.evaluate( alarm, AlarmPoint.TRIGGER_ACKNOWLEDGE ); - assertEquals( AlarmPoint.EVENT_ACKNOWLEDGEMENT, event3.systemName().get() ); + assertThat( event3.systemName().get(), equalTo( AlarmPoint.EVENT_ACKNOWLEDGEMENT ) ); } @Test @@ -278,13 +277,13 @@ public class StandardAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - Assert.assertEquals( AlarmPoint.STATUS_NORMAL, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmStatus newstate = event.newStatus().get(); - Assert.assertEquals( AlarmPoint.STATUS_ACTIVATED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -297,13 +296,13 @@ public class StandardAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - Assert.assertEquals( AlarmPoint.STATUS_DEACTIVATED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_DEACTIVATED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -316,13 +315,13 @@ public class StandardAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - Assert.assertEquals( AlarmPoint.STATUS_ACKNOWLEDGED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_ACKNOWLEDGED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -336,13 +335,13 @@ public class StandardAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_DEACTIVATED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_DEACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -356,13 +355,13 @@ public class StandardAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACKNOWLEDGED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACKNOWLEDGED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -372,7 +371,7 @@ public class StandardAlarmModelTest AlarmPoint underTest = createAlarm( "Test AlarmPoint" ); underTest.updateCondition( false ); AlarmEvent event = underTest.history().lastEvent(); - assertNull( "Generated an event but should have not.", event ); + assertThat( "Generated an event but should have not.", event, nullValue() ); } @Test @@ -384,13 +383,13 @@ public class StandardAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_NORMAL, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_NORMAL ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -403,13 +402,13 @@ public class StandardAlarmModelTest AlarmEvent event = underTest.history().lastEvent(); AlarmStatus oldstate = event.oldStatus().get(); - assertEquals( AlarmPoint.STATUS_ACTIVATED, oldstate.name( null ) ); + assertThat( oldstate.name( null ), equalTo( AlarmPoint.STATUS_ACTIVATED ) ); AlarmStatus newstate = event.newStatus().get(); - assertEquals( AlarmPoint.STATUS_DEACTIVATED, newstate.name( null ) ); + assertThat( newstate.name( null ), equalTo( AlarmPoint.STATUS_DEACTIVATED ) ); AlarmPoint eventalarm = getAlarm( event.identity().get() ); - assertEquals( underTest, eventalarm ); + assertThat( eventalarm, equalTo( underTest ) ); } @Test @@ -418,13 +417,13 @@ public class StandardAlarmModelTest { AlarmModel provider = serviceFinder.findService( AlarmModel.class ).get(); AlarmStatus s1 = createStatus( AlarmPoint.STATUS_NORMAL ); - assertFalse( provider.computeCondition( s1 ) ); + assertThat( provider.computeCondition( s1 ), is( false ) ); AlarmStatus s2 = createStatus( AlarmPoint.STATUS_ACTIVATED ); - assertTrue( provider.computeCondition( s2 ) ); + assertThat( provider.computeCondition( s2 ), is( true ) ); AlarmStatus s3 = createStatus( AlarmPoint.STATUS_DEACTIVATED ); - assertFalse( provider.computeCondition( s3 ) ); + assertThat( provider.computeCondition( s3 ), is( false ) ); AlarmStatus s4 = createStatus( AlarmPoint.STATUS_ACKNOWLEDGED ); - assertTrue( provider.computeCondition( s4 ) ); + assertThat( provider.computeCondition( s4 ), is( true ) ); } @Test @@ -444,14 +443,14 @@ public class StandardAlarmModelTest String trigger6 = provider.computeTrigger( s2, false ); String trigger7 = provider.computeTrigger( s3, false ); String trigger8 = provider.computeTrigger( s4, false ); - assertEquals( AlarmPoint.TRIGGER_ACTIVATE, trigger1 ); - assertEquals( null, trigger2 ); - assertEquals( AlarmPoint.TRIGGER_ACTIVATE, trigger3 ); - assertEquals( null, trigger4 ); - assertEquals( null, trigger5 ); - assertEquals( AlarmPoint.TRIGGER_DEACTIVATE, trigger6 ); - assertEquals( null, trigger7 ); - assertEquals( AlarmPoint.TRIGGER_DEACTIVATE, trigger8 ); + assertThat( trigger1, equalTo( AlarmPoint.TRIGGER_ACTIVATE ) ); + assertThat( trigger2, equalTo( null ) ); + assertThat( trigger3, equalTo( AlarmPoint.TRIGGER_ACTIVATE ) ); + assertThat( trigger4, equalTo( null ) ); + assertThat( trigger5, equalTo( null ) ); + assertThat( trigger6, equalTo( AlarmPoint.TRIGGER_DEACTIVATE ) ); + assertThat( trigger7, equalTo( null ) ); + assertThat( trigger8, equalTo( AlarmPoint.TRIGGER_DEACTIVATE ) ); } private AlarmPoint createAlarm( String name )
