[
https://issues.apache.org/jira/browse/HADOOP-18248?focusedWorklogId=773458&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-773458
]
ASF GitHub Bot logged work on HADOOP-18248:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 23/May/22 12:39
Start Date: 23/May/22 12:39
Worklog Time Spent: 10m
Work Description: dannycjones commented on code in PR #4334:
URL: https://github.com/apache/hadoop/pull/4334#discussion_r879406416
##########
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/contract/AbstractFSContractTestBase.java:
##########
@@ -400,4 +402,12 @@ protected String generateAndLogErrorListing(Path src, Path
dst) throws
}
return destDirLS;
}
+
+ public static <T> void assertThat(T actual, Matcher<? super T> matcher) {
+ assertThat("", actual, matcher);
+ }
+
+ public static <T> void assertThat(String reason, T actual, Matcher<? super
T> matcher) {
+ MatcherAssert.assertThat(reason, actual, matcher);
+ }
Review Comment:
similar to another comment: Please add a short JavaDoc explaining why they
are here and when we should remove them.
##########
hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/AbstractAbfsTestWithTimeout.java:
##########
@@ -126,4 +128,8 @@ protected boolean validateContent(AzureBlobFileSystem fs,
Path path,
}
+ public static <T> void assertThat(String reason, T actual, Matcher<? super
T> matcher) {
+ MatcherAssert.assertThat(reason, actual, matcher);
+ }
Review Comment:
Please add a short JavaDoc explaining why its here.
Something like
"Override `assertThat` introduced by extending JUnit `Assertions` in base
test class. If extending `Assertions` is removed, we can elimiate this method
and import directly."
##########
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-applications/hadoop-yarn-services/hadoop-yarn-services-core/src/test/java/org/apache/hadoop/yarn/service/TestYarnNativeServices.java:
##########
@@ -917,7 +917,8 @@ private void checkEachCompInstancesInOrder(Component
component, String
int i = 0;
for (String s : instances) {
- assertThat(s).isEqualTo(component.getName() + "-" + i);
+ assertThat(s,
+ CoreMatchers.containsString(component.getName() + "-" + i));
Review Comment:
I'm not sure if there's any side effects here, we are changing the test.
Can we stick with equals?
```suggestion
assertThat(s, CoreMatchers.equalTo(component.getName() + "-" + i));
```
##########
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/test/HadoopTestBase.java:
##########
@@ -105,4 +107,8 @@ public static void nameTestThread() {
public void nameThreadToMethod() {
Thread.currentThread().setName("JUnit-" + getMethodName());
}
+
+ public static <T> void assertThat(T actual, Matcher<? super T> matcher) {
+ MatcherAssert.assertThat("", actual, matcher);
+ }
Review Comment:
similar to another comment: Please add a short JavaDoc explaining why its
here and when we should remove it.
Issue Time Tracking
-------------------
Worklog Id: (was: 773458)
Time Spent: 2h 20m (was: 2h 10m)
> Fix Junit Test Deprecated assertThat
> ------------------------------------
>
> Key: HADOOP-18248
> URL: https://issues.apache.org/jira/browse/HADOOP-18248
> Project: Hadoop Common
> Issue Type: Improvement
> Affects Versions: 3.4.0
> Reporter: fanshilun
> Assignee: fanshilun
> Priority: Major
> Labels: pull-request-available
> Fix For: 3.4.0
>
> Time Spent: 2h 20m
> Remaining Estimate: 0h
>
> javac will give a warning for compilation, as follows:
> org.junit.Assert.assertThat Deprecated. use
> org.hamcrest.MatcherAssert.assertThat()
> {code:java}
> TestIncrementalBrVariations.java:141:4:[deprecation]
> <T>assertThat(T,Matcher<? super T>) in Assert has been deprecated {code}
>
--
This message was sent by Atlassian Jira
(v8.20.7#820007)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
