Skip to content

Commit 533cde7

Browse files
committed
HADOOP-19617 - [JDK17] Remove JUnit4 Dependency - Cloud V2.
1 parent a414df2 commit 533cde7

File tree

3 files changed

+21
-12
lines changed

3 files changed

+21
-12
lines changed

hadoop-cloud-storage-project/hadoop-huaweicloud/pom.xml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,6 @@
116116
<scope>test</scope>
117117
<type>test-jar</type>
118118
</dependency>
119-
<dependency>
120-
<groupId>junit</groupId>
121-
<artifactId>junit</artifactId>
122-
<version>${junit.version}</version>
123-
<scope>test</scope>
124-
</dependency>
125119
<dependency>
126120
<groupId>org.mockito</groupId>
127121
<artifactId>mockito-all</artifactId>
@@ -201,5 +195,10 @@
201195
</exclusion>
202196
</exclusions>
203197
</dependency>
198+
<dependency>
199+
<groupId>org.assertj</groupId>
200+
<artifactId>assertj-core</artifactId>
201+
<scope>test</scope>
202+
</dependency>
204203
</dependencies>
205204
</project>

hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSContractCreate.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
import org.apache.hadoop.conf.Configuration;
2222
import org.apache.hadoop.fs.contract.AbstractContractCreateTest;
2323
import org.apache.hadoop.fs.contract.AbstractFSContract;
24-
import org.junit.Assume;
24+
25+
import static org.assertj.core.api.Assumptions.assumeThat;
2526

2627
/**
2728
* Create test cases on obs file system.
@@ -35,11 +36,15 @@ protected AbstractFSContract createContract(final Configuration conf) {
3536

3637
@Override
3738
public void testCreatedFileIsImmediatelyVisible() {
38-
Assume.assumeTrue("unsupport.", false);
39+
assumeThat(false)
40+
.as("unsupport.")
41+
.isTrue();
3942
}
4043

4144
@Override
4245
public void testCreatedFileIsVisibleOnFlush() {
43-
Assume.assumeTrue("unsupport", false);
46+
assumeThat(false)
47+
.as("unsupport.")
48+
.isTrue();
4449
}
4550
}

hadoop-cloud-storage-project/hadoop-huaweicloud/src/test/java/org/apache/hadoop/fs/obs/TestOBSContractRename.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
import org.apache.hadoop.conf.Configuration;
2222
import org.apache.hadoop.fs.contract.AbstractContractRenameTest;
2323
import org.apache.hadoop.fs.contract.AbstractFSContract;
24-
import org.junit.Assume;
24+
25+
import static org.assertj.core.api.Assumptions.assumeThat;
2526

2627
/**
2728
* Rename test cases on obs file system.
@@ -35,11 +36,15 @@ protected AbstractFSContract createContract(final Configuration conf) {
3536

3637
@Override
3738
public void testRenameFileUnderFileSubdir() {
38-
Assume.assumeTrue("unsupport.", false);
39+
assumeThat(false)
40+
.as("unsupport.")
41+
.isTrue();
3942
}
4043

4144
@Override
4245
public void testRenameFileUnderFile() {
43-
Assume.assumeTrue("unsupport.", false);
46+
assumeThat(false)
47+
.as("unsupport.")
48+
.isTrue();
4449
}
4550
}

0 commit comments

Comments
 (0)