Merge pull request #2998 from matsim-org/remove-junit4-from-freight

freight: stop transitively depending on junit 4
matsim-org · Dec 17, 2023 · 845c662 · 845c662
2 parents 47859fe + 7dd42ca
commit 845c662
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/contribs/freight/pom.xml b/contribs/freight/pom.xml
@@ -44,6 +44,12 @@
 			<groupId>com.graphhopper</groupId>
 			<artifactId>jsprit-analysis</artifactId>
 			<version>${jsprit.version}</version>
+			<exclusions>
+				<exclusion>
+					<groupId>junit</groupId>
+					<artifactId>junit</artifactId>
+				</exclusion>
+			</exclusions>
 		</dependency>
 
 		<dependency>

diff --git a/contribs/freight/src/test/java/org/matsim/freight/carriers/jsprit/MatsimTransformerTest.java b/contribs/freight/src/test/java/org/matsim/freight/carriers/jsprit/MatsimTransformerTest.java
@@ -48,9 +48,6 @@
 import java.util.Collection;
 import java.util.List;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.not;
-import static org.hamcrest.MatcherAssert.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
 
 public class MatsimTransformerTest {
@@ -78,7 +75,7 @@ void whenTransforming_jSpritType2matsimType_withCaching_itIsNotCached() {
 				.newInstance("myType").addCapacityDimension(0, 50).setCostPerDistance(10.0).setCostPerTransportTime(5.0)
 				.setFixedCost(100.0).build();
 		VehicleType matsimType = MatsimJspritFactory.createMatsimVehicleType(jspritType);
-		assertThat(matsimType, is(not(MatsimJspritFactory.createMatsimVehicleType(jspritType))));
+		assertNotEquals(matsimType, MatsimJspritFactory.createMatsimVehicleType(jspritType));
 	}
 
 	@Test