This is an automated email from the ASF dual-hosted git repository.
etudenhoefner pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/master by this push:
new 90cf38c50a Dell: Migrate Files using TestRule to Junit5 (#8707)
90cf38c50a is described below
commit 90cf38c50ab4e7b7d85011d8fd69bf60a82ea4c0
Author: Ashutosh Roy <[email protected]>
AuthorDate: Tue Oct 10 13:33:16 2023 +0530
Dell: Migrate Files using TestRule to Junit5 (#8707)
---
.../dell/ecs/TestEcsAppendOutputStream.java | 6 ++--
.../apache/iceberg/dell/ecs/TestEcsCatalog.java | 14 ++++-----
.../apache/iceberg/dell/ecs/TestEcsInputFile.java | 6 ++--
.../apache/iceberg/dell/ecs/TestEcsOutputFile.java | 6 ++--
.../dell/ecs/TestEcsSeekableInputStream.java | 6 ++--
.../iceberg/dell/ecs/TestEcsTableOperations.java | 6 ++--
.../iceberg/dell/mock/ecs/EcsS3MockRule.java | 35 ++++++++++------------
.../iceberg/dell/mock/ecs/TestExceptionCode.java | 6 ++--
8 files changed, 40 insertions(+), 45 deletions(-)
diff --git
a/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsAppendOutputStream.java
b/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsAppendOutputStream.java
index bf5ed46a07..a30b6f8fff 100644
---
a/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsAppendOutputStream.java
+++
b/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsAppendOutputStream.java
@@ -27,12 +27,12 @@ import java.nio.charset.StandardCharsets;
import org.apache.iceberg.dell.mock.ecs.EcsS3MockRule;
import org.apache.iceberg.metrics.MetricsContext;
import org.apache.iceberg.relocated.com.google.common.io.ByteStreams;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class TestEcsAppendOutputStream {
- @ClassRule public static EcsS3MockRule rule = EcsS3MockRule.create();
+ @RegisterExtension public static EcsS3MockRule rule = EcsS3MockRule.create();
@Test
public void testBaseObjectWrite() throws IOException {
diff --git a/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsCatalog.java
b/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsCatalog.java
index 6c6136fade..a35ba3102b 100644
--- a/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsCatalog.java
+++ b/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsCatalog.java
@@ -41,21 +41,21 @@ import
org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet;
import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.types.Types;
import org.assertj.core.api.Assertions;
-import org.junit.After;
import org.junit.Assert;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class TestEcsCatalog {
static final Schema SCHEMA = new Schema(required(1, "id",
Types.IntegerType.get()));
- @Rule public EcsS3MockRule rule = EcsS3MockRule.create();
+ @RegisterExtension public EcsS3MockRule rule = EcsS3MockRule.create();
private EcsCatalog ecsCatalog;
- @Before
+ @BeforeEach
public void before() {
ecsCatalog = new EcsCatalog();
Map<String, String> properties = Maps.newHashMap();
@@ -64,7 +64,7 @@ public class TestEcsCatalog {
ecsCatalog.initialize("test", properties);
}
- @After
+ @AfterEach
public void after() throws IOException {
ecsCatalog.close();
}
diff --git
a/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsInputFile.java
b/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsInputFile.java
index 4f48c01f13..3d208f255f 100644
--- a/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsInputFile.java
+++ b/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsInputFile.java
@@ -26,12 +26,12 @@ import java.io.InputStream;
import java.nio.charset.StandardCharsets;
import org.apache.iceberg.dell.mock.ecs.EcsS3MockRule;
import org.apache.iceberg.relocated.com.google.common.io.ByteStreams;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class TestEcsInputFile {
- @ClassRule public static EcsS3MockRule rule = EcsS3MockRule.create();
+ @RegisterExtension public static EcsS3MockRule rule = EcsS3MockRule.create();
@Test
public void testAbsentFile() {
diff --git
a/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsOutputFile.java
b/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsOutputFile.java
index ab9ebfdcc6..9c8ef253db 100644
--- a/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsOutputFile.java
+++ b/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsOutputFile.java
@@ -29,12 +29,12 @@ import org.apache.iceberg.exceptions.AlreadyExistsException;
import org.apache.iceberg.io.PositionOutputStream;
import org.apache.iceberg.relocated.com.google.common.io.ByteStreams;
import org.assertj.core.api.Assertions;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class TestEcsOutputFile {
- @ClassRule public static EcsS3MockRule rule = EcsS3MockRule.create();
+ @RegisterExtension public static EcsS3MockRule rule = EcsS3MockRule.create();
@Test
public void testFileWrite() throws IOException {
diff --git
a/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsSeekableInputStream.java
b/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsSeekableInputStream.java
index a49793fec8..de97aa8d6f 100644
---
a/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsSeekableInputStream.java
+++
b/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsSeekableInputStream.java
@@ -25,12 +25,12 @@ import java.io.IOException;
import java.nio.charset.StandardCharsets;
import org.apache.iceberg.dell.mock.ecs.EcsS3MockRule;
import org.apache.iceberg.metrics.MetricsContext;
-import org.junit.ClassRule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class TestEcsSeekableInputStream {
- @ClassRule public static EcsS3MockRule rule = EcsS3MockRule.create();
+ @RegisterExtension public static EcsS3MockRule rule = EcsS3MockRule.create();
@Test
public void testSeekPosRead() throws IOException {
diff --git
a/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsTableOperations.java
b/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsTableOperations.java
index fca78ed7be..809af32ca0 100644
--- a/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsTableOperations.java
+++ b/dell/src/test/java/org/apache/iceberg/dell/ecs/TestEcsTableOperations.java
@@ -34,14 +34,14 @@ import
org.apache.iceberg.relocated.com.google.common.collect.ImmutableSet;
import org.apache.iceberg.relocated.com.google.common.collect.Maps;
import org.apache.iceberg.types.Types;
import org.assertj.core.api.Assertions;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
public class TestEcsTableOperations {
static final Schema SCHEMA = new Schema(required(1, "id",
Types.IntegerType.get()));
- @Rule public EcsS3MockRule rule = EcsS3MockRule.create();
+ @RegisterExtension public EcsS3MockRule rule = EcsS3MockRule.create();
@Test
public void testConcurrentCommit() {
diff --git
a/dell/src/test/java/org/apache/iceberg/dell/mock/ecs/EcsS3MockRule.java
b/dell/src/test/java/org/apache/iceberg/dell/mock/ecs/EcsS3MockRule.java
index 7948531846..f9db7f0557 100644
--- a/dell/src/test/java/org/apache/iceberg/dell/mock/ecs/EcsS3MockRule.java
+++ b/dell/src/test/java/org/apache/iceberg/dell/mock/ecs/EcsS3MockRule.java
@@ -33,16 +33,16 @@ import java.util.stream.Collectors;
import org.apache.iceberg.dell.DellClientFactories;
import org.apache.iceberg.dell.DellProperties;
import org.apache.iceberg.dell.mock.MockDellClientFactory;
-import org.junit.rules.TestRule;
-import org.junit.runner.Description;
-import org.junit.runners.model.Statement;
+import org.junit.jupiter.api.extension.AfterEachCallback;
+import org.junit.jupiter.api.extension.BeforeEachCallback;
+import org.junit.jupiter.api.extension.ExtensionContext;
/**
- * Mock rule of ECS S3 mock.
+ * Mock Extension of ECS S3 mock.
*
* <p>Use environment parameter to specify use mock client or real client.
*/
-public class EcsS3MockRule implements TestRule {
+public class EcsS3MockRule implements BeforeEachCallback, AfterEachCallback {
/** Object ID generator */
private static final AtomicInteger ID = new AtomicInteger(0);
@@ -80,21 +80,6 @@ public class EcsS3MockRule implements TestRule {
this.autoCreateBucket = autoCreateBucket;
}
- @Override
- public Statement apply(Statement base, Description description) {
- return new Statement() {
- @Override
- public void evaluate() throws Throwable {
- initialize();
- try {
- base.evaluate();
- } finally {
- cleanUp();
- }
- }
- };
- }
-
private void initialize() {
bucket = "test-" + UUID.randomUUID();
if (System.getenv(DellProperties.ECS_S3_ENDPOINT) == null) {
@@ -178,4 +163,14 @@ public class EcsS3MockRule implements TestRule {
public String randomObjectName() {
return "test-" + ID.getAndIncrement() + "-" + UUID.randomUUID();
}
+
+ @Override
+ public void afterEach(ExtensionContext extensionContext) {
+ cleanUp();
+ }
+
+ @Override
+ public void beforeEach(ExtensionContext extensionContext) {
+ initialize();
+ }
}
diff --git
a/dell/src/test/java/org/apache/iceberg/dell/mock/ecs/TestExceptionCode.java
b/dell/src/test/java/org/apache/iceberg/dell/mock/ecs/TestExceptionCode.java
index 3305fa1d0d..719c346267 100644
--- a/dell/src/test/java/org/apache/iceberg/dell/mock/ecs/TestExceptionCode.java
+++ b/dell/src/test/java/org/apache/iceberg/dell/mock/ecs/TestExceptionCode.java
@@ -23,13 +23,13 @@ import com.emc.object.s3.S3Exception;
import com.emc.object.s3.request.PutObjectRequest;
import org.assertj.core.api.Assertions;
import org.assertj.core.api.InstanceOfAssertFactories;
-import org.junit.Rule;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/** Verify the error codes between real client and mock client. */
public class TestExceptionCode {
- @Rule public EcsS3MockRule rule = EcsS3MockRule.create();
+ @RegisterExtension public EcsS3MockRule rule = EcsS3MockRule.create();
@Test
public void testExceptionCode() {
