Minor refactorings and code style changes. 1) Removed several use of raw types 2) Removed unnecessary throws clauses 3) Used lambda expressions wherever applicable 4) Used apt assertion methods for readability 5) Use of try with resources wherever applicable 6) Corrected incorrect order of assertXXX arguments

This commit is contained in:
Narendra Pathai
2018-10-20 17:50:52 +05:30
parent 2f569d670a
commit 543eb9a4be
73 changed files with 207 additions and 298 deletions

View File

@@ -27,6 +27,7 @@ import java.io.FileReader;
import java.io.IOException;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
/**
* The Module pattern can be considered a Creational pattern and a Structural pattern. It manages
@@ -88,7 +89,7 @@ public final class FileLoggerModuleTest {
fileLoggerModule.prepare();
/* Test if nothing is printed in file */
assertEquals(readFirstLine(OUTPUT_FILE), null);
assertNull(readFirstLine(OUTPUT_FILE));
/* Unprepare to cleanup the modules */
fileLoggerModule.unprepare();
@@ -113,7 +114,7 @@ public final class FileLoggerModuleTest {
fileLoggerModule.printErrorString(ERROR);
/* Test if 'Message' is printed in file */
assertEquals(readFirstLine(ERROR_FILE), ERROR);
assertEquals(ERROR, readFirstLine(ERROR_FILE));
/* Unprepare to cleanup the modules */
fileLoggerModule.unprepare();
@@ -135,7 +136,7 @@ public final class FileLoggerModuleTest {
fileLoggerModule.prepare();
/* Test if nothing is printed in file */
assertEquals(readFirstLine(ERROR_FILE), null);
assertNull(readFirstLine(ERROR_FILE));
/* Unprepare to cleanup the modules */
fileLoggerModule.unprepare();
@@ -150,11 +151,7 @@ public final class FileLoggerModuleTest {
private static final String readFirstLine(final String file) {
String firstLine = null;
BufferedReader bufferedReader = null;
try {
/* Create a buffered reader */
bufferedReader = new BufferedReader(new FileReader(file));
try (BufferedReader bufferedReader = new BufferedReader(new FileReader(file))) {
while (bufferedReader.ready()) {
@@ -166,15 +163,6 @@ public final class FileLoggerModuleTest {
} catch (final IOException e) {
LOGGER.error("ModuleTest::readFirstLine()", e);
} finally {
if (bufferedReader != null) {
try {
bufferedReader.close();
} catch (final IOException e) {
LOGGER.error("ModuleTest::readFirstLine()", e);
}
}
}
return firstLine;