Skip to content

Commit 2f569d6

Browse files
committed
Made minor changes in some patterns such as removed throws clause where not needed, changed incorrect order of arguments in assertEquals
1 parent db33cc5 commit 2f569d6

39 files changed

Lines changed: 96 additions & 146 deletions

File tree

abstract-document/src/test/java/com/iluwatar/abstractdocument/AbstractDocumentTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232

3333
import static org.junit.jupiter.api.Assertions.assertEquals;
3434
import static org.junit.jupiter.api.Assertions.assertNotNull;
35+
import static org.junit.jupiter.api.Assertions.assertTrue;
3536

3637
/**
3738
* AbstractDocument test class
@@ -81,8 +82,8 @@ public void shouldIncludePropsInToString() {
8182
Map<String, Object> props = new HashMap<>();
8283
props.put(KEY, VALUE);
8384
DocumentImplementation document = new DocumentImplementation(props);
84-
assertNotNull(document.toString().contains(KEY));
85-
assertNotNull(document.toString().contains(VALUE));
85+
assertTrue(document.toString().contains(KEY));
86+
assertTrue(document.toString().contains(VALUE));
8687
}
8788

8889
}

acyclic-visitor/src/test/java/com/iluwatar/acyclicvisitor/ConfigureForUnixVisitorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
*/
4646
public class ConfigureForUnixVisitorTest {
4747

48-
TestLogger logger = TestLoggerFactory.getTestLogger(ConfigureForUnixVisitor.class);
48+
private TestLogger logger = TestLoggerFactory.getTestLogger(ConfigureForUnixVisitor.class);
4949

5050
@AfterEach
5151
public void clearLoggers() {

aggregator-microservices/inventory-microservice/src/test/java/com/iluwatar/inventory/microservice/InventoryControllerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
*/
3232
public class InventoryControllerTest {
3333
@Test
34-
public void testGetProductInventories() throws Exception {
34+
public void testGetProductInventories() {
3535
InventoryController inventoryController = new InventoryController();
3636

3737
int numberOfInventories = inventoryController.getProductInventories();

bridge/src/test/java/com/iluwatar/bridge/HammerTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class HammerTest extends WeaponTest {
3737
* underlying weapon implementation.
3838
*/
3939
@Test
40-
public void testHammer() throws Exception {
40+
public void testHammer() {
4141
final Hammer hammer = spy(new Hammer(mock(FlyingEnchantment.class)));
4242
testBasicWeaponActions(hammer);
4343
}

bridge/src/test/java/com/iluwatar/bridge/SwordTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class SwordTest extends WeaponTest {
3737
* underlying weapon implementation.
3838
*/
3939
@Test
40-
public void testSword() throws Exception {
40+
public void testSword() {
4141
final Sword sword = spy(new Sword(mock(FlyingEnchantment.class)));
4242
testBasicWeaponActions(sword);
4343
}

callback/src/main/java/com/iluwatar/callback/App.java

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,7 @@ public class App {
4141
*/
4242
public static void main(String[] args) {
4343
Task task = new SimpleTask();
44-
Callback callback = new Callback() {
45-
@Override
46-
public void call() {
47-
LOGGER.info("I'm done now.");
48-
}
49-
};
44+
Callback callback = () -> LOGGER.info("I'm done now.");
5045
task.executeWith(callback);
5146
}
5247
}

callback/src/test/java/com/iluwatar/callback/CallbackTest.java

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -38,29 +38,6 @@ public class CallbackTest {
3838

3939
@Test
4040
public void test() {
41-
Callback callback = new Callback() {
42-
@Override
43-
public void call() {
44-
callingCount++;
45-
}
46-
};
47-
48-
Task task = new SimpleTask();
49-
50-
assertEquals(new Integer(0), callingCount, "Initial calling count of 0");
51-
52-
task.executeWith(callback);
53-
54-
assertEquals(new Integer(1), callingCount, "Callback called once");
55-
56-
task.executeWith(callback);
57-
58-
assertEquals(new Integer(2), callingCount, "Callback called twice");
59-
60-
}
61-
62-
@Test
63-
public void testWithLambdasExample() {
6441
Callback callback = () -> callingCount++;
6542

6643
Task task = new SimpleTask();

chain/src/test/java/com/iluwatar/chain/OrcKingTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class OrcKingTest {
4343
};
4444

4545
@Test
46-
public void testMakeRequest() throws Exception {
46+
public void testMakeRequest() {
4747
final OrcKing king = new OrcKing();
4848

4949
for (final Request request : REQUESTS) {

collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Car.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
* A Car class that has the properties of make, model, year and category.
2727
*/
2828
public class Car {
29-
private String make;
30-
private String model;
31-
private int year;
32-
private Category category;
29+
private final String make;
30+
private final String model;
31+
private final int year;
32+
private final Category category;
3333

3434
/**
3535
* Constructor to create an instance of car.

converter/src/test/java/com/iluwatar/converter/ConverterTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void testCustomConverter() {
7171
user.getFirstName().toLowerCase() + user.getLastName().toLowerCase() + "@whatever.com"));
7272
User u1 = new User("John", "Doe", false, "12324");
7373
UserDto userDto = converter.convertFromEntity(u1);
74-
assertEquals(userDto.getEmail(), "johndoe@whatever.com");
74+
assertEquals("johndoe@whatever.com", userDto.getEmail());
7575
}
7676

7777
/**
@@ -83,6 +83,6 @@ public void testCollectionConversion() {
8383
ArrayList<User> users = Lists.newArrayList(new User("Camile", "Tough", false, "124sad"),
8484
new User("Marti", "Luther", true, "42309fd"), new User("Kate", "Smith", true, "if0243"));
8585
List<User> fromDtos = userConverter.createFromDtos(userConverter.createFromEntities(users));
86-
assertEquals(fromDtos, users);
86+
assertEquals(users, fromDtos);
8787
}
8888
}

0 commit comments

Comments
 (0)