Skip to content

Commit 22199e6

Browse files
svenesvene
committed
cleanup
1 parent 50f9f71 commit 22199e6

7 files changed

Lines changed: 47 additions & 53 deletions

File tree

‎collage/src/test/java/org/collage/Javassist2Test.java‎

Lines changed: 21 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,10 @@
99
import org.collage.template.TemplateSource;
1010
import org.jooq.lambda.Sneaky;
1111
import org.junit.jupiter.api.Test;
12-
import org.xcommand.core.DynaBeanProvider;
1312
import org.xcommand.core.ICommand;
14-
import org.xcommand.core.IDynaBeanProvider;
1513
import org.xcommand.core.TCP;
1614

1715
class Javassist2Test {
18-
IDynaBeanProvider dbp = DynaBeanProvider.newThreadClassMethodInstance();
1916

2017
void initializeContext() {
2118
TCP.pushContext(new HashMap<>());
@@ -27,23 +24,23 @@ void tearDownContext() {
2724
}
2825

2926
@Test
30-
void verify_that_recursive_template_resolving_works() throws Exception {
27+
void verify_that_recursive_template_resolving_works() {
3128
TCP.start(Sneaky.runnable(() -> {
3229
initializeContext();
33-
var s =
34-
"""
35-
Header
36-
37-
<?java for (int i = 0; i< 3; i++) {?>
38-
hallo ${name}.
39-
Wie gehts?
40-
<?java }?>
41-
Footer
42-
""";
4330

4431
// First replace '${name}' with '${firstname} ${lastname}':
4532
TCP.pushContext(new HashMap<>());
4633
TCP.getContext().put("name", "${firstname} ${lastname}");
34+
var s =
35+
"""
36+
Header
37+
38+
<?java for (int i = 0; i< 3; i++) {?>
39+
hallo ${name}.
40+
Wie gehts?
41+
<?java }?>
42+
Footer
43+
""";
4744
ICommand cmd = TemplateFactory.newRecursiveTemplateInstance(new TemplateSource(s));
4845
TCP.popContext();
4946

@@ -74,22 +71,22 @@ void verify_that_recursive_template_resolving_works() throws Exception {
7471
}
7572

7673
@Test
77-
void verify_that_recursive_template_resolving_works_with_3_levels_of_nesting() throws Exception {
74+
void verify_that_recursive_template_resolving_works_with_3_levels_of_nesting() {
7875
TCP.start(Sneaky.runnable(() -> {
7976
initializeContext();
80-
// person -> nameAndAddress -> address:
81-
String person = "${person}";
82-
String nameAndAddress = "${firstname} ${lastname} ${address}";
83-
String address = """
84-
85-
Sohlweg 13
86-
D-79589 Binzen
87-
""";
8877

8978
// Use new context for template command creation:
90-
TCP.pushContext(new HashMap());
79+
TCP.pushContext(new HashMap<>());
80+
// person -> nameAndAddress -> address:
81+
String nameAndAddress = "${firstname} ${lastname} ${address}";
9182
TCP.getContext().put("person", nameAndAddress);
83+
String address = """
84+
85+
Sohlweg 13
86+
D-79589 Binzen
87+
""";
9288
TCP.getContext().put("address", address);
89+
String person = "${person}";
9390
ICommand cmd = TemplateFactory.newRecursiveTemplateInstance(new TemplateSource(person));
9491
TCP.popContext();
9592

‎jst/src/test/java/org/xcommand/template/jst/parser/FileSystemScannerTest.java‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.junit.jupiter.api.Nested;
1616
import org.junit.jupiter.api.Test;
1717
import org.junit.jupiter.api.TestInstance;
18-
import org.mockito.Mockito;
1918
import org.xcommand.core.DynaBeanProvider;
2019
import org.xcommand.core.IDynaBeanProvider;
2120
import org.xcommand.core.TCP;
@@ -131,23 +130,20 @@ void customHandler() {
131130
void defaultHandler() {
132131
TCP.start(() -> {
133132
var scanner = FileSystemScanner.newInstance(List.of(mainJavaPath, testJavaPath));
133+
var files = new ArrayList<String>();
134134

135135
// todo: should a filenamefilter e.g. "*.java" be supported ?
136-
TC.IStringMockHook smh = Mockito.mock(TC.IStringMockHook.class);
137-
scanner.getFileFoundNotifier()
138-
.registerObserver(() -> smh.hookRoutineForMockVerification(
139-
fileSystemScannerCV.getPath().toString()));
136+
scanner.getFileFoundNotifier().registerObserver(() -> {
137+
files.add(fileSystemScannerCV.getPath().toString());
138+
});
140139
scanner.execute();
141140

142141
// Test for the following three files (although more will be found):
143-
Mockito.verify(smh)
144-
.hookRoutineForMockVerification(
145-
"src/main/java/org/xcommand/template/jst/IJSTParserProvider.java");
146-
Mockito.verify(smh)
147-
.hookRoutineForMockVerification(
148-
"src/main/java/org/xcommand/template/jst/FileSystemBasedJSTProvider.java");
149-
Mockito.verify(smh)
150-
.hookRoutineForMockVerification("src/main/java/org/xcommand/template/jst/JSTCompiler.java");
142+
assertThat(files)
143+
.contains(
144+
"src/main/java/org/xcommand/template/jst/IJSTParserProvider.java",
145+
"src/main/java/org/xcommand/template/jst/FileSystemBasedJSTProvider.java",
146+
"src/main/java/org/xcommand/template/jst/JSTCompiler.java");
151147
});
152148
}
153149
}

‎xc-core/src/test/java/org/xcommand/core/DelegatingPerson.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.xcommand.core;
22

3-
import java.util.Date;
3+
import java.time.LocalDate;
44

55
public class DelegatingPerson implements IPerson {
66

@@ -19,7 +19,7 @@ public String getLastName() {
1919
}
2020

2121
@Override
22-
public Date getBirthDate() {
22+
public LocalDate getBirthDate() {
2323
return delegate.getBirthDate();
2424
}
2525

@@ -34,7 +34,7 @@ public void setLastName(String aLastName) {
3434
}
3535

3636
@Override
37-
public void setBirthDate(Date aBirthDate) {
37+
public void setBirthDate(LocalDate aBirthDate) {
3838
delegate.setBirthDate(aBirthDate);
3939
}
4040

‎xc-core/src/test/java/org/xcommand/core/DynaBeanProviderTest.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
44

55
import java.beans.PropertyDescriptor;
6-
import java.util.Date;
6+
import java.time.LocalDate;
7+
import java.time.ZoneId;
78
import java.util.HashMap;
89
import org.junit.jupiter.api.Test;
910
import org.springframework.beans.BeanWrapper;
@@ -26,7 +27,7 @@ void verify_that_class_and_method_based_DynaBeanProvider_CM_DBP_produces_new_ins
2627

2728
person.setFirstName("Sven");
2829
person.setLastName("Ehrke");
29-
Date d = new Date();
30+
var d = LocalDate.now(ZoneId.of("Europe/Berlin"));
3031
person.setBirthDate(d);
3132

3233
assertThat(person.getFirstName()).isEqualTo("Sven");
@@ -49,7 +50,7 @@ void verify_that_class_and_method_based_DynaBeanProvider_CM_DBP_produces_new_ins
4950

5051
person.setFirstName("Sven");
5152
person.setLastName("Ehrke");
52-
Date d = new Date();
53+
var d = LocalDate.now(ZoneId.of("Europe/Berlin"));
5354
person.setBirthDate(d);
5455

5556
assertThat(person.getFirstName()).isEqualTo("Sven");
@@ -72,7 +73,7 @@ void verify_that_class_and_method_based_DynaBeanProvider_CM_DBP_produces_new_ins
7273

7374
person.setFirstName("Sven");
7475
person.setLastName("Ehrke");
75-
Date d = new Date();
76+
var d = LocalDate.now(ZoneId.of("Europe/Berlin"));
7677
person.setBirthDate(d);
7778

7879
assertThat(person.getFirstName()).isEqualTo("Sven");

‎xc-core/src/test/java/org/xcommand/core/IPerson.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
package org.xcommand.core;
22

3-
import java.util.Date;
3+
import java.time.LocalDate;
44

55
public interface IPerson {
66
String getFirstName();
77

88
String getLastName();
99

10-
Date getBirthDate();
10+
LocalDate getBirthDate();
1111

1212
void setFirstName(String aFirstName);
1313

1414
void setLastName(String aLastName);
1515

16-
void setBirthDate(Date aBirthDate);
16+
void setBirthDate(LocalDate aBirthDate);
1717
}

‎xc-core/src/test/java/org/xcommand/core/Person.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.xcommand.core;
22

3-
import java.util.Date;
3+
import java.time.LocalDate;
44

55
public class Person implements IPerson {
66

@@ -25,16 +25,16 @@ public void setLastName(String aLastName) {
2525
}
2626

2727
@Override
28-
public Date getBirthDate() {
28+
public LocalDate getBirthDate() {
2929
return birthDate;
3030
}
3131

3232
@Override
33-
public void setBirthDate(Date aBirthDate) {
33+
public void setBirthDate(LocalDate aBirthDate) {
3434
birthDate = aBirthDate;
3535
}
3636

3737
private String firstName;
3838
private String lastName;
39-
private Date birthDate;
39+
private LocalDate birthDate;
4040
}

‎xc-core/src/test/java/org/xcommand/datastructure/tree/specifictreenode/SpecificTreeNodeTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@ void verify_that_handler_is_properly_notified_during_traversal() {
9090
}
9191

9292
// Helpers for this test:
93-
private class ICommandHook {
94-
public void testHook(int position, Object aDomainObject) {}
93+
private interface ICommandHook {
94+
void testHook(@SuppressWarnings("unused") int position, @SuppressWarnings("unused") Object aDomainObject);
9595
}
9696

9797
private class MyCommand implements ICommand {

0 commit comments

Comments
 (0)