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 junit to v4.13 (#607) #609

Merged
merged 2 commits into from
Oct 6, 2020
Merged

Update junit to v4.13 (#607) #609

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
ee38b70
Update junit to v4.13
FObermaier Oct 5, 2020
2d3e9e8
Fix deprecation warnings for junit.framework.Assert
FObermaier Oct 6, 2020
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
2 changes: 1 addition & 1 deletion modules/core/src/test/java/org/locationtech/jts/io/kml/KMLReaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@

package org.locationtech.jts.io.kml;

import junit.framework.Assert;
import junit.framework.TestCase;
import junit.textui.TestRunner;
import org.junit.Assert;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryFactory;
import org.locationtech.jts.geom.PrecisionModel;
Expand Down
8 changes: 4 additions & 4 deletions modules/core/src/test/java/org/locationtech/jts/operation/buffer/BufferValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import java.util.Iterator;
import java.util.Map;

import org.junit.Assert;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.geom.GeometryCollection;
import org.locationtech.jts.geom.GeometryFactory;
Expand All @@ -29,16 +30,15 @@
import org.locationtech.jts.operation.buffer.validate.BufferResultValidator;
import org.locationtech.jts.util.StringUtil;

import junit.framework.Assert;


/**
* @version 1.7
*/
public class BufferValidator
public class BufferValidator
{


public static void main(String[] args) throws Exception {
Geometry g =
new WKTReader().read(
Expand Down Expand Up @@ -255,7 +255,7 @@ public void test() throws Exception {
if (getOriginal().getClass() == GeometryCollection.class) {
return;
}

Assert.assertTrue(
supplement("BufferResultValidator failure"),
BufferResultValidator.isValid(getOriginal(), bufferDistance, getBuffer()));
Expand Down
5 changes: 2 additions & 3 deletions modules/core/src/test/java/org/locationtech/jts/simplify/GeometryOperationValidator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@

package org.locationtech.jts.simplify;

import org.junit.Assert;
import org.locationtech.jts.geom.Geometry;
import org.locationtech.jts.io.WKTReader;

import junit.framework.Assert;


/**
* Runs various validation tests on a the results of a geometry operation
Expand Down Expand Up @@ -59,7 +58,7 @@ public boolean isAllTestsPassed()
* Tests if the result is valid.
* Throws an exception if result is not valid.
* This allows chaining multiple tests together.
*
*
* @throws Exception if the result is not valid.
*/
public void test()
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit-version>3.7</junit-version>
<junit-version>4.13</junit-version>
<jdom-version>2.0.6</jdom-version>
<jump.version>1.2</jump.version>
<json-simple-version>1.1.1</json-simple-version>
Expand Down