From 64c62842a73afb060257281cb19ab4e1069e4027 Mon Sep 17 00:00:00 2001 From: Luc Maisonobe <luc@orekit.org> Date: Tue, 20 Sep 2016 21:14:57 +0200 Subject: [PATCH] Fixed tests that failed in some maven configurations. --- src/test/java/org/orekit/rugged/api/RuggedTest.java | 8 ++++---- .../org/orekit/rugged/errors/DumpReplayerTest.java | 11 +++++++---- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/test/java/org/orekit/rugged/api/RuggedTest.java b/src/test/java/org/orekit/rugged/api/RuggedTest.java index 3678d55c..d10e035b 100644 --- a/src/test/java/org/orekit/rugged/api/RuggedTest.java +++ b/src/test/java/org/orekit/rugged/api/RuggedTest.java @@ -1051,28 +1051,28 @@ public class RuggedTest { public void testInverseLocationDerivativesWithoutCorrections() throws RuggedException, OrekitException { doTestInverseLocationDerivatives(2000, false, false, - 7.0e-9, 4.0e-11, 2.0e-12, 7.0e-8); + 8.0e-9, 3.0e-10, 2.0e-12, 9.0e-8); } @Test public void testInverseLocationDerivativesWithLightTimeCorrection() throws RuggedException, OrekitException { doTestInverseLocationDerivatives(2000, true, false, - 3.0e-9, 9.0e-9, 3.0e-13, 7.0e-8); + 3.0e-9, 9.0e-9, 7.0e-13, 9.0e-8); } @Test public void testInverseLocationDerivativesWithAberrationOfLightCorrection() throws RuggedException, OrekitException { doTestInverseLocationDerivatives(2000, false, true, - 3.0e-10, 3.0e-10, 7.0e-13, 7.0e-8); + 3.0e-10, 3.0e-10, 2.0e-12, 7.0e-8); } @Test public void testInverseLocationDerivativesWithAllCorrections() throws RuggedException, OrekitException { doTestInverseLocationDerivatives(2000, true, true, - 3.0e-10, 5.0e-10, 7.0e-14, 7.0e-8); + 3.0e-10, 5.0e-10, 8.0e-13, 7.0e-8); } private void doTestInverseLocationDerivatives(int dimension, diff --git a/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java b/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java index 426e84b9..aafa39e9 100644 --- a/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java +++ b/src/test/java/org/orekit/rugged/errors/DumpReplayerTest.java @@ -19,8 +19,10 @@ package org.orekit.rugged.errors; import java.io.BufferedReader; import java.io.File; +import java.io.FileInputStream; import java.io.FileReader; import java.io.IOException; +import java.io.InputStreamReader; import java.io.PrintWriter; import java.net.URISyntaxException; import java.util.ArrayList; @@ -220,8 +222,9 @@ public class DumpReplayerTest { // split all data lines into fields final List<String[]> lines = new ArrayList<>(); - try (FileReader fr = new FileReader(file); - BufferedReader br = new BufferedReader(fr)) { + try (FileInputStream fis = new FileInputStream(file); + InputStreamReader isr = new InputStreamReader(fis, "UTF-8"); + BufferedReader br = new BufferedReader(isr)) { br.lines(). filter(line -> { String trimmed = line.trim(); @@ -233,8 +236,8 @@ public class DumpReplayerTest { // for each field of each line, delete the field and check parsing fails for (int i = 0; i < lines.size(); ++i) { for (int j = 0; j < lines.get(i).length; ++j) { - File corrupted = tempFolder.newFile(); - try (PrintWriter pw = new PrintWriter(corrupted)) { + final File corrupted = tempFolder.newFile(); + try (PrintWriter pw = new PrintWriter(corrupted, "UTF-8")) { for (int k = 0; k < lines.size(); ++k) { for (int l = 0; l < lines.get(k).length; ++l) { if (k != i || l != j) { -- GitLab