From ce0d7c7638349fb62ca7e90ef3c94a9ad4d307ee Mon Sep 17 00:00:00 2001 From: Yusuke Shinyama Date: Mon, 21 Oct 2019 16:55:52 +0900 Subject: [PATCH] Made some variable names more consistent with the other parts. --- .../java/org/junit/runner/Description.java | 6 +-- .../junit/runners/BlockJUnit4ClassRunner.java | 12 ++--- .../junit/rules/TemporaryFolderUsageTest.java | 48 +++++++++---------- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/main/java/org/junit/runner/Description.java b/src/main/java/org/junit/runner/Description.java index 0846a1e9d31b..a681ad6ac269 100644 --- a/src/main/java/org/junit/runner/Description.java +++ b/src/main/java/org/junit/runner/Description.java @@ -222,11 +222,11 @@ public int testCount() { if (isTest()) { return 1; } - int result = 0; + int conut = 0; for (Description child : fChildren) { - result += child.testCount(); + conut += child.testCount(); } - return result; + return conut; } @Override diff --git a/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java b/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java index 455341aa0cb9..9c86a0ef8a2c 100644 --- a/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java +++ b/src/main/java/org/junit/runners/BlockJUnit4ClassRunner.java @@ -164,9 +164,9 @@ private void validatePublicConstructor(List errors) { protected void validateNoNonStaticInnerClass(List errors) { if (getTestClass().isANonStaticInnerClass()) { - String gripe = "The inner class " + getTestClass().getName() + String message = "The inner class " + getTestClass().getName() + " is not static."; - errors.add(new Exception(gripe)); + errors.add(new Exception(message)); } } @@ -186,8 +186,8 @@ protected void validateConstructor(List errors) { */ protected void validateOnlyOneConstructor(List errors) { if (!hasOneConstructor()) { - String gripe = "Test class should have exactly one public constructor"; - errors.add(new Exception(gripe)); + String message = "Test class should have exactly one public constructor"; + errors.add(new Exception(message)); } } @@ -199,8 +199,8 @@ protected void validateZeroArgConstructor(List errors) { if (!getTestClass().isANonStaticInnerClass() && hasOneConstructor() && (getTestClass().getOnlyConstructor().getParameterTypes().length != 0)) { - String gripe = "Test class should have exactly one public zero-argument constructor"; - errors.add(new Exception(gripe)); + String message = "Test class should have exactly one public zero-argument constructor"; + errors.add(new Exception(message)); } } diff --git a/src/test/java/org/junit/rules/TemporaryFolderUsageTest.java b/src/test/java/org/junit/rules/TemporaryFolderUsageTest.java index 584a29603f64..d457321060e8 100644 --- a/src/test/java/org/junit/rules/TemporaryFolderUsageTest.java +++ b/src/test/java/org/junit/rules/TemporaryFolderUsageTest.java @@ -208,9 +208,9 @@ public void deleteRemovesRootFolder() throws IOException { public void newRandomFileIsCreatedUnderRootFolder() throws IOException { tempFolder.create(); - File f = tempFolder.newFile(); - assertFileExists(f); - assertFileCreatedUnderRootFolder("Random file", f); + File file = tempFolder.newFile(); + assertFileExists(file); + assertFileCreatedUnderRootFolder("Random file", file); } @Test @@ -218,33 +218,33 @@ public void newNamedFileIsCreatedUnderRootFolder() throws IOException { final String fileName = "SampleFile.txt"; tempFolder.create(); - File f = tempFolder.newFile(fileName); + File file = tempFolder.newFile(fileName); - assertFileExists(f); - assertFileCreatedUnderRootFolder("Named file", f); - assertThat("file name", f.getName(), equalTo(fileName)); + assertFileExists(file); + assertFileCreatedUnderRootFolder("Named file", file); + assertThat("file name", file.getName(), equalTo(fileName)); } @Test public void newRandomFolderIsCreatedUnderRootFolder() throws IOException { tempFolder.create(); - File f = tempFolder.newFolder(); - assertFileIsDirectory(f); - assertFileCreatedUnderRootFolder("Random folder", f); + File file = tempFolder.newFolder(); + assertFileIsDirectory(file); + assertFileCreatedUnderRootFolder("Random folder", file); } @Test public void newNestedFoldersCreatedUnderRootFolder() throws IOException { tempFolder.create(); - File f = tempFolder.newFolder("top", "middle", "bottom"); - assertFileIsDirectory(f); - assertParentFolderForFileIs(f, new File(tempFolder.getRoot(), + File file = tempFolder.newFolder("top", "middle", "bottom"); + assertFileIsDirectory(file); + assertParentFolderForFileIs(file, new File(tempFolder.getRoot(), "top/middle")); - assertParentFolderForFileIs(f.getParentFile(), + assertParentFolderForFileIs(file.getParentFile(), new File(tempFolder.getRoot(), "top")); - assertFileCreatedUnderRootFolder("top", f.getParentFile() + assertFileCreatedUnderRootFolder("top", file.getParentFile() .getParentFile()); } @@ -269,15 +269,15 @@ private void assertFileDoesNotExist(File file) { checkFileExists("exists", file, false); } - private void checkFileExists(String msg, File file, boolean exists) { + private void checkFileExists(String message, File file, boolean exists) { assertThat("File is null", file, is(notNullValue())); - assertThat("File '" + file.getAbsolutePath() + "' " + msg, + assertThat("File '" + file.getAbsolutePath() + "' " + message, file.exists(), is(exists)); } - private void checkFileIsDirectory(String msg, File file, boolean isDirectory) { + private void checkFileIsDirectory(String message, File file, boolean isDirectory) { assertThat("File is null", file, is(notNullValue())); - assertThat("File '" + file.getAbsolutePath() + "' " + msg, + assertThat("File '" + file.getAbsolutePath() + "' " + message, file.isDirectory(), is(isDirectory)); } @@ -291,12 +291,12 @@ private void assertFileIsDirectory(File file) { checkFileIsDirectory("is not a directory", file, true); } - private void assertFileCreatedUnderRootFolder(String msg, File f) { - assertParentFolderForFileIs(f, tempFolder.getRoot()); + private void assertFileCreatedUnderRootFolder(String message, File file) { + assertParentFolderForFileIs(file, tempFolder.getRoot()); } - private void assertParentFolderForFileIs(File f, File parentFolder) { - assertThat("'" + f.getAbsolutePath() + "': not under root", - f.getParentFile(), is(parentFolder)); + private void assertParentFolderForFileIs(File file, File parentFolder) { + assertThat("'" + file.getAbsolutePath() + "': not under root", + file.getParentFile(), is(parentFolder)); } }