http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/PolygeneExportServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/PolygeneExportServiceTest.java b/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/PolygeneExportServiceTest.java index 7c5f447..699e1cc 100644 --- a/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/PolygeneExportServiceTest.java +++ b/libraries/spring/src/test/java/org/apache/polygene/library/spring/bootstrap/PolygeneExportServiceTest.java @@ -19,15 +19,18 @@ */ package org.apache.polygene.library.spring.bootstrap; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; -import static org.junit.Assert.*; import static org.apache.polygene.library.spring.bootstrap.PolygeneTestBootstrap.COMMENT_SERVICE_ID; +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.notNullValue; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration @@ -39,21 +42,21 @@ public final class PolygeneExportServiceTest @Test public final void testCommentService() { - assertTrue( appContext.containsBean( COMMENT_SERVICE_ID ) ); + assertThat( appContext.containsBean( COMMENT_SERVICE_ID ), is( true ) ); CommentService commentService = (CommentService) appContext.getBean( COMMENT_SERVICE_ID ); - assertNotNull( commentService ); + assertThat( commentService, notNullValue() ); String beerComment = commentService.comment( "beer" ); - assertEquals( "BEER IS GOOD.", beerComment ); + assertThat( beerComment, equalTo( "BEER IS GOOD." ) ); String colaComment = commentService.comment( "cola" ); - assertEquals( "COLA IS GOOD.", colaComment ); + assertThat( colaComment, equalTo( "COLA IS GOOD." ) ); String colaBeerComment = commentService.comment( "cola+beer" ); - assertEquals( "COLA+BEER IS BAAAD.", colaBeerComment ); + assertThat( colaBeerComment, equalTo( "COLA+BEER IS BAAAD." ) ); CommentServiceHolder holder = (CommentServiceHolder) appContext.getBean( "commentServiceHolder" ); - assertTrue( commentService == holder.service() ); + assertThat( commentService == holder.service(), is( true ) ); } }
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/spring/src/test/java/org/apache/polygene/library/spring/importer/PolygeneImportServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/spring/src/test/java/org/apache/polygene/library/spring/importer/PolygeneImportServiceTest.java b/libraries/spring/src/test/java/org/apache/polygene/library/spring/importer/PolygeneImportServiceTest.java index 74bbec4..83801a8 100644 --- a/libraries/spring/src/test/java/org/apache/polygene/library/spring/importer/PolygeneImportServiceTest.java +++ b/libraries/spring/src/test/java/org/apache/polygene/library/spring/importer/PolygeneImportServiceTest.java @@ -28,7 +28,7 @@ import org.apache.polygene.api.service.ServiceReference; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationContext; @@ -37,7 +37,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import static org.apache.polygene.api.service.qualifier.ServiceQualifier.withId; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; @RunWith( SpringJUnit4ClassRunner.class ) @ContextConfiguration http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractDataDefinitionTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractDataDefinitionTest.java b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractDataDefinitionTest.java index dc2e47d..9a0f642 100644 --- a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractDataDefinitionTest.java +++ b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractDataDefinitionTest.java @@ -26,7 +26,7 @@ import org.apache.polygene.library.sql.generator.grammar.factories.DataTypeFacto import org.apache.polygene.library.sql.generator.grammar.factories.DefinitionFactory; import org.apache.polygene.library.sql.generator.grammar.factories.TableReferenceFactory; import org.apache.polygene.library.sql.generator.vendor.SQLVendor; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** */ http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractModificationTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractModificationTest.java b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractModificationTest.java index 379da70..1d5f441 100644 --- a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractModificationTest.java +++ b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractModificationTest.java @@ -20,7 +20,7 @@ import org.apache.polygene.library.sql.generator.grammar.factories.QueryFactory; import org.apache.polygene.library.sql.generator.grammar.factories.TableReferenceFactory; import org.apache.polygene.library.sql.generator.grammar.modification.InsertStatement; import org.apache.polygene.library.sql.generator.vendor.SQLVendor; -import org.junit.Test; +import org.junit.jupiter.api.Test; public abstract class AbstractModificationTest extends AbstractSQLSyntaxTest { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractQueryTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractQueryTest.java b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractQueryTest.java index 921641b..8b28794 100644 --- a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractQueryTest.java +++ b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractQueryTest.java @@ -30,7 +30,7 @@ import org.apache.polygene.library.sql.generator.grammar.query.QueryExpression; import org.apache.polygene.library.sql.generator.grammar.query.QueryExpressionBody; import org.apache.polygene.library.sql.generator.grammar.query.joins.JoinType; import org.apache.polygene.library.sql.generator.vendor.SQLVendor; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Contains the tests for various queries to test functionality of parser. http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractSQLSyntaxTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractSQLSyntaxTest.java b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractSQLSyntaxTest.java index efe8848..d9dfffa 100644 --- a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractSQLSyntaxTest.java +++ b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/AbstractSQLSyntaxTest.java @@ -16,11 +16,13 @@ package org.apache.polygene.library.sql.generator; import org.apache.polygene.library.sql.generator.grammar.common.SQLStatement; import org.apache.polygene.library.sql.generator.vendor.SQLVendor; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; import org.slf4j.LoggerFactory; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsEqual.equalTo; + /** */ public abstract class AbstractSQLSyntaxTest @@ -33,19 +35,20 @@ public abstract class AbstractSQLSyntaxTest String stringStmt = vendor.toString( statement ); LoggerFactory.getLogger( this.getClass().getName() ).info( statementType + ":" + "\n" + stringStmt + "\n" ); - Assert.assertEquals( - "Strings must be same from both SQLVendor.toString(...) and statement.toString() methods.", stringStmt, - statement.toString() ); + assertThat( + "Strings must be same from both SQLVendor.toString(...) and statement.toString() methods.", + statement.toString(), + equalTo( stringStmt ) ); } - @Before + @BeforeEach public final void setUp() throws Exception { this._vendor = this.loadVendor(); } - @After + @AfterEach public final void tearDown() { this._vendor = null; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/MySQLQueryTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/MySQLQueryTest.java b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/MySQLQueryTest.java index 36053b3..4a9d600 100644 --- a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/MySQLQueryTest.java +++ b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/MySQLQueryTest.java @@ -17,7 +17,7 @@ package org.apache.polygene.library.sql.generator; import org.apache.polygene.library.sql.generator.vendor.MySQLVendor; import org.apache.polygene.library.sql.generator.vendor.SQLVendor; import org.apache.polygene.library.sql.generator.vendor.SQLVendorProvider; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** */ http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/PostgreSQLModificationTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/PostgreSQLModificationTest.java b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/PostgreSQLModificationTest.java index 7d605b8..c2c102e 100644 --- a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/PostgreSQLModificationTest.java +++ b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/PostgreSQLModificationTest.java @@ -25,7 +25,7 @@ import org.apache.polygene.library.sql.generator.grammar.modification.ValueSourc import org.apache.polygene.library.sql.generator.vendor.PostgreSQLVendor; import org.apache.polygene.library.sql.generator.vendor.SQLVendor; import org.apache.polygene.library.sql.generator.vendor.SQLVendorProvider; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class PostgreSQLModificationTest extends AbstractModificationTest { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/PostgreSQLQueryTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/PostgreSQLQueryTest.java b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/PostgreSQLQueryTest.java index 31bea6e..57a15ab 100644 --- a/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/PostgreSQLQueryTest.java +++ b/libraries/sql-generator/src/test/java/org/apache/polygene/library/sql/generator/PostgreSQLQueryTest.java @@ -16,7 +16,7 @@ package org.apache.polygene.library.sql.generator; import org.apache.polygene.library.sql.generator.vendor.PostgreSQLVendor; import org.apache.polygene.library.sql.generator.vendor.SQLVendorProvider; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** */ http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/sql-liquibase/src/test/java/org/apache/polygene/library/sql/liquibase/LiquibaseServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql-liquibase/src/test/java/org/apache/polygene/library/sql/liquibase/LiquibaseServiceTest.java b/libraries/sql-liquibase/src/test/java/org/apache/polygene/library/sql/liquibase/LiquibaseServiceTest.java index dd9ff28..a14102d 100644 --- a/libraries/sql-liquibase/src/test/java/org/apache/polygene/library/sql/liquibase/LiquibaseServiceTest.java +++ b/libraries/sql-liquibase/src/test/java/org/apache/polygene/library/sql/liquibase/LiquibaseServiceTest.java @@ -47,15 +47,14 @@ import org.jooq.impl.DSL; import org.jooq.impl.DataSourceConnectionProvider; import org.jooq.impl.DefaultConfiguration; import org.jooq.impl.ThreadLocalTransactionProvider; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static java.util.stream.Collectors.toList; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; +import static org.hamcrest.MatcherAssert.assertThat; import static org.jooq.impl.DSL.field; import static org.jooq.impl.DSL.table; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; /** * Test DataSource and Liquibase services @@ -129,7 +128,7 @@ public class LiquibaseServiceTest InsertValuesStep2 insert = jooq.insertInto( testTable ) .columns( idColumn, fooColumn ) .values( "someid", "bar" ); - assertTrue( insert.execute() == 1 ); + assertThat( insert.execute() == 1, is( true ) ); } ); jooq.transaction( conf -> { List<Record> records = jooq.selectFrom( testTable ).stream().collect( toList() ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/sql/src/test/java/org/apache/polygene/library/sql/datasource/ExternalDataSourceTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql/src/test/java/org/apache/polygene/library/sql/datasource/ExternalDataSourceTest.java b/libraries/sql/src/test/java/org/apache/polygene/library/sql/datasource/ExternalDataSourceTest.java index 3d2e9a2..e302f47 100644 --- a/libraries/sql/src/test/java/org/apache/polygene/library/sql/datasource/ExternalDataSourceTest.java +++ b/libraries/sql/src/test/java/org/apache/polygene/library/sql/datasource/ExternalDataSourceTest.java @@ -29,7 +29,7 @@ import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.library.sql.assembly.ExternalDataSourceAssembler; import org.apache.polygene.library.sql.common.SQLUtil; import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; public class ExternalDataSourceTest extends AbstractPolygeneTest http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/sql/src/test/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/sql/src/test/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java b/libraries/sql/src/test/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java index 9bfc975..7e894a7 100644 --- a/libraries/sql/src/test/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java +++ b/libraries/sql/src/test/java/org/apache/polygene/library/sql/jmx/DataSourceConfigurationManagerServiceTest.java @@ -32,7 +32,7 @@ import org.apache.polygene.library.sql.dbcp.DBCPDataSourceServiceAssembler; import org.apache.polygene.library.sql.liquibase.LiquibaseAssembler; import org.apache.polygene.library.sql.liquibase.LiquibaseConfiguration; import org.apache.polygene.test.EntityTestAssembler; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test of export of DataSources to JMX, and some other stuff http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/PersistingSequencingTest.java ---------------------------------------------------------------------- diff --git a/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/PersistingSequencingTest.java b/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/PersistingSequencingTest.java index 25be0f6..f25304b 100644 --- a/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/PersistingSequencingTest.java +++ b/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/PersistingSequencingTest.java @@ -19,18 +19,19 @@ */ package org.apache.polygene.library.uid.sequence; -import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Test; import org.apache.polygene.api.composite.TransientComposite; import org.apache.polygene.api.injection.scope.Service; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.library.uid.sequence.assembly.PersistingSequencingAssembler; +import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.*; - public class PersistingSequencingTest extends AbstractPolygeneTest { @Override @@ -46,7 +47,7 @@ public class PersistingSequencingTest extends AbstractPolygeneTest throws Exception { UnderTest underTest = transientBuilderFactory.newTransient( UnderTest.class ); - assertEquals( 0, underTest.currentValue() ); + assertThat( underTest.currentValue(), equalTo( 0 ) ); } @Test @@ -54,8 +55,8 @@ public class PersistingSequencingTest extends AbstractPolygeneTest throws Exception { UnderTest underTest = transientBuilderFactory.newTransient( UnderTest.class ); - assertEquals( 1, underTest.nextValue() ); - assertEquals( 1, underTest.currentValue() ); + assertThat( underTest.nextValue(), equalTo( 1 ) ); + assertThat( underTest.currentValue(), equalTo( 1 ) ); } @Test @@ -65,10 +66,10 @@ public class PersistingSequencingTest extends AbstractPolygeneTest UnderTest underTest = transientBuilderFactory.newTransient( UnderTest.class ); for( int i = 1; i <= 100; i++ ) { - assertEquals( i, underTest.nextValue() ); - assertEquals( i, underTest.currentValue() ); - assertEquals( i, underTest.currentValue() ); - assertEquals( i, underTest.currentValue() ); + assertThat( underTest.nextValue(), equalTo( i ) ); + assertThat( underTest.currentValue(), equalTo( i ) ); + assertThat( underTest.currentValue(), equalTo( i ) ); + assertThat( underTest.currentValue(), equalTo( i ) ); } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/TransientSequencingTest.java ---------------------------------------------------------------------- diff --git a/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/TransientSequencingTest.java b/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/TransientSequencingTest.java index e8f8f40..0d69479 100644 --- a/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/TransientSequencingTest.java +++ b/libraries/uid/src/test/java/org/apache/polygene/library/uid/sequence/TransientSequencingTest.java @@ -19,21 +19,23 @@ */ package org.apache.polygene.library.uid.sequence; -import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Test; import org.apache.polygene.api.composite.TransientComposite; import org.apache.polygene.api.injection.scope.Service; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.library.uid.sequence.assembly.TransientSequencingAssembler; +import org.apache.polygene.test.AbstractPolygeneTest; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsEqual.equalTo; public class TransientSequencingTest extends AbstractPolygeneTest { @Override - public void assemble( ModuleAssembly module ) throws AssemblyException + public void assemble( ModuleAssembly module ) + throws AssemblyException { new TransientSequencingAssembler().assemble( module ); module.transients( UnderTestComposite.class ); @@ -44,7 +46,7 @@ public class TransientSequencingTest extends AbstractPolygeneTest throws Exception { UnderTest underTest = transientBuilderFactory.newTransient( UnderTest.class ); - assertEquals( 0, underTest.currentValue() ); + assertThat( underTest.currentValue(), equalTo( 0 ) ); } @Test @@ -52,8 +54,8 @@ public class TransientSequencingTest extends AbstractPolygeneTest throws Exception { UnderTest underTest = transientBuilderFactory.newTransient( UnderTest.class ); - assertEquals( 1, underTest.nextValue() ); - assertEquals( 1, underTest.currentValue() ); + assertThat( underTest.nextValue(), equalTo( 1 ) ); + assertThat( underTest.currentValue(), equalTo( 1 ) ); } @Test @@ -63,10 +65,10 @@ public class TransientSequencingTest extends AbstractPolygeneTest UnderTest underTest = transientBuilderFactory.newTransient( UnderTest.class ); for( int i = 1; i <= 100; i++ ) { - assertEquals( i, underTest.nextValue() ); - assertEquals( i, underTest.currentValue() ); - assertEquals( i, underTest.currentValue() ); - assertEquals( i, underTest.currentValue() ); + assertThat( underTest.nextValue(), equalTo( i ) ); + assertThat( underTest.currentValue(), equalTo( i ) ); + assertThat( underTest.currentValue(), equalTo( i ) ); + assertThat( underTest.currentValue(), equalTo( i ) ); } } @@ -85,7 +87,8 @@ public class TransientSequencingTest extends AbstractPolygeneTest public static class UnderTestMixin implements UnderTest { - @Service private Sequencing service; + @Service + private Sequencing service; public long nextValue() { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/uid/src/test/java/org/apache/polygene/library/uid/uuid/UuidServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/uid/src/test/java/org/apache/polygene/library/uid/uuid/UuidServiceTest.java b/libraries/uid/src/test/java/org/apache/polygene/library/uid/uuid/UuidServiceTest.java index af5a490..4d54cb2 100644 --- a/libraries/uid/src/test/java/org/apache/polygene/library/uid/uuid/UuidServiceTest.java +++ b/libraries/uid/src/test/java/org/apache/polygene/library/uid/uuid/UuidServiceTest.java @@ -19,23 +19,25 @@ */ package org.apache.polygene.library.uid.uuid; -import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Test; import org.apache.polygene.api.composite.TransientComposite; import org.apache.polygene.api.injection.scope.Service; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.library.uid.uuid.assembly.UuidServiceAssembler; +import org.apache.polygene.test.AbstractPolygeneTest; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; +import static org.hamcrest.core.IsEqual.equalTo; public class UuidServiceTest extends AbstractPolygeneTest { - public void assemble( ModuleAssembly module ) throws AssemblyException + public void assemble( ModuleAssembly module ) + throws AssemblyException { - new UuidServiceAssembler().assemble(module); + new UuidServiceAssembler().assemble( module ); module.transients( UnderTestComposite.class ); } @@ -47,11 +49,11 @@ public class UuidServiceTest extends AbstractPolygeneTest for( int hashLength = 1; hashLength < 50; hashLength++ ) { String uid = ut.generateUuid( hashLength ); - assertEquals( hashLength * 2, uid.length() ); + assertThat( uid.length(), equalTo( hashLength * 2 ) ); for( int i = 0; i < uid.length(); i++ ) { char ch = uid.charAt( i ); - assertTrue( ( ch >= '0' && ch <= '9' ) || ( ch >= 'A' && ch <= 'F' ) ); + assertThat( ( ch >= '0' && ch <= '9' ) || ( ch >= 'A' && ch <= 'F' ), is( true ) ); } } } @@ -72,10 +74,10 @@ public class UuidServiceTest extends AbstractPolygeneTest } else { - assertTrue( ( ch >= '0' && ch <= '9' ) || ( ch >= 'A' && ch <= 'F' ) ); + assertThat( ( ch >= '0' && ch <= '9' ) || ( ch >= 'A' && ch <= 'F' ), is( true ) ); } } - assertEquals( 5, dashCounter ); + assertThat( dashCounter, equalTo( 5 ) ); } @Mixins( UnderTestMixin.class ) @@ -91,7 +93,8 @@ public class UuidServiceTest extends AbstractPolygeneTest public static class UnderTestMixin implements UnderTest { - @Service private UuidService service; + @Service + private UuidService service; public String generateUuid( int len ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/uowfile/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/uowfile/build.gradle b/libraries/uowfile/build.gradle index 75dbb9e..49da573 100644 --- a/libraries/uowfile/build.gradle +++ b/libraries/uowfile/build.gradle @@ -33,6 +33,7 @@ dependencies { runtimeOnly polygene.core.runtime testImplementation polygene.core.testsupport + testImplementation libraries.junit_vintage testRuntimeOnly libraries.logback } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/uowfile/src/test/java/org/apache/polygene/library/uowfile/HasUoWFileTest.java ---------------------------------------------------------------------- diff --git a/libraries/uowfile/src/test/java/org/apache/polygene/library/uowfile/HasUoWFileTest.java b/libraries/uowfile/src/test/java/org/apache/polygene/library/uowfile/HasUoWFileTest.java index ea92556..01cbf36 100644 --- a/libraries/uowfile/src/test/java/org/apache/polygene/library/uowfile/HasUoWFileTest.java +++ b/libraries/uowfile/src/test/java/org/apache/polygene/library/uowfile/HasUoWFileTest.java @@ -53,17 +53,16 @@ import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class HasUoWFileTest extends AbstractPolygeneTest @@ -216,7 +215,7 @@ public class HasUoWFileTest TestedEntity entity = createTestedEntity( uow, "Testing Creation Rollback" ); attachedFile = entity.attachedFile(); } - assertFalse( "File still exists after discarded creation UoW", attachedFile.exists() ); + assertThat( "File still exists after discarded creation UoW", attachedFile.exists(), is( false ) ); // Test completed creation try( UnitOfWork uow = unitOfWorkFactory.newUnitOfWork() ) @@ -299,7 +298,7 @@ public class HasUoWFileTest TestedEntity entity = uow.get( TestedEntity.class, entityId ); uow.remove( entity ); } - assertTrue( "File do not exists after discarded deletion", attachedFile.exists() ); + assertThat( "File do not exists after discarded deletion", attachedFile.exists(), is( true ) ); // Testing completed deletion try( UnitOfWork uow = unitOfWorkFactory.newUnitOfWork() ) @@ -308,7 +307,7 @@ public class HasUoWFileTest uow.remove( entity ); uow.complete(); } - assertFalse( "File still exists after deletion", attachedFile.exists() ); + assertThat( "File still exists after deletion", attachedFile.exists(), is( false ) ); } @Test @@ -408,7 +407,7 @@ public class HasUoWFileTest eachEx.printStackTrace(); } - assertTrue( "There were errors during TestRetry", ex.isEmpty() ); + assertThat( "There were errors during TestRetry", ex.isEmpty(), is( true ) ); try( Stream<String> lines = Files.lines( attachedFile.toPath() ) ) { assertThat( "Modified file content was not the good one", http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/libraries/uowfile/src/test/java/org/apache/polygene/library/uowfile/HasUoWFilesTest.java ---------------------------------------------------------------------- diff --git a/libraries/uowfile/src/test/java/org/apache/polygene/library/uowfile/HasUoWFilesTest.java b/libraries/uowfile/src/test/java/org/apache/polygene/library/uowfile/HasUoWFilesTest.java index 6fcdce9..c63aed4 100644 --- a/libraries/uowfile/src/test/java/org/apache/polygene/library/uowfile/HasUoWFilesTest.java +++ b/libraries/uowfile/src/test/java/org/apache/polygene/library/uowfile/HasUoWFilesTest.java @@ -53,17 +53,16 @@ import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; import org.junit.Before; import org.junit.Rule; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.junit.rules.TemporaryFolder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; -import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; +import static org.junit.jupiter.api.Assertions.fail; public class HasUoWFilesTest extends AbstractPolygeneTest @@ -233,7 +232,7 @@ public class HasUoWFilesTest TestedEntity entity = createTestedOneEntityTwoFilesEntity( uow, "Testing Creation Rollback" ); attachedFile = entity.attachedFile( MyEnum.fileOne ); } - assertFalse( "File still exists after discarded creation UoW", attachedFile.exists() ); + assertThat( "File still exists after discarded creation UoW", attachedFile.exists(), is( false ) ); // Test completed creation try( UnitOfWork uow = unitOfWorkFactory.newUnitOfWork() ) @@ -316,7 +315,7 @@ public class HasUoWFilesTest TestedEntity entity = uow.get( TestedEntity.class, entityId ); uow.remove( entity ); } - assertTrue( "File do not exists after discarded deletion", attachedFile.exists() ); + assertThat( "File do not exists after discarded deletion", attachedFile.exists(), is( true ) ); // Testing completed deletion try( UnitOfWork uow = unitOfWorkFactory.newUnitOfWork() ) @@ -325,7 +324,7 @@ public class HasUoWFilesTest uow.remove( entity ); uow.complete(); } - assertFalse( "File still exists after deletion", attachedFile.exists() ); + assertThat( "File still exists after deletion", attachedFile.exists(), is( false ) ); } @Test @@ -425,7 +424,7 @@ public class HasUoWFilesTest eachEx.printStackTrace(); } - assertTrue( "There were errors during TestRetry", ex.isEmpty() ); + assertThat( "There were errors during TestRetry", ex.isEmpty(), is( true ) ); try( Stream<String> lines = Files.lines( attachedFile.toPath() ) ) { assertThat("Modified file content was not the good one", http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/TransferMoneyTest.java ---------------------------------------------------------------------- diff --git a/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/TransferMoneyTest.java b/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/TransferMoneyTest.java index 698dfeb..c99ea76 100644 --- a/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/TransferMoneyTest.java +++ b/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/TransferMoneyTest.java @@ -33,12 +33,13 @@ import org.apache.polygene.dci.moneytransfer.rolemap.CheckingAccountRolemap; import org.apache.polygene.dci.moneytransfer.rolemap.CreditorRolemap; import org.apache.polygene.dci.moneytransfer.rolemap.SavingsAccountRolemap; import org.apache.polygene.test.EntityTestAssembler; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.polygene.api.usecase.UsecaseBuilder.newUsecase; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Test of TransferMoneyContext @@ -49,7 +50,7 @@ public class TransferMoneyTest private static SingletonAssembler assembler; private static UnitOfWorkFactory uowf; - @BeforeClass + @BeforeAll public static void setup() throws Exception { @@ -67,7 +68,7 @@ public class TransferMoneyTest bootstrapData( assembler ); } - @Before + @BeforeEach public void beforeBalances() { System.out.println( "Before enactment:" ); @@ -75,7 +76,7 @@ public class TransferMoneyTest System.out.println( "" ); } - @After + @AfterEach public void afterBalances() { System.out.println( "After enactment:" ); @@ -158,32 +159,34 @@ public class TransferMoneyTest } } - @Test( expected = IllegalArgumentException.class ) + @Test public void transferTwiceOfMoneyFromSavingsToChecking() throws Exception { - UnitOfWork uow = uowf.newUnitOfWork( UsecaseBuilder.newUsecase( "Transfer from savings to checking" ) ); + assertThrows( IllegalArgumentException.class, () -> { + UnitOfWork uow = uowf.newUnitOfWork( UsecaseBuilder.newUsecase( "Transfer from savings to checking" ) ); - try - { - // Select source and destination - BalanceData source = uow.get( BalanceData.class, SAVINGS_ACCOUNT_ID ); - BalanceData destination = uow.get( BalanceData.class, CHECKING_ACCOUNT_ID ); + try + { + // Select source and destination + BalanceData source = uow.get( BalanceData.class, SAVINGS_ACCOUNT_ID ); + BalanceData destination = uow.get( BalanceData.class, CHECKING_ACCOUNT_ID ); - // Instantiate context and execute enactments with that context - TransferMoneyContext context = new TransferMoneyContext(); - context.bind( source, destination ); + // Instantiate context and execute enactments with that context + TransferMoneyContext context = new TransferMoneyContext(); + context.bind( source, destination ); - // Query for double the balance - final Integer amountToTransfer = context.availableFunds() * 2; + // Query for double the balance + final Integer amountToTransfer = context.availableFunds() * 2; - // Transfer from savings to checking - context.transfer( amountToTransfer ); - } - finally - { - uow.discard(); - } + // Transfer from savings to checking + context.transfer( amountToTransfer ); + } + finally + { + uow.discard(); + } + } ); } @Test http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/TransferMoneyTest2.java ---------------------------------------------------------------------- diff --git a/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/TransferMoneyTest2.java b/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/TransferMoneyTest2.java index 3f6834d..f81c4a4 100644 --- a/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/TransferMoneyTest2.java +++ b/samples/dci/src/test/java/org/apache/polygene/dci/moneytransfer/test/TransferMoneyTest2.java @@ -32,12 +32,13 @@ import org.apache.polygene.dci.moneytransfer.domain.entity.CheckingAccountEntity import org.apache.polygene.dci.moneytransfer.domain.entity.CreditorEntity; import org.apache.polygene.dci.moneytransfer.domain.entity.SavingsAccountEntity; import org.apache.polygene.test.EntityTestAssembler; -import org.junit.After; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.polygene.api.usecase.UsecaseBuilder.newUsecase; +import static org.junit.jupiter.api.Assertions.assertThrows; /** * Test of TransferMoneyContext @@ -48,7 +49,7 @@ public class TransferMoneyTest2 private static Module module; private static UnitOfWorkFactory uowf; - @BeforeClass + @BeforeAll public static void setup() throws Exception { @@ -71,7 +72,7 @@ public class TransferMoneyTest2 bootstrapData(); } - @Before + @BeforeEach public void beforeBalances() { System.out.println( "Before enactment:" ); @@ -79,7 +80,7 @@ public class TransferMoneyTest2 System.out.println( "" ); } - @After + @AfterEach public void afterBalances() { System.out.println( "After enactment:" ); @@ -162,32 +163,34 @@ public class TransferMoneyTest2 } } - @Test( expected = IllegalArgumentException.class ) + @Test public void transferTwiceOfMoneyFromSavingsToChecking() throws Exception { - UnitOfWork uow = uowf.newUnitOfWork( UsecaseBuilder.newUsecase( "Transfer from savings to checking" ) ); + assertThrows( IllegalArgumentException.class, () -> { + UnitOfWork uow = uowf.newUnitOfWork( UsecaseBuilder.newUsecase( "Transfer from savings to checking" ) ); - try - { - // Select source and destination - BalanceData source = uow.get( BalanceData.class, SAVINGS_ACCOUNT_ID ); - BalanceData destination = uow.get( BalanceData.class, CHECKING_ACCOUNT_ID ); + try + { + // Select source and destination + BalanceData source = uow.get( BalanceData.class, SAVINGS_ACCOUNT_ID ); + BalanceData destination = uow.get( BalanceData.class, CHECKING_ACCOUNT_ID ); - // Instantiate context and execute enactments with that context - TransferMoneyContext2 context = module.newTransient( TransferMoneyContext2.class ) - .bind( source, destination ); + // Instantiate context and execute enactments with that context + TransferMoneyContext2 context = module.newTransient( TransferMoneyContext2.class ) + .bind( source, destination ); - // Query for double the balance - final Integer amountToTransfer = context.availableFunds() * 2; + // Query for double the balance + final Integer amountToTransfer = context.availableFunds() * 2; - // Transfer from savings to checking - context.transfer( amountToTransfer ); - } - finally - { - uow.discard(); - } + // Transfer from savings to checking + context.transfer( amountToTransfer ); + } + finally + { + uow.discard(); + } + } ); } @Test http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java ---------------------------------------------------------------------- diff --git a/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java b/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java index 43be59d..7a03b2f 100644 --- a/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java +++ b/tests/performance/src/main/java/org/apache/polygene/test/performance/entitystore/AbstractEntityStorePerformanceTest.java @@ -34,8 +34,8 @@ import org.apache.polygene.api.unitofwork.UnitOfWorkFactory; import org.apache.polygene.bootstrap.ApplicationAssemblerAdapter; import org.apache.polygene.bootstrap.Assembler; import org.apache.polygene.bootstrap.Energy4Java; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -62,7 +62,7 @@ public abstract class AbstractEntityStorePerformanceTest this.logger = LoggerFactory.getLogger( getClass().getPackage().getName() + "." + storeName ); } - @Before + @BeforeEach public void warmup() throws Exception { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/PostgreSQLEntityStorePerformanceTest.java ---------------------------------------------------------------------- diff --git a/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/PostgreSQLEntityStorePerformanceTest.java b/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/PostgreSQLEntityStorePerformanceTest.java index 6f91b12..4633e30 100644 --- a/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/PostgreSQLEntityStorePerformanceTest.java +++ b/tests/performance/src/perf/java/org/apache/polygene/test/performance/entitystore/sql/PostgreSQLEntityStorePerformanceTest.java @@ -36,7 +36,7 @@ import org.apache.polygene.library.sql.common.SQLConfiguration; import org.apache.polygene.library.sql.dbcp.DBCPDataSourceServiceAssembler; import org.apache.polygene.test.EntityTestAssembler; import org.apache.polygene.test.performance.entitystore.AbstractEntityStorePerformanceTest; -import org.junit.Ignore; +import org.junit.jupiter.api.Disabled; import static org.apache.polygene.entitystore.sqlkv.assembly.PostgreSQLEntityStoreAssembler.DEFAULT_ENTITYSTORE_IDENTITY; @@ -49,7 +49,7 @@ import static org.apache.polygene.entitystore.sqlkv.assembly.PostgreSQLEntitySto * To run it see PostgreSQLEntityStoreTest. * </p> */ -@Ignore( "WARN Tearing down this test is broken!" ) +@Disabled( "WARN Tearing down this test is broken!" ) public class PostgreSQLEntityStorePerformanceTest extends AbstractEntityStorePerformanceTest { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tests/performance/src/perf/java/org/apache/polygene/test/performance/indexing/rdf/QueryPerformanceTest.java ---------------------------------------------------------------------- diff --git a/tests/performance/src/perf/java/org/apache/polygene/test/performance/indexing/rdf/QueryPerformanceTest.java b/tests/performance/src/perf/java/org/apache/polygene/test/performance/indexing/rdf/QueryPerformanceTest.java index 730fbdc..a7a351e 100644 --- a/tests/performance/src/perf/java/org/apache/polygene/test/performance/indexing/rdf/QueryPerformanceTest.java +++ b/tests/performance/src/perf/java/org/apache/polygene/test/performance/indexing/rdf/QueryPerformanceTest.java @@ -47,13 +47,13 @@ import org.apache.polygene.index.rdf.indexing.RdfIndexerService; import org.apache.polygene.index.rdf.query.SesameExpressions; import org.apache.polygene.library.rdf.repository.NativeConfiguration; import org.apache.polygene.test.EntityTestAssembler; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.apache.polygene.api.query.QueryExpressions.eq; import static org.apache.polygene.api.query.QueryExpressions.templateFor; +import static org.junit.jupiter.api.Assertions.fail; @SuppressWarnings( "ResultOfMethodCallIgnored" ) public class QueryPerformanceTest @@ -127,7 +127,7 @@ public class QueryPerformanceTest + "}"; private File indexingDataDir; - @Before + @BeforeEach public void setup() throws Exception { @@ -139,7 +139,7 @@ public class QueryPerformanceTest uowf = module.unitOfWorkFactory(); } - @After + @AfterEach public void tearDown() throws Exception { @@ -244,7 +244,7 @@ public class QueryPerformanceTest end = System.currentTimeMillis(); if( lead == null ) { - Assert.fail( "Entity was not found or more than one entity was found." ); + fail( "Entity was not found or more than one entity was found." ); return; } System.out.println( "Lead: " + lead ); @@ -265,7 +265,7 @@ public class QueryPerformanceTest end = System.currentTimeMillis(); if( lead == null ) { - Assert.fail( "Entity was not found or more than one entity was found." ); + fail( "Entity was not found or more than one entity was found." ); return; } System.out.println( "Lead: " + lead ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/CompositeCreationPerformanceTest.java ---------------------------------------------------------------------- diff --git a/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/CompositeCreationPerformanceTest.java b/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/CompositeCreationPerformanceTest.java index 4007ece..bf9a843 100644 --- a/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/CompositeCreationPerformanceTest.java +++ b/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/CompositeCreationPerformanceTest.java @@ -24,7 +24,7 @@ import org.apache.polygene.api.object.ObjectFactory; import org.apache.polygene.api.value.ValueBuilderFactory; import org.apache.polygene.api.value.ValueComposite; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests performance of new composite creation. http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/InvocationPerformanceTest.java ---------------------------------------------------------------------- diff --git a/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/InvocationPerformanceTest.java b/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/InvocationPerformanceTest.java index af606e2..fa6395e 100644 --- a/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/InvocationPerformanceTest.java +++ b/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/InvocationPerformanceTest.java @@ -27,7 +27,7 @@ import org.apache.polygene.api.concern.Concerns; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Invocation performance test. http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/PropertyMixinInvocationPerformanceTest.java ---------------------------------------------------------------------- diff --git a/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/PropertyMixinInvocationPerformanceTest.java b/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/PropertyMixinInvocationPerformanceTest.java index 368dbc3..2cf6a10 100644 --- a/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/PropertyMixinInvocationPerformanceTest.java +++ b/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/composite/PropertyMixinInvocationPerformanceTest.java @@ -28,7 +28,7 @@ import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.property.Property; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * PropertyMixin invocation performance test. http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/object/ObjectCreationPerformanceTest.java ---------------------------------------------------------------------- diff --git a/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/object/ObjectCreationPerformanceTest.java b/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/object/ObjectCreationPerformanceTest.java index 706a66c..95a4d07 100644 --- a/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/object/ObjectCreationPerformanceTest.java +++ b/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/object/ObjectCreationPerformanceTest.java @@ -21,7 +21,7 @@ package org.apache.polygene.test.performance.runtime.object; import org.apache.polygene.api.activation.ActivationException; import org.apache.polygene.api.object.ObjectFactory; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests performance of new object creation. http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/service/ServiceInvocationPerformanceTest.java ---------------------------------------------------------------------- diff --git a/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/service/ServiceInvocationPerformanceTest.java b/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/service/ServiceInvocationPerformanceTest.java index 118a39c..0d227a9 100644 --- a/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/service/ServiceInvocationPerformanceTest.java +++ b/tests/performance/src/perf/java/org/apache/polygene/test/performance/runtime/service/ServiceInvocationPerformanceTest.java @@ -21,18 +21,18 @@ package org.apache.polygene.test.performance.runtime.service; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; import java.text.NumberFormat; -import junit.framework.TestCase; import org.apache.polygene.api.injection.scope.Service; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.service.ServiceComposite; import org.apache.polygene.bootstrap.SingletonAssembler; +import org.junit.jupiter.api.Test; public class ServiceInvocationPerformanceTest - extends TestCase { @Service ServiceInvocationPerformanceTest.MyService service; + @Test public void testInjectService() throws Exception { @@ -103,5 +103,4 @@ public class ServiceInvocationPerformanceTest return null; } } - } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tests/regression/src/main/java/org/apache/polygene/test/regression/ConcernsOnPropertyTest.java ---------------------------------------------------------------------- diff --git a/tests/regression/src/main/java/org/apache/polygene/test/regression/ConcernsOnPropertyTest.java b/tests/regression/src/main/java/org/apache/polygene/test/regression/ConcernsOnPropertyTest.java index 8ff97df..c2cdcb9 100644 --- a/tests/regression/src/main/java/org/apache/polygene/test/regression/ConcernsOnPropertyTest.java +++ b/tests/regression/src/main/java/org/apache/polygene/test/regression/ConcernsOnPropertyTest.java @@ -30,9 +30,10 @@ import org.apache.polygene.api.sideeffect.SideEffectOf; import org.apache.polygene.api.sideeffect.SideEffects; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsEqual.equalTo; public class ConcernsOnPropertyTest extends AbstractPolygeneTest @@ -49,7 +50,7 @@ public class ConcernsOnPropertyTest Car prototype = builder.prototypeFor( Car.class ); prototype.manufacturer().set( "Volvo" ); Car car = builder.newInstance(); - Assert.assertEquals( "Concern on Property methods.", "Simon says: Volvo", car.manufacturer().get() ); + assertThat( "Concern on Property methods.", car.manufacturer().get(), equalTo( "Simon says: Volvo" ) ); } public interface CarComposite http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tools/envisage/src/test/java/org/apache/polygene/envisage/sample/EnvisageSample.java ---------------------------------------------------------------------- diff --git a/tools/envisage/src/test/java/org/apache/polygene/envisage/sample/EnvisageSample.java b/tools/envisage/src/test/java/org/apache/polygene/envisage/sample/EnvisageSample.java index 03be674..4490c41 100644 --- a/tools/envisage/src/test/java/org/apache/polygene/envisage/sample/EnvisageSample.java +++ b/tools/envisage/src/test/java/org/apache/polygene/envisage/sample/EnvisageSample.java @@ -20,11 +20,9 @@ package org.apache.polygene.envisage.sample; +import org.apache.polygene.api.entity.EntityBuilder; import org.apache.polygene.api.identity.HasIdentity; import org.apache.polygene.api.identity.Identity; -import org.junit.BeforeClass; -import org.junit.Test; -import org.apache.polygene.api.entity.EntityBuilder; import org.apache.polygene.api.property.Property; import org.apache.polygene.api.unitofwork.UnitOfWork; import org.apache.polygene.api.unitofwork.UnitOfWorkCompletionException; @@ -34,6 +32,8 @@ import org.apache.polygene.envisage.Envisage; import org.apache.polygene.index.rdf.assembly.RdfMemoryStoreAssembler; import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; import static org.apache.polygene.test.util.Assume.assumeDisplayPresent; @@ -48,7 +48,7 @@ public class EnvisageSample sample.runSample(); } - @BeforeClass + @BeforeAll public static void assumeDisplay() { assumeDisplayPresent(); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl ---------------------------------------------------------------------- diff --git a/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl b/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl index 453a598..08ad310 100644 --- a/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl +++ b/tools/generator-polygene/app/templates/RestAPIApplication/bootstrap-test.tmpl @@ -68,7 +68,7 @@ import org.junit.ClassRule; <% } %> -import org.junit.Test; +import org.junit.jupiter.api.Test; <% if( polygene.ignoredTest ) { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tools/model-detail/src/test/java/org/apache/polygene/tools/model/DocumentationSupport.java ---------------------------------------------------------------------- diff --git a/tools/model-detail/src/test/java/org/apache/polygene/tools/model/DocumentationSupport.java b/tools/model-detail/src/test/java/org/apache/polygene/tools/model/DocumentationSupport.java index cb6bba9..7ec23cd 100644 --- a/tools/model-detail/src/test/java/org/apache/polygene/tools/model/DocumentationSupport.java +++ b/tools/model-detail/src/test/java/org/apache/polygene/tools/model/DocumentationSupport.java @@ -39,13 +39,13 @@ import org.apache.polygene.bootstrap.Energy4Java; import org.apache.polygene.bootstrap.LayerAssembly; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.tools.model.descriptor.ApplicationDetailDescriptor; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static java.util.Collections.singletonMap; import static java.util.stream.Collectors.joining; import static org.apache.polygene.tools.model.descriptor.ApplicationDetailDescriptorBuilder.createApplicationDetailDescriptor; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.equalTo; -import static org.junit.Assert.assertThat; public class DocumentationSupport { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java ---------------------------------------------------------------------- diff --git a/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java b/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java index d6af619..aaa9e27 100644 --- a/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java +++ b/tools/model-detail/src/test/java/org/apache/polygene/tools/model/VisitableDetailTest.java @@ -22,9 +22,6 @@ package org.apache.polygene.tools.model; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.apache.polygene.tools.model.descriptor.ServiceDetailDescriptor; -import org.apache.polygene.tools.model.descriptor.TransientDetailDescriptor; -import org.junit.Test; import org.apache.polygene.api.activation.ActivationException; import org.apache.polygene.api.activation.ActivatorAdapter; import org.apache.polygene.api.structure.Application; @@ -38,10 +35,13 @@ import org.apache.polygene.bootstrap.Energy4Java; import org.apache.polygene.bootstrap.LayerAssembly; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.tools.model.descriptor.ApplicationDetailDescriptor; +import org.apache.polygene.tools.model.descriptor.ServiceDetailDescriptor; +import org.apache.polygene.tools.model.descriptor.TransientDetailDescriptor; +import org.junit.jupiter.api.Test; -import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; import static org.apache.polygene.tools.model.descriptor.ApplicationDetailDescriptorBuilder.createApplicationDetailDescriptor; +import static org.hamcrest.CoreMatchers.equalTo; +import static org.hamcrest.MatcherAssert.assertThat; /** * Visitable Detail Test. http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step1/Step1TestCase.java ---------------------------------------------------------------------- diff --git a/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step1/Step1TestCase.java b/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step1/Step1TestCase.java index 113f676..7169589 100644 --- a/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step1/Step1TestCase.java +++ b/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step1/Step1TestCase.java @@ -19,18 +19,21 @@ */ package org.apache.polygene.tutorials.cargo.step1; -import junit.framework.TestCase; import org.apache.polygene.tutorials.cargo.step1.internal.CargoImpl; import org.apache.polygene.tutorials.cargo.step1.internal.ShippingServiceImpl; import org.apache.polygene.tutorials.cargo.step1.internal.VoyageImpl; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsEqual.equalTo; public class Step1TestCase - extends TestCase { private ShippingService shippingService; private Voyage voyage; - @Override + @BeforeEach protected void setUp() throws Exception { @@ -39,40 +42,43 @@ public class Step1TestCase voyage = newVoyage( "Singapore", "New York" ); } + @Test public void testOrdinaryBooking() { Cargo cargo1 = newCargo( 40 ); Cargo cargo2 = newCargo( 40 ); Cargo cargo3 = newCargo( 20 ); int code = shippingService.makeBooking( cargo1, voyage ); - assertEquals( 1, code ); + assertThat( code, equalTo( 1 ) ); code = shippingService.makeBooking( cargo2, voyage ); - assertEquals( 2, code ); + assertThat( code, equalTo( 2 ) ); code = shippingService.makeBooking( cargo3, voyage ); - assertEquals( 3, code ); + assertThat( code, equalTo( 3 ) ); } + @Test public void testOverbooking() { Cargo cargo1 = newCargo( 100 ); Cargo cargo2 = newCargo( 9 ); int code = shippingService.makeBooking( cargo1, voyage ); - assertEquals( 1, code ); + assertThat( code, equalTo( 1 ) ); code = shippingService.makeBooking( cargo2, voyage ); - assertEquals( 2, code ); + assertThat( code, equalTo( 2 ) ); } + @Test public void testTooMuch() { Cargo cargo1 = newCargo( 40 ); Cargo cargo2 = newCargo( 40 ); Cargo cargo3 = newCargo( 31 ); int code = shippingService.makeBooking( cargo1, voyage ); - assertEquals( 1, code ); + assertThat( code, equalTo( 1 ) ); code = shippingService.makeBooking( cargo2, voyage ); - assertEquals( 2, code ); + assertThat( code, equalTo( 2 ) ); code = shippingService.makeBooking( cargo3, voyage ); - assertEquals( -1, code ); + assertThat( code, equalTo( -1 ) ); } private Cargo newCargo( double size ) http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/SequencingConcernTest.java ---------------------------------------------------------------------- diff --git a/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/SequencingConcernTest.java b/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/SequencingConcernTest.java index cfaa28c..1c7de1a 100644 --- a/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/SequencingConcernTest.java +++ b/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/SequencingConcernTest.java @@ -27,8 +27,8 @@ import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.SingletonAssembler; import org.apache.polygene.test.mock.MockComposite; import org.apache.polygene.test.mock.MockPlayerMixin; -import org.junit.Ignore; -import org.junit.Test; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -36,7 +36,7 @@ import static org.easymock.EasyMock.replay; import static org.easymock.EasyMock.verify; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; /** * Unit tests for SequencingConcern. @@ -49,7 +49,7 @@ public class SequencingConcernTest * returned. */ @Test - @Ignore( "Expectations need to be figured out." ) + @Disabled( "Expectations need to be figured out." ) public void failingBooking() throws ActivationException, AssemblyException { @@ -80,7 +80,7 @@ public class SequencingConcernTest * returned. */ @Test - @Ignore( "Expectations need to be figured out." ) + @Disabled( "Expectations need to be figured out." ) public void successfulBooking() throws ActivationException, AssemblyException { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java ---------------------------------------------------------------------- diff --git a/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java b/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java index ac71082..7986b1a 100644 --- a/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java +++ b/tutorials/cargo/src/test/java/org/apache/polygene/tutorials/cargo/step2/Step2TestCase.java @@ -19,13 +19,14 @@ */ package org.apache.polygene.tutorials.cargo.step2; -import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Test; import org.apache.polygene.api.composite.TransientBuilder; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; +import org.apache.polygene.test.AbstractPolygeneTest; +import org.junit.jupiter.api.Test; -import static org.junit.Assert.assertEquals; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.hamcrest.core.IsEqual.equalTo; public class Step2TestCase extends AbstractPolygeneTest @@ -55,11 +56,11 @@ public class Step2TestCase Cargo cargo2 = newCargo( 40 ); Cargo cargo3 = newCargo( 20 ); int code = shippingService.makeBooking( cargo1, voyage ); - assertEquals( 0, code ); + assertThat( code, equalTo( 0 ) ); code = shippingService.makeBooking( cargo2, voyage ); - assertEquals( 1, code ); + assertThat( code, equalTo( 1 ) ); code = shippingService.makeBooking( cargo3, voyage ); - assertEquals( 2, code ); + assertThat( code, equalTo( 2 ) ); } @Test @@ -68,9 +69,9 @@ public class Step2TestCase Cargo cargo1 = newCargo( 100 ); Cargo cargo2 = newCargo( 9 ); int code = shippingService.makeBooking( cargo1, voyage ); - assertEquals( 0, code ); + assertThat( code, equalTo( 0 ) ); code = shippingService.makeBooking( cargo2, voyage ); - assertEquals( -1, code ); + assertThat( code, equalTo( -1 ) ); } @Test @@ -80,11 +81,11 @@ public class Step2TestCase Cargo cargo2 = newCargo( 40 ); Cargo cargo3 = newCargo( 31 ); int code = shippingService.makeBooking( cargo1, voyage ); - assertEquals( 0, code ); + assertThat( code, equalTo( 0 ) ); code = shippingService.makeBooking( cargo2, voyage ); - assertEquals( 1, code ); + assertThat( code, equalTo( 1 ) ); code = shippingService.makeBooking( cargo3, voyage ); - assertEquals( -1, code ); + assertThat( code, equalTo( -1 ) ); } @Override http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial1/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial1/HelloWorldTest.java b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial1/HelloWorldTest.java index a685602..32e6ba3 100644 --- a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial1/HelloWorldTest.java +++ b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial1/HelloWorldTest.java @@ -19,18 +19,18 @@ */ package org.apache.polygene.tutorials.composites.tutorial1; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; public class HelloWorldTest { HelloWorld helloWorld; - @Before + @BeforeEach public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial10/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial10/HelloWorldTest.java b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial10/HelloWorldTest.java index 762fd53..b25f2d6 100644 --- a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial10/HelloWorldTest.java +++ b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial10/HelloWorldTest.java @@ -21,18 +21,18 @@ package org.apache.polygene.tutorials.composites.tutorial10; import org.apache.polygene.api.composite.TransientBuilder; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; public class HelloWorldTest { private SingletonAssembler assembly; - @Before + @BeforeEach public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial2/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial2/HelloWorldTest.java b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial2/HelloWorldTest.java index 02ce5c2..bbbb9f2 100644 --- a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial2/HelloWorldTest.java +++ b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial2/HelloWorldTest.java @@ -19,18 +19,18 @@ */ package org.apache.polygene.tutorials.composites.tutorial2; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; public class HelloWorldTest { HelloWorld helloWorld; - @Before + @BeforeEach public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial3/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial3/HelloWorldTest.java b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial3/HelloWorldTest.java index 2870d27..b9390b7 100644 --- a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial3/HelloWorldTest.java +++ b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial3/HelloWorldTest.java @@ -20,18 +20,18 @@ package org.apache.polygene.tutorials.composites.tutorial3; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; public class HelloWorldTest { HelloWorld helloWorld; - @Before + @BeforeEach public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial4/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial4/HelloWorldTest.java b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial4/HelloWorldTest.java index a635a67..620444a 100644 --- a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial4/HelloWorldTest.java +++ b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial4/HelloWorldTest.java @@ -20,18 +20,18 @@ package org.apache.polygene.tutorials.composites.tutorial4; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; public class HelloWorldTest { HelloWorld helloWorld; - @Before + @BeforeEach public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial5/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial5/HelloWorldTest.java b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial5/HelloWorldTest.java index 82f259e..8c826d6 100644 --- a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial5/HelloWorldTest.java +++ b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial5/HelloWorldTest.java @@ -20,18 +20,18 @@ package org.apache.polygene.tutorials.composites.tutorial5; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; public class HelloWorldTest { HelloWorld helloWorld; - @Before + @BeforeEach public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial6/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial6/HelloWorldTest.java b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial6/HelloWorldTest.java index 0d3c101..69ae245 100644 --- a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial6/HelloWorldTest.java +++ b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial6/HelloWorldTest.java @@ -20,18 +20,18 @@ package org.apache.polygene.tutorials.composites.tutorial6; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; public class HelloWorldTest { HelloWorld helloWorld; - @Before + @BeforeEach public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial7/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial7/HelloWorldTest.java b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial7/HelloWorldTest.java index 6c9a291..551ac29 100644 --- a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial7/HelloWorldTest.java +++ b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial7/HelloWorldTest.java @@ -20,18 +20,18 @@ package org.apache.polygene.tutorials.composites.tutorial7; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; public class HelloWorldTest { HelloWorld helloWorld; - @Before + @BeforeEach public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial8/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial8/HelloWorldTest.java b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial8/HelloWorldTest.java index 4555a44..e735e19 100644 --- a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial8/HelloWorldTest.java +++ b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial8/HelloWorldTest.java @@ -22,18 +22,18 @@ package org.apache.polygene.tutorials.composites.tutorial8; import org.apache.polygene.api.composite.TransientBuilder; import org.apache.polygene.api.composite.TransientBuilderFactory; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; public class HelloWorldTest { HelloWorldComposite helloWorld; - @Before + @BeforeEach public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial9/HelloWorldTest.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial9/HelloWorldTest.java b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial9/HelloWorldTest.java index b3c4d3b..7fefce0 100644 --- a/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial9/HelloWorldTest.java +++ b/tutorials/composites/src/test/java/org/apache/polygene/tutorials/composites/tutorial9/HelloWorldTest.java @@ -22,18 +22,18 @@ package org.apache.polygene.tutorials.composites.tutorial9; import org.apache.polygene.api.composite.TransientBuilder; import org.apache.polygene.api.composite.TransientBuilderFactory; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.fail; +import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.jupiter.api.Assertions.fail; public class HelloWorldTest { HelloWorldComposite helloWorld; - @Before + @BeforeEach public void setUp() throws Exception { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest.java ---------------------------------------------------------------------- diff --git a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest.java b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest.java index 4a2453f..39ceed1 100644 --- a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest.java +++ b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest.java @@ -19,13 +19,13 @@ */ package org.apache.polygene.tutorials.hello; -import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Test; import org.apache.polygene.api.value.ValueBuilder; import org.apache.polygene.bootstrap.ModuleAssembly; +import org.apache.polygene.test.AbstractPolygeneTest; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; // START SNIPPET: step1 public class HelloTest extends AbstractPolygeneTest http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest2.java ---------------------------------------------------------------------- diff --git a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest2.java b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest2.java index 5e05f34..7f367d1 100644 --- a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest2.java +++ b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest2.java @@ -19,14 +19,14 @@ */ package org.apache.polygene.tutorials.hello; -import org.junit.Test; import org.apache.polygene.api.composite.TransientBuilder; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.AbstractPolygeneTest; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class HelloTest2 extends AbstractPolygeneTest { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest3.java ---------------------------------------------------------------------- diff --git a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest3.java b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest3.java index cbabcf3..0b2eb1b 100644 --- a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest3.java +++ b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest3.java @@ -19,14 +19,14 @@ */ package org.apache.polygene.tutorials.hello; -import org.junit.Test; import org.apache.polygene.api.service.ServiceReference; import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.AbstractPolygeneTest; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class HelloTest3 extends AbstractPolygeneTest { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/6ae17138/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java ---------------------------------------------------------------------- diff --git a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java index 908030f..08f49db 100644 --- a/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java +++ b/tutorials/hello/src/test/java/org/apache/polygene/tutorials/hello/HelloTest4.java @@ -27,10 +27,10 @@ import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.entitystore.memory.MemoryEntityStoreService; import org.apache.polygene.test.AbstractPolygeneTest; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static org.hamcrest.CoreMatchers.equalTo; -import static org.junit.Assert.assertThat; +import static org.hamcrest.MatcherAssert.assertThat; public class HelloTest4 extends AbstractPolygeneTest {
