Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update unit test dependencies (Junit Vintage) #75

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update unit test dependencies (Junit Vintage) #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d499b57
Update unit test dependencies (Junit Vintage)
SingingBush Nov 13, 2023
62897b4
update junit to 5.10.2
SingingBush Feb 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions fop-core/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,18 +139,25 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit4.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>

<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
<version>2.28.2</version>
<version>4.11.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>xmlunit</groupId>
<artifactId>xmlunit</artifactId>
<groupId>org.xmlunit</groupId>
<artifactId>xmlunit-legacy</artifactId>
<version>${xmlunit.version}</version>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 3 additions & 3 deletions fop-core/src/test/java/org/apache/fop/render/intermediate/BorderPainterTestCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.verifyNoInteractions;

import org.apache.fop.fo.Constants;
import org.apache.fop.traits.BorderProps;
Expand Down Expand Up @@ -96,7 +96,7 @@ public void testDrawRectangularBordersWithNullBorders() throws IOException, IFEx
BorderProps nullBorderProps = null;
new BorderPainter(graphicsPainter).drawRectangularBorders(new Rectangle(0, 0, 1000, 1000),
nullBorderProps, nullBorderProps, nullBorderProps, nullBorderProps);
verifyZeroInteractions(graphicsPainter);
verifyNoInteractions(graphicsPainter);
}

@Test
Expand All @@ -119,7 +119,7 @@ public void testDrawRoundedBordersWithNullBorders() throws IOException, IFExcept
BorderProps nullBorderProps = null;
new BorderPainter(graphicsPainter).drawRoundedBorders(new Rectangle(0, 0, 1000, 1000),
nullBorderProps, nullBorderProps, nullBorderProps, nullBorderProps);
verifyZeroInteractions(graphicsPainter);
verifyNoInteractions(graphicsPainter);
}

@Test
Expand Down
6 changes: 6 additions & 0 deletions fop-events/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,12 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit4.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 6 additions & 0 deletions fop-sandbox/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit4.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 6 additions & 0 deletions fop-transcoder-allinone/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,12 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit4.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 6 additions & 0 deletions fop-transcoder/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit4.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 6 additions & 0 deletions fop-util/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit4.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
Expand Down
6 changes: 6 additions & 0 deletions fop/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>${junit4.version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<version>${junit.version}</version>
<scope>test</scope>
</dependency>
Expand Down
7 changes: 4 additions & 3 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,16 @@
<findbugs.plugin.version>4.2.3</findbugs.plugin.version>
<jar.plugin.version>3.1.1</jar.plugin.version>
<java.version>8</java.version>
<junit.version>4.11</junit.version>
<junit4.version>4.13.2</junit4.version>
<junit.version>5.10.2</junit.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.info.reports.plugin.version>2.8</project.info.reports.plugin.version>
<release.plugin.version>2.5.2</release.plugin.version>
<surefire.plugin.version>2.18.1</surefire.plugin.version>
<surefire.plugin.version>3.2.5</surefire.plugin.version>
<war.plugin.version>3.3.2</war.plugin.version>
<xml.plugin.version>1.0.1</xml.plugin.version>
<xmlgraphics.commons.version>2.9.0-SNAPSHOT</xmlgraphics.commons.version>
<xmlunit.version>1.2</xmlunit.version>
<xmlunit.version>2.9.1</xmlunit.version>
<jdk.path>${env.JAVA_HOME}</jdk.path>
</properties>

Expand Down