Skip to content

Commit a5fc0e3

Browse files
author
Ludovic Richoux
committed
update(test) changing test to JUnit5 and AssertJ
1 parent 3b131cd commit a5fc0e3

8 files changed

Lines changed: 462 additions & 454 deletions

File tree

‎pom.xml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
<jfx.version>11.0.2</jfx.version>
1313
<java.version>11</java.version>
14+
<junit.version>5.4.2</junit.version>
1415
</properties>
1516

1617
<build>
@@ -51,14 +52,27 @@
5152
</descriptorRefs>
5253
</configuration>
5354
</plugin>
55+
56+
<plugin>
57+
<artifactId>maven-surefire-plugin</artifactId>
58+
<version>2.19.1</version>
59+
<dependencies>
60+
<dependency>
61+
<groupId>org.junit.platform</groupId>
62+
<artifactId>junit-platform-surefire-provider</artifactId>
63+
<version>1.1.0</version>
64+
</dependency>
65+
</dependencies>
66+
</plugin>
67+
5468
</plugins>
5569
</build>
5670

5771
<dependencies>
5872
<dependency>
59-
<groupId>junit</groupId>
60-
<artifactId>junit</artifactId>
61-
<version>4.12</version>
73+
<groupId>org.junit.jupiter</groupId>
74+
<artifactId>junit-jupiter-engine</artifactId>
75+
<version>${junit.version}</version>
6276
<scope>test</scope>
6377
</dependency>
6478
<dependency>

‎src/test/java/fr/inria/inspectorguidget/api/TestInspectorGuidget.java‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,17 @@
99
import java.util.logging.Handler;
1010
import java.util.logging.Level;
1111
import java.util.logging.LogRecord;
12-
import org.junit.Before;
12+
13+
import org.junit.jupiter.api.BeforeEach;
1314
import spoon.processing.Processor;
1415
import spoon.reflect.declaration.CtElement;
1516
import spoon.reflect.factory.FactoryImpl;
1617
import spoon.support.DefaultCoreFactory;
1718
import spoon.support.StandardEnvironment;
1819
import spoon.support.compiler.jdt.JDTBasedSpoonCompiler;
1920

20-
import static org.junit.Assert.fail;
21+
import static org.assertj.core.api.AssertionsForClassTypes.fail;
22+
2123

2224
public abstract class TestInspectorGuidget<T extends Processor<? extends CtElement>> {
2325
protected static final String SWT_LIB = System.getProperty("user.home") + "/.m2/repository/org/eclipse/swt/org.eclipse.swt.gtk.linux.x86/4.6.1/org.eclipse.swt.gtk.linux.x86-4.6.1.jar";
@@ -43,7 +45,7 @@ public void close() throws SecurityException {
4345
}
4446
};
4547

46-
@Before
48+
@BeforeEach
4749
public void setUp() {
4850
final StandardEnvironment evt = new StandardEnvironment();
4951
evt.setComplianceLevel(8);

‎src/test/java/fr/inria/inspectorguidget/api/analyser/TestCommandAnalyser.java‎

Lines changed: 250 additions & 256 deletions
Large diffs are not rendered by default.

‎src/test/java/fr/inria/inspectorguidget/api/analyser/TestCommandWidgetFinder.java‎

Lines changed: 91 additions & 96 deletions
Large diffs are not rendered by default.

‎src/test/java/fr/inria/inspectorguidget/api/processor/TestActionProcessor.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
import fr.inria.inspectorguidget.api.TestInspectorGuidget;
44
import java.util.Collections;
55
import java.util.List;
6-
import org.junit.Test;
6+
7+
import org.junit.jupiter.api.Test;
78
import spoon.reflect.declaration.CtElement;
89

9-
import static org.junit.Assert.assertEquals;
10+
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
11+
1012

1113
public class TestActionProcessor extends TestInspectorGuidget<InspectorGuidgetProcessor<? extends CtElement>> {
1214
private ActionProcessor classProc;
@@ -20,12 +22,12 @@ public List<InspectorGuidgetProcessor<? extends CtElement>> createProcessor() {
2022
@Test
2123
public void testAbstractActionNotAListener() {
2224
run("src/test/resources/java/listeners/AbstractAction.java");
23-
assertEquals(1, classProc.getActions().size());
25+
assertThat(classProc.getActions().size()).isEqualTo(1);
2426
}
2527

2628
@Test
2729
public void ActionListenerCondInstanceOfReturnNotAClass() {
2830
run("src/test/resources/java/analysers/ActionListenerCondInstanceOfReturn.java");
29-
assertEquals(0, classProc.getActions().size());
31+
assertThat(classProc.getActions().size()).isEqualTo(0);
3032
}
3133
}

‎src/test/java/fr/inria/inspectorguidget/api/processor/TestFXMLAnnotationProcessor.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package fr.inria.inspectorguidget.api.processor;
22

33
import fr.inria.inspectorguidget.api.TestInspectorGuidget;
4-
import org.junit.Test;
4+
import org.junit.jupiter.api.Test;
5+
56

67
import java.util.Collections;
78
import java.util.List;
89

9-
import static org.junit.Assert.assertEquals;
10+
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
11+
1012

1113
public class TestFXMLAnnotationProcessor extends TestInspectorGuidget<FXMLAnnotationProcessor> {
1214
private FXMLAnnotationProcessor proc;
@@ -20,7 +22,7 @@ public List<FXMLAnnotationProcessor> createProcessor() {
2022
@Test
2123
public void testFXMLAnnotationAttributes() {
2224
run("src/test/resources/java/fxml/FXMLAnnotationAttributes.java");
23-
assertEquals(2, proc.getFieldAnnotations().size());
24-
assertEquals(0, proc.getMethodAnnotations().size());
25+
assertThat(proc.getFieldAnnotations().size()).isEqualTo(2);
26+
assertThat(proc.getMethodAnnotations().size()).isEqualTo(0);
2527
}
2628
}

‎src/test/java/fr/inria/inspectorguidget/api/processor/TestListenerProcessor.java‎

Lines changed: 44 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,17 @@
44
import java.util.Arrays;
55
import java.util.Collections;
66
import java.util.List;
7-
import org.junit.BeforeClass;
8-
import org.junit.Test;
7+
import org.junit.jupiter.api.BeforeAll;
8+
import org.junit.jupiter.api.Test;
99
import spoon.reflect.declaration.CtElement;
1010

1111
import static org.assertj.core.api.Assertions.assertThat;
12-
import static org.junit.Assert.assertEquals;
1312

1413
public class TestListenerProcessor extends TestInspectorGuidget<InspectorGuidgetProcessor<? extends CtElement>> {
1514
private LambdaListenerProcessor lambdaProc;
1615
private ClassListenerProcessor classProc;
1716

18-
@BeforeClass
17+
@BeforeAll
1918
public static void setUpBeforeClass() {
2019
InspectorGuidgetProcessor.LOG.addHandler(HANDLER_FAIL);
2120
}
@@ -44,133 +43,133 @@ public void testActionListenerAsLambdaInheritance() {
4443
@Test
4544
public void testActionListenerAsLambdaInheritanceDefaultMethod() {
4645
run("src/test/resources/java/listeners/ListenerLambdaInheritanceDefault.java");
47-
assertEquals(1, lambdaProc.getAllListenerLambdas().size());
46+
assertThat(lambdaProc.getAllListenerLambdas().size()).isEqualTo(1);
4847
}
4948

5049
@Test
5150
public void testSwingCaretListenerAsLambda() {
5251
run("src/test/resources/java/listeners/CaretListenerLambda.java");
53-
assertEquals(1, lambdaProc.getAllListenerLambdas().size());
52+
assertThat(lambdaProc.getAllListenerLambdas().size()).isEqualTo(1);
5453
}
5554

5655
@Test
5756
public void testJFXHandlerAsClass() {
5857
run("src/test/resources/java/listeners/JFXEventHandlerClass.java");
59-
assertEquals(1, classProc.getAllListenerMethods().size());
60-
assertEquals(1, classProc.getAllListenerMethods().keySet().size());
61-
assertEquals(1, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
58+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(1);
59+
assertThat(classProc.getAllListenerMethods().keySet().size()).isEqualTo(1);
60+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(1);
6261
}
6362

6463
@Test
6564
public void testJFXEventHandlerAsLambda() {
6665
run("src/test/resources/java/listeners/JFXEventHandlerLambda.java");
67-
assertEquals(1, lambdaProc.getAllListenerLambdas().size());
66+
assertThat(lambdaProc.getAllListenerLambdas().size()).isEqualTo(1);
6867
}
6968

7069
@Test
7170
public void testAWTMouseListernerAsClassImplementingInterface() {
7271
run("src/test/resources/java/listeners/MouseListClass.java");
73-
assertEquals(1, classProc.getAllListenerMethods().size());
74-
assertEquals(1, classProc.getAllListenerMethods().keySet().size());
75-
assertEquals(5, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
72+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(1);
73+
assertThat(classProc.getAllListenerMethods().keySet().size()).isEqualTo(1);
74+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(5);
7675
}
7776

7877

7978
@Test
8079
public void testSwingMouseInputListernerAsClassImplementingInterface() {
8180
run("src/test/resources/java/listeners/MouseInputListClass.java");
82-
assertEquals(1, classProc.getAllListenerMethods().size());
83-
assertEquals(1, classProc.getAllListenerMethods().keySet().size());
84-
assertEquals(7, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
81+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(1);
82+
assertThat(classProc.getAllListenerMethods().keySet().size()).isEqualTo(1);
83+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(7);
8584
}
8685

8786
@Test
8887
public void testSwingMouseListernerAsAnonClass() {
8988
run("src/test/resources/java/listeners/MouseListAnonClass.java");
90-
assertEquals(1, classProc.getAllListenerMethods().size());
91-
assertEquals(1, classProc.getAllListenerMethods().keySet().size());
92-
assertEquals(5, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
89+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(1);
90+
assertThat(classProc.getAllListenerMethods().keySet().size()).isEqualTo(1);
91+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(5);
9392
}
9493

9594
@Test
9695
public void testSwingMouseListernerAsClassWithInheritance() {
9796
run("src/test/resources/java/listeners/MouseListAnonClassWithInheritance.java");
98-
assertEquals(2, classProc.getAllListenerMethods().size());
99-
assertEquals(2, classProc.getAllListenerMethods().keySet().size());
100-
assertEquals(6, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
97+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(2);
98+
assertThat(classProc.getAllListenerMethods().keySet().size()).isEqualTo(2);
99+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(6);
101100
}
102101

103102
@Test
104103
public void testSwingMouseListernerAsAnonClassWithInheritance() {
105104
run("src/test/resources/java/listeners/MouseListClassInheritance.java");
106-
assertEquals(2, classProc.getAllListenerMethods().size());
107-
assertEquals(2, classProc.getAllListenerMethods().keySet().size());
108-
assertEquals(6, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
105+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(2);
106+
assertThat(classProc.getAllListenerMethods().keySet().size()).isEqualTo(2);
107+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(6);
109108
}
110109

111110
@Test
112111
public void testSwingMouseListernerTwoSameClasses() {
113112
run("src/test/resources/java/listeners/MouseListTwoSameClasses.java");
114-
assertEquals(2, classProc.getAllListenerMethods().size());
115-
assertEquals(2, classProc.getAllListenerMethods().keySet().size());
116-
assertEquals(10, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
113+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(2);
114+
assertThat(classProc.getAllListenerMethods().keySet().size()).isEqualTo(2);
115+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(10);
117116
}
118117

119118
@Test
120119
public void testActionListenerClassEmpty() {
121120
run("src/test/resources/java/analysers/ActionListenerEmptyClass.java");
122-
assertEquals(1, classProc.getAllListenerMethods().size());
123-
assertEquals(1, classProc.getAllListenerMethods().keySet().size());
124-
assertEquals(1, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
121+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(1);
122+
assertThat(classProc.getAllListenerMethods().keySet().size()).isEqualTo(1);
123+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(1);
125124
}
126125

127126
@Test
128127
public void testMouseListClassInheritanceAbsract() {
129128
run("src/test/resources/java/listeners/MouseListClassInheritanceAbsract.java");
130-
assertEquals(2, classProc.getAllListenerMethods().size());
131-
assertEquals(5, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
129+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(2);
130+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(5);
132131
}
133132

134133
@Test
135134
public void testAbstractActionNotAListener() {
136135
run("src/test/resources/java/listeners/AbstractAction.java");
137-
assertEquals(0, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
138-
assertEquals(0, classProc.getAllListenerMethods().size());
136+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(0);
137+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(0);
139138
}
140139

141140
@Test
142141
public void testAWTDragListener() {
143142
run("src/test/resources/java/listeners/AWTDragListener.java");
144-
assertEquals(4, classProc.getAllListenerMethods().size());
145-
assertEquals(12, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
143+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(4);
144+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(12);
146145
}
147146

148147
@Test
149148
public void testClassWithMultipleListeners() {
150149
run("src/test/resources/java/listeners/MultipleListener.java");
151-
assertEquals(1, classProc.getAllListenerMethods().size());
152-
assertEquals(2L, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
150+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(1);
151+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(2L);
153152
}
154153

155154
@Test
156155
public void testSWTEventHandlerClass() {
157156
runWithCP(Collections.singletonList(SWT_LIB), "src/test/resources/java/listeners/SWTEventHandlerClass.java");
158-
assertEquals(1, classProc.getAllListenerMethods().size());
159-
assertEquals(1L, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
157+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(1);
158+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(1L);
160159
}
161160

162161
@Test
163162
public void testSWTEventHandlerLambda() {
164163
runWithCP(Collections.singletonList(SWT_LIB), "src/test/resources/java/listeners/SWTEventHandlerLambda.java");
165-
assertEquals(1, lambdaProc.getAllListenerLambdas().size());
166-
assertEquals(0, classProc.getAllListenerMethods().size());
164+
assertThat(lambdaProc.getAllListenerLambdas().size()).isEqualTo(1);
165+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(0);
167166
}
168167

169168

170169
@Test
171170
public void testSWTAdapterClass() {
172171
runWithCP(Collections.singletonList(SWT_LIB), "src/test/resources/java/listeners/SWTAdapterClass.java");
173-
assertEquals(1, classProc.getAllListenerMethods().size());
174-
assertEquals(1L, classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum());
172+
assertThat(classProc.getAllListenerMethods().size()).isEqualTo(1);
173+
assertThat(classProc.getAllListenerMethods().values().stream().mapToLong(c -> c.size()).sum()).isEqualTo(1L);
175174
}
176175
}

0 commit comments

Comments
 (0)