HADOOP-18155. Refactor tests in TestFileUtil #4053

GauthamBanasandra · 2022-03-07T17:16:36Z

Description of PR

We need to ensure that we check the results of file operations whenever we invoke mkdir, deleteFile etc. and assert them right there before proceeding on. Also, we need to ensure that some of the relevant FileSystem APIs don't return null.

How was this patch tested?

Unit tests on CI.

For code changes:

Does the title or this PR starts with the corresponding JIRA issue id (e.g. 'HADOOP-17799. Your PR title ...')?
Object storage: have the integration tests been executed and the endpoint declared according to the connector-specific documentation?
If adding new dependencies to the code, are these dependencies licensed in a way that is compatible for inclusion under ASF 2.0?
If applicable, have you updated the LICENSE, LICENSE-binary, NOTICE-binary files?

steveloughran

Always good to see a bit of test cleanup.
Trying to keep all our tests modern what is a losing battle but

move to LambdaTestUtils.intercept where you are updating try/catch (expected) clauses
now you are adding validation of the File operations, maybe best to factor this out into a set of utility methods

void exists(File f) {
	assertTrue("Not found " + f, f.exists())
}

that will give meaningful messages and reduce the amount of duplication.

production side tuning LGTM.

hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java

* Using LambdaTestUtils for asserting expected exceptions.

* Added TestFileUtil#assertDelListLength to assert that expected length of TestFileUtil#del

* Added TestFileUtil#createNewFileAndVerify that creates a new file and verifies if the operation was successful.

* TestFileUtil$Verify helps in performing File operations and also verify them.

GauthamBanasandra · 2022-03-09T07:20:25Z

@steveloughran I've addressed your comments. Could you please take another pass at this PR?

hadoop-yetus · 2022-03-09T21:11:38Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	0m 51s		Docker mode activated.
			_ Prechecks _
+1 💚	dupname	0m 0s		No case conflicting files found.
+0 🆗	codespell	0m 1s		codespell was not available.
+1 💚	@author	0m 0s		The patch does not contain any @author tags.
+1 💚	test4tests	0m 0s		The patch appears to include 1 new or modified test files.
			_ trunk Compile Tests _
+1 💚	mvninstall	39m 20s		trunk passed
+1 💚	compile	28m 50s		trunk passed with JDK Ubuntu-11.0.14+9-Ubuntu-0ubuntu2.20.04
+1 💚	compile	22m 20s		trunk passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	checkstyle	1m 2s		trunk passed
+1 💚	mvnsite	1m 45s		trunk passed
+1 💚	javadoc	1m 9s		trunk passed with JDK Ubuntu-11.0.14+9-Ubuntu-0ubuntu2.20.04
+1 💚	javadoc	1m 40s		trunk passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	spotbugs	2m 49s		trunk passed
+1 💚	shadedclient	27m 10s		branch has no errors when building and testing our client artifacts.
			_ Patch Compile Tests _
+1 💚	mvninstall	1m 9s		the patch passed
+1 💚	compile	28m 8s		the patch passed with JDK Ubuntu-11.0.14+9-Ubuntu-0ubuntu2.20.04
+1 💚	javac	28m 8s		the patch passed
+1 💚	compile	22m 38s		the patch passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	javac	22m 38s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
-0 ⚠️	checkstyle	0m 57s	/results-checkstyle-hadoop-common-project_hadoop-common.txt	hadoop-common-project/hadoop-common: The patch generated 2 new + 60 unchanged - 15 fixed = 62 total (was 75)
+1 💚	mvnsite	1m 38s		the patch passed
+1 💚	javadoc	1m 7s		the patch passed with JDK Ubuntu-11.0.14+9-Ubuntu-0ubuntu2.20.04
+1 💚	javadoc	1m 37s		the patch passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	spotbugs	2m 52s		the patch passed
+1 💚	shadedclient	26m 42s		patch has no errors when building and testing our client artifacts.
			_ Other Tests _
+1 💚	unit	17m 50s		hadoop-common in the patch passed.
+1 💚	asflicense	0m 48s		The patch does not generate ASF License warnings.
		231m 23s

