http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/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 f2933ae..4473f9f 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 @@ -32,6 +32,7 @@ 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.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -76,6 +77,7 @@ public class SimpleAlarmModelTest } @Override + @AfterEach public void tearDown() { UnitOfWork uow = unitOfWorkFactory.currentUnitOfWork();
http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/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 f41e518..6990db7 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 @@ -33,6 +33,7 @@ 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.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -77,6 +78,7 @@ public class StandardAlarmModelTest } @Override + @AfterEach public void tearDown() { UnitOfWork uow = unitOfWorkFactory.currentUnitOfWork(); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/libraries/fileconfig/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/fileconfig/build.gradle b/libraries/fileconfig/build.gradle index 32fdd34..1e42d35 100644 --- a/libraries/fileconfig/build.gradle +++ b/libraries/fileconfig/build.gradle @@ -32,7 +32,6 @@ 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/7585af08/libraries/fileconfig/src/test/java/org/apache/polygene/library/fileconfig/FileConfigurationTest.java ---------------------------------------------------------------------- diff --git a/libraries/fileconfig/src/test/java/org/apache/polygene/library/fileconfig/FileConfigurationTest.java b/libraries/fileconfig/src/test/java/org/apache/polygene/library/fileconfig/FileConfigurationTest.java index 748ac34..2e887c4 100644 --- a/libraries/fileconfig/src/test/java/org/apache/polygene/library/fileconfig/FileConfigurationTest.java +++ b/libraries/fileconfig/src/test/java/org/apache/polygene/library/fileconfig/FileConfigurationTest.java @@ -23,19 +23,18 @@ import java.io.File; import java.io.IOException; import org.apache.polygene.api.activation.ActivationException; import org.apache.polygene.bootstrap.SingletonAssembler; -import org.junit.Rule; +import org.apache.polygene.test.TemporaryFolder; import org.junit.jupiter.api.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.extension.ExtendWith; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; import static org.hamcrest.core.IsNull.notNullValue; -import static org.junit.Assert.assertEquals; +@ExtendWith( TemporaryFolder.class ) public class FileConfigurationTest { - @Rule - public final TemporaryFolder tmpDir = new TemporaryFolder(); + private TemporaryFolder tmpDir; @Test public void testFileConfiguration() @@ -113,15 +112,10 @@ public class FileConfigurationTest FileConfiguration config = assembler.module().findService( FileConfiguration.class ).get(); - assertEquals( new File( rootDir, FileConfigurationOverride.CONVENTIONAL_CONFIGURATION ).getAbsolutePath(), - config.configurationDirectory().getAbsolutePath() ); - assertEquals( new File( rootDir, FileConfigurationOverride.CONVENTIONAL_DATA ).getAbsolutePath(), - config.dataDirectory().getAbsolutePath() ); - assertEquals( new File( rootDir, FileConfigurationOverride.CONVENTIONAL_TEMPORARY ).getAbsolutePath(), - config.temporaryDirectory().getAbsolutePath() ); - assertEquals( new File( rootDir, FileConfigurationOverride.CONVENTIONAL_CACHE ).getAbsolutePath(), - config.cacheDirectory().getAbsolutePath() ); - assertEquals( new File( rootDir, FileConfigurationOverride.CONVENTIONAL_LOG ).getAbsolutePath(), - config.logDirectory().getAbsolutePath() ); + assertThat( config.configurationDirectory(), equalTo( new File( rootDir, FileConfigurationOverride.CONVENTIONAL_CONFIGURATION ) ) ); + assertThat( config.dataDirectory(), equalTo( new File( rootDir, FileConfigurationOverride.CONVENTIONAL_DATA ) ) ); + assertThat( config.temporaryDirectory(), equalTo( new File( rootDir, FileConfigurationOverride.CONVENTIONAL_TEMPORARY ) ) ); + assertThat( config.cacheDirectory(), equalTo( new File( rootDir, FileConfigurationOverride.CONVENTIONAL_CACHE ) ) ); + assertThat( config.logDirectory(), equalTo( new File( rootDir, FileConfigurationOverride.CONVENTIONAL_LOG ) ) ); } } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/libraries/http/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/http/build.gradle b/libraries/http/build.gradle index 7fe1d7f..651249b 100644 --- a/libraries/http/build.gradle +++ b/libraries/http/build.gradle @@ -39,7 +39,6 @@ dependencies { testImplementation polygene.core.testsupport testImplementation libraries.http_client testImplementation libraries.junit - testImplementation libraries.junit_vintage testRuntimeOnly libraries.logback } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/libraries/http/src/test/java/org/apache/polygene/library/http/AbstractSecureJettyTest.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/java/org/apache/polygene/library/http/AbstractSecureJettyTest.java b/libraries/http/src/test/java/org/apache/polygene/library/http/AbstractSecureJettyTest.java index 4c43c2a..bfeba07 100644 --- a/libraries/http/src/test/java/org/apache/polygene/library/http/AbstractSecureJettyTest.java +++ b/libraries/http/src/test/java/org/apache/polygene/library/http/AbstractSecureJettyTest.java @@ -34,18 +34,19 @@ import javax.net.ssl.TrustManagerFactory; import org.apache.http.conn.ssl.NoopHostnameVerifier; import org.apache.http.impl.client.CloseableHttpClient; import org.apache.http.impl.client.HttpClients; -import org.junit.After; -import org.junit.AfterClass; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Rule; -import org.junit.rules.TemporaryFolder; +import org.apache.polygene.test.TemporaryFolder; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; /** * Base class for SecureJettyMixin tests. * * Use HttpClient in order to easily use different {@link SSLContext}s between server and client. */ +@ExtendWith( TemporaryFolder.class ) public abstract class AbstractSecureJettyTest extends AbstractJettyTest { @@ -58,10 +59,9 @@ public abstract class AbstractSecureJettyTest protected CloseableHttpClient trustHttpClient; protected CloseableHttpClient mutualHttpClient; - @Rule - public final TemporaryFolder tmpDir = new TemporaryFolder(); + private TemporaryFolder tmpDir; - @Before + @BeforeEach public void beforeSecure() throws GeneralSecurityException, IOException { @@ -77,7 +77,7 @@ public abstract class AbstractSecureJettyTest .build(); } - @After + @AfterEach public void afterSecure() throws IOException { @@ -94,7 +94,7 @@ public abstract class AbstractSecureJettyTest private static HostnameVerifier defaultHostnameVerifier; private static javax.net.ssl.SSLSocketFactory defaultSSLSocketFactory; - @BeforeClass + @BeforeAll public static void beforeSecureClass() throws IOException, GeneralSecurityException { @@ -104,7 +104,7 @@ public abstract class AbstractSecureJettyTest HttpsURLConnection.setDefaultSSLSocketFactory( buildTrustSSLContext().getSocketFactory() ); } - @AfterClass + @AfterAll public static void afterSecureClass() { HttpsURLConnection.setDefaultHostnameVerifier( defaultHostnameVerifier ); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/libraries/http/src/test/java/org/apache/polygene/library/http/JettyServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/java/org/apache/polygene/library/http/JettyServiceTest.java b/libraries/http/src/test/java/org/apache/polygene/library/http/JettyServiceTest.java index a3ef382..82ff147 100644 --- a/libraries/http/src/test/java/org/apache/polygene/library/http/JettyServiceTest.java +++ b/libraries/http/src/test/java/org/apache/polygene/library/http/JettyServiceTest.java @@ -29,7 +29,7 @@ import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.EntityTestAssembler; import org.apache.polygene.test.util.FreePortFinder; import org.hamcrest.core.Is; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static javax.servlet.DispatcherType.REQUEST; import static org.apache.polygene.library.http.Servlets.addFilters; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/libraries/http/src/test/java/org/apache/polygene/library/http/JettyTestSuite.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/java/org/apache/polygene/library/http/JettyTestSuite.java b/libraries/http/src/test/java/org/apache/polygene/library/http/JettyTestSuite.java deleted file mode 100644 index c368750..0000000 --- a/libraries/http/src/test/java/org/apache/polygene/library/http/JettyTestSuite.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * - */ -package org.apache.polygene.library.http; - -import org.junit.runner.RunWith; -import org.junit.runners.Suite; - -@RunWith( Suite.class ) [email protected]( { - JettyServiceTest.class, - JettyJMXStatisticsTest.class, - SecureJettyServiceTest.class, - MutualSecureJettyServiceTest.class -} ) -public class JettyTestSuite -{ -} http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/libraries/http/src/test/java/org/apache/polygene/library/http/SecureJettyServiceTest.java ---------------------------------------------------------------------- diff --git a/libraries/http/src/test/java/org/apache/polygene/library/http/SecureJettyServiceTest.java b/libraries/http/src/test/java/org/apache/polygene/library/http/SecureJettyServiceTest.java index 0f22a10..71c90cc 100644 --- a/libraries/http/src/test/java/org/apache/polygene/library/http/SecureJettyServiceTest.java +++ b/libraries/http/src/test/java/org/apache/polygene/library/http/SecureJettyServiceTest.java @@ -28,7 +28,7 @@ import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.test.EntityTestAssembler; import org.apache.polygene.test.util.FreePortFinder; -import org.junit.Test; +import org.junit.jupiter.api.Test; import static javax.servlet.DispatcherType.REQUEST; import static org.apache.polygene.library.http.Servlets.addFilters; @@ -37,6 +37,7 @@ import static org.apache.polygene.library.http.Servlets.filter; import static org.apache.polygene.library.http.Servlets.serve; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.IsEqual.equalTo; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.fail; public class SecureJettyServiceTest @@ -69,23 +70,27 @@ public class SecureJettyServiceTest // END SNIPPET: assemblyssl } - @Test( expected = NoHttpResponseException.class ) + @Test // This test exists for demonstration purpose only, it do not test usefull things but it's on purpose public void testNoSSL() throws IOException { - HttpGet get = new HttpGet( "http://127.0.0.1:"; + httpsPort + "/hello" ); - defaultHttpClient.execute( get ); - fail( "We could reach the HTTPS connector using a HTTP url, that's no good" ); + assertThrows(NoHttpResponseException.class, () -> { + HttpGet get = new HttpGet( "http://127.0.0.1:"; + httpsPort + "/hello" ); + defaultHttpClient.execute( get ); + }); + // We could reach the HTTPS connector using a HTTP url, that's no good } - @Test( expected = SSLHandshakeException.class ) + @Test // This test exists for demonstration purpose only, it do not test useful things but it's on purpose public void testNoTruststore() throws IOException { - defaultHttpClient.execute( new HttpGet( "https://127.0.0.1:"; + httpsPort + "/hello" ) ); - fail( "We could reach the HTTPS connector without proper truststore, this should not happen" ); + assertThrows( SSLHandshakeException.class, () -> { + defaultHttpClient.execute( new HttpGet( "https://127.0.0.1:"; + httpsPort + "/hello" ) ); + } ); + // We could reach the HTTPS connector without proper truststore, this should not happen } @Test http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/libraries/rdf/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/rdf/build.gradle b/libraries/rdf/build.gradle index 6dad3e3..50babbe 100644 --- a/libraries/rdf/build.gradle +++ b/libraries/rdf/build.gradle @@ -34,7 +34,6 @@ 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/7585af08/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java ---------------------------------------------------------------------- diff --git a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java index bb651e5..c6c41d8 100644 --- a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java +++ b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntitySerializerTest.java @@ -43,7 +43,6 @@ import org.apache.polygene.spi.entitystore.EntityStore; import org.apache.polygene.spi.entitystore.EntityStoreUnitOfWork; import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; -import org.junit.Before; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.openrdf.model.Statement; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java ---------------------------------------------------------------------- diff --git a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java index d8a2eab..d234294 100644 --- a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java +++ b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/entity/EntityTypeSerializerTest.java @@ -38,7 +38,6 @@ import org.apache.polygene.library.rdf.serializer.RdfXmlSerializer; import org.apache.polygene.spi.entitystore.EntityStore; import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; -import org.junit.Before; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.openrdf.model.Statement; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/repository/NativeRepositoryTest.java ---------------------------------------------------------------------- diff --git a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/repository/NativeRepositoryTest.java b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/repository/NativeRepositoryTest.java index f1c3067..afdc99f 100644 --- a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/repository/NativeRepositoryTest.java +++ b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/repository/NativeRepositoryTest.java @@ -27,9 +27,9 @@ import org.apache.polygene.library.fileconfig.FileConfigurationAssembler; import org.apache.polygene.library.fileconfig.FileConfigurationOverride; import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; -import org.junit.Rule; +import org.apache.polygene.test.TemporaryFolder; import org.junit.jupiter.api.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.extension.ExtendWith; import org.openrdf.repository.Repository; import org.openrdf.repository.RepositoryConnection; import org.openrdf.repository.RepositoryException; @@ -40,10 +40,10 @@ import static org.hamcrest.core.IsEqual.equalTo; /** * JAVADOC */ +@ExtendWith( TemporaryFolder.class ) public class NativeRepositoryTest extends AbstractPolygeneTest { - @Rule - public final TemporaryFolder tmpDir = new TemporaryFolder(); + private TemporaryFolder tmpDir; @Service Repository repository; http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/libraries/spring/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/spring/build.gradle b/libraries/spring/build.gradle index ca39df9..26a9dde 100644 --- a/libraries/spring/build.gradle +++ b/libraries/spring/build.gradle @@ -33,6 +33,5 @@ dependencies { testImplementation polygene.core.testsupport testImplementation libraries.spring_testsupport - testImplementation libraries.junit_vintage testRuntimeOnly libraries.logback } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/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 699e1cc..9548c41 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 @@ -20,11 +20,11 @@ package org.apache.polygene.library.spring.bootstrap; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; 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 org.springframework.test.context.junit.jupiter.SpringExtension; import static org.apache.polygene.library.spring.bootstrap.PolygeneTestBootstrap.COMMENT_SERVICE_ID; import static org.hamcrest.MatcherAssert.assertThat; @@ -32,7 +32,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; import static org.hamcrest.core.IsNull.notNullValue; -@RunWith(SpringJUnit4ClassRunner.class) +@ExtendWith( SpringExtension.class) @ContextConfiguration public final class PolygeneExportServiceTest { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/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 83801a8..ac6e151 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 @@ -29,17 +29,17 @@ import org.apache.polygene.bootstrap.AssemblyException; import org.apache.polygene.bootstrap.ModuleAssembly; import org.apache.polygene.bootstrap.SingletonAssembler; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; 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 org.springframework.test.context.junit.jupiter.SpringExtension; import static org.apache.polygene.api.service.qualifier.ServiceQualifier.withId; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.MatcherAssert.assertThat; -@RunWith( SpringJUnit4ClassRunner.class ) +@ExtendWith( SpringExtension.class ) @ContextConfiguration public final class PolygeneImportServiceTest { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/libraries/uowfile/build.gradle ---------------------------------------------------------------------- diff --git a/libraries/uowfile/build.gradle b/libraries/uowfile/build.gradle index 49da573..75dbb9e 100644 --- a/libraries/uowfile/build.gradle +++ b/libraries/uowfile/build.gradle @@ -33,7 +33,6 @@ 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/7585af08/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 01cbf36..93c766a 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 @@ -51,10 +51,11 @@ import org.apache.polygene.library.uowfile.singular.UoWFileLocator; import org.apache.polygene.spi.PolygeneSPI; import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; -import org.junit.Before; -import org.junit.Rule; +import org.apache.polygene.test.TemporaryFolder; +import org.apache.polygene.test.TestName; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,6 +65,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.jupiter.api.Assertions.fail; +@ExtendWith( TemporaryFolder.class ) public class HasUoWFileTest extends AbstractPolygeneTest { @@ -71,8 +73,7 @@ public class HasUoWFileTest private static final URL CREATION_CONTENT_URL = HasUoWFileTest.class.getResource( "creation.txt" ); private static final URL MODIFICATION_CONTENT_URL = HasUoWFileTest.class.getResource( "modification.txt" ); - @Rule - public final TemporaryFolder tmpDir = new TemporaryFolder(); + private TemporaryFolder tmpDir; // START SNIPPET: entity // START SNIPPET: uowfile @@ -196,7 +197,7 @@ public class HasUoWFileTest private TestService testService; - @Before + @BeforeEach public void beforeTest() { testService = serviceFinder.findService( TestService.class ).get(); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/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 c63aed4..b988e7e 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 @@ -51,10 +51,10 @@ import org.apache.polygene.library.uowfile.plural.UoWFilesLocator; import org.apache.polygene.spi.PolygeneSPI; import org.apache.polygene.test.AbstractPolygeneTest; import org.apache.polygene.test.EntityTestAssembler; -import org.junit.Before; -import org.junit.Rule; +import org.apache.polygene.test.TemporaryFolder; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.junit.rules.TemporaryFolder; +import org.junit.jupiter.api.extension.ExtendWith; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,6 +64,7 @@ import static org.hamcrest.core.Is.is; import static org.hamcrest.core.IsEqual.equalTo; import static org.junit.jupiter.api.Assertions.fail; +@ExtendWith( TemporaryFolder.class ) public class HasUoWFilesTest extends AbstractPolygeneTest { @@ -71,8 +72,7 @@ public class HasUoWFilesTest private static final URL CREATION_CONTENT_URL = HasUoWFilesTest.class.getResource( "creation.txt" ); private static final URL MODIFICATION_CONTENT_URL = HasUoWFilesTest.class.getResource( "modification.txt" ); - @Rule - public final TemporaryFolder tmpDir = new TemporaryFolder(); + private TemporaryFolder tmpDir; // START SNIPPET: uowfile public enum MyEnum @@ -213,7 +213,7 @@ public class HasUoWFilesTest private TestService testService; - @Before + @BeforeEach public void beforeTest() { testService = serviceFinder.findService( TestService.class ).get(); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/7585af08/samples/rental/build.gradle ---------------------------------------------------------------------- diff --git a/samples/rental/build.gradle b/samples/rental/build.gradle index 427153e..5de31f1 100644 --- a/samples/rental/build.gradle +++ b/samples/rental/build.gradle @@ -20,12 +20,14 @@ buildscript { repositories { maven { url "https://plugins.gradle.org/m2/"; } } - dependencies { classpath "gradle.plugin.org.akhikhl.gretty:gretty:1.4.2" } + dependencies { classpath "gradle.plugin.org.akhikhl.gretty:gretty:2.0.0" } } apply plugin: 'polygene-sample' apply plugin: 'war' -apply plugin: 'org.akhikhl.gretty' + +// TODO: PAUL!! This Plugin seems stale, and there are a dozen forks. How do we proceed? +//apply plugin: 'org.akhikhl.gretty' description = "Sample of implementation of a Car Rental application."