Subsystem	Report/Notes
Docker	ClientAPI=1.41 ServerAPI=1.41 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-4053/8/artifact/out/Dockerfile
GITHUB PR	#4053
Optional Tests	dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient spotbugs checkstyle codespell
uname	Linux bdd15f1ab680 4.15.0-163-generic #171-Ubuntu SMP Fri Nov 5 11:55:11 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/bin/hadoop.sh
git revision	trunk / `2e841bb`
Default Java	Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
Multi-JDK versions	/usr/lib/jvm/java-11-openjdk-amd64:Ubuntu-11.0.14+9-Ubuntu-0ubuntu2.20.04 /usr/lib/jvm/java-8-openjdk-amd64:Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
Test Results	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-4053/8/testReport/
Max. process+thread count	1330 (vs. ulimit of 5500)
modules	C: hadoop-common-project/hadoop-common U: hadoop-common-project/hadoop-common
Console output	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-4053/8/console
versions	git=2.25.1 maven=3.6.3 spotbugs=4.2.2
Powered by	Apache Yetus 0.14.0-SNAPSHOT https://yetus.apache.org

This message was automatically generated.

steveloughran

+1
lovely

hadoop-yetus · 2022-03-10T09:10:01Z

🎊 +1 overall

Vote	Subsystem	Runtime	Logfile	Comment
+0 🆗	reexec	1m 42s		Docker mode activated.
			_ Prechecks _
+1 💚	dupname	0m 0s		No case conflicting files found.
+0 🆗	codespell	0m 1s		codespell was not available.
+1 💚	@author	0m 0s		The patch does not contain any @author tags.
+1 💚	test4tests	0m 0s		The patch appears to include 1 new or modified test files.
			_ trunk Compile Tests _
+1 💚	mvninstall	41m 49s		trunk passed
+1 💚	compile	28m 24s		trunk passed with JDK Ubuntu-11.0.14+9-Ubuntu-0ubuntu2.20.04
+1 💚	compile	20m 55s		trunk passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	checkstyle	1m 0s		trunk passed
+1 💚	mvnsite	1m 37s		trunk passed
+1 💚	javadoc	1m 8s		trunk passed with JDK Ubuntu-11.0.14+9-Ubuntu-0ubuntu2.20.04
+1 💚	javadoc	1m 40s		trunk passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	spotbugs	2m 35s		trunk passed
+1 💚	shadedclient	25m 7s		branch has no errors when building and testing our client artifacts.
			_ Patch Compile Tests _
+1 💚	mvninstall	1m 3s		the patch passed
+1 💚	compile	23m 43s		the patch passed with JDK Ubuntu-11.0.14+9-Ubuntu-0ubuntu2.20.04
+1 💚	javac	23m 43s		the patch passed
+1 💚	compile	20m 55s		the patch passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	javac	20m 55s		the patch passed
+1 💚	blanks	0m 0s		The patch has no blanks issues.
+1 💚	checkstyle	1m 0s		hadoop-common-project/hadoop-common: The patch generated 0 new + 60 unchanged - 15 fixed = 60 total (was 75)
+1 💚	mvnsite	1m 37s		the patch passed
+1 💚	javadoc	1m 5s		the patch passed with JDK Ubuntu-11.0.14+9-Ubuntu-0ubuntu2.20.04
+1 💚	javadoc	1m 37s		the patch passed with JDK Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
+1 💚	spotbugs	2m 39s		the patch passed
+1 💚	shadedclient	25m 46s		patch has no errors when building and testing our client artifacts.
			_ Other Tests _
+1 💚	unit	19m 16s		hadoop-common in the patch passed.
+1 💚	asflicense	0m 55s		The patch does not generate ASF License warnings.
		225m 29s

Subsystem	Report/Notes
Docker	ClientAPI=1.41 ServerAPI=1.41 base: https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-4053/9/artifact/out/Dockerfile
GITHUB PR	#4053
Optional Tests	dupname asflicense compile javac javadoc mvninstall mvnsite unit shadedclient spotbugs checkstyle codespell
uname	Linux 4aea49efbdda 4.15.0-163-generic #171-Ubuntu SMP Fri Nov 5 11:55:11 UTC 2021 x86_64 x86_64 x86_64 GNU/Linux
Build tool	maven
Personality	dev-support/bin/hadoop.sh
git revision	trunk / `e966122`
Default Java	Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
Multi-JDK versions	/usr/lib/jvm/java-11-openjdk-amd64:Ubuntu-11.0.14+9-Ubuntu-0ubuntu2.20.04 /usr/lib/jvm/java-8-openjdk-amd64:Private Build-1.8.0_312-8u312-b07-0ubuntu1~20.04-b07
Test Results	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-4053/9/testReport/
Max. process+thread count	1252 (vs. ulimit of 5500)
modules	C: hadoop-common-project/hadoop-common U: hadoop-common-project/hadoop-common
Console output	https://ci-hadoop.apache.org/job/hadoop-multibranch/job/PR-4053/9/console
versions	git=2.25.1 maven=3.6.3 spotbugs=4.2.2
Powered by	Apache Yetus 0.14.0-SNAPSHOT https://yetus.apache.org

This message was automatically generated.

steveloughran · 2022-03-10T12:53:08Z

all good, merge when you are happy, to whichever branches you want

(cherry picked from commit d0fa9b5) Conflicts: hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/FileUtil.java hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/TestFileUtil.java

GauthamBanasandra requested a review from goiri March 7, 2022 17:16

GauthamBanasandra self-assigned this Mar 7, 2022

GauthamBanasandra added test test code changes java Pull requests that update Java code labels Mar 7, 2022

goiri approved these changes Mar 7, 2022

View reviewed changes

GauthamBanasandra force-pushed the cleanup-untar branch from 402ea51 to b101100 Compare March 7, 2022 17:38

This comment was marked as outdated.

Sign in to view

HADOOP-18155. Refactor tests in TestFileUtil

78f613a

GauthamBanasandra force-pushed the cleanup-untar branch from b101100 to 78f613a Compare March 8, 2022 07:56

This comment was marked as outdated.

Sign in to view

Handle long paths

0a848fb

This comment was marked as outdated.

Sign in to view

Check for link containment on all platforms

3916fca

goiri self-requested a review March 8, 2022 17:26

steveloughran requested changes Mar 8, 2022

View reviewed changes

This comment was marked as outdated.

Sign in to view

GauthamBanasandra added 9 commits March 9, 2022 11:09

Use LambdaTestUtils

dd67415

* Using LambdaTestUtils for asserting expected exceptions.

Remove redundant null check

6df0d80

Refactor assertion of del list length

107678c

* Added TestFileUtil#assertDelListLength to assert that expected length of TestFileUtil#del

Refactor createNewFile

101c5c6

* Added TestFileUtil#createNewFileAndVerify that creates a new file and verifies if the operation was successful.

Add documentation for TestFileUtil#createNewFileAndVerify

3e726ca

Add TestFileUtil$Verify helper class

987d8e3

* TestFileUtil$Verify helps in performing File operations and also verify them.

Add Verify#mkdirs

7398999

Add Verify#mkdir

52815a0

Add Verify#delete

5792612

GauthamBanasandra requested a review from steveloughran March 9, 2022 07:19

This comment was marked as outdated.

Sign in to view

Add Verify#exists and Verify#noteExists

69da555

GauthamBanasandra force-pushed the cleanup-untar branch from 85cf1dc to 69da555 Compare March 9, 2022 16:53

Delete whitespace

2e841bb

This comment was marked as outdated.

Sign in to view

steveloughran approved these changes Mar 9, 2022

View reviewed changes

Fix checkstyle issues

e966122

goiri approved these changes Mar 10, 2022

View reviewed changes

GauthamBanasandra merged commit d0fa9b5 into apache:trunk Mar 10, 2022

GauthamBanasandra deleted the cleanup-untar branch March 10, 2022 16:32

HarshitGupta11 pushed a commit to HarshitGupta11/hadoop that referenced this pull request Nov 28, 2022

HADOOP-18155. Refactor tests in TestFileUtil (apache#4053)

606ff00

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

HADOOP-18155. Refactor tests in TestFileUtil #4053

HADOOP-18155. Refactor tests in TestFileUtil #4053

GauthamBanasandra commented Mar 7, 2022

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

steveloughran left a comment

This comment was marked as outdated.

GauthamBanasandra commented Mar 9, 2022

This comment was marked as outdated.

This comment was marked as outdated.

hadoop-yetus commented Mar 9, 2022

steveloughran left a comment

hadoop-yetus commented Mar 10, 2022

steveloughran commented Mar 10, 2022

HADOOP-18155. Refactor tests in TestFileUtil #4053

HADOOP-18155. Refactor tests in TestFileUtil #4053

Conversation

GauthamBanasandra commented Mar 7, 2022

Description of PR

How was this patch tested?

For code changes:

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

steveloughran left a comment

Choose a reason for hiding this comment

This comment was marked as outdated.

GauthamBanasandra commented Mar 9, 2022

This comment was marked as outdated.

This comment was marked as outdated.

hadoop-yetus commented Mar 9, 2022

steveloughran left a comment

Choose a reason for hiding this comment

hadoop-yetus commented Mar 10, 2022

steveloughran commented Mar 10, 2022