From 445203682136c1286fd82d1d798f623071a72ce4 Mon Sep 17 00:00:00 2001
From: Richard Schmidt <richard.schmidt@mailbox.tu-dresden.de>
Date: Tue, 27 Aug 2019 14:50:16 +0200
Subject: [PATCH] Handle exceptions in csv parser tests
---
.../mci/brailleplot/csvparser/CsvDotParserTest.java | 4 ++--
.../csvparser/CsvXAlignedCategoriesParserTest.java | 4 ++--
.../brailleplot/csvparser/CsvXAlignedParserTest.java | 4 ++--
.../inf/mci/brailleplot/point/Point2DValuedTest.java | 12 ++++++------
4 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/test/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvDotParserTest.java b/src/test/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvDotParserTest.java
index 2dc48aaf..f3e52e41 100644
--- a/src/test/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvDotParserTest.java
+++ b/src/test/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvDotParserTest.java
@@ -21,14 +21,14 @@ public class CsvDotParserTest {
public static CsvParser parser;
@BeforeAll
- public static void initialize() {
+ public static void initialize() throws Exception {
ClassLoader classloader = Thread.currentThread().getContextClassLoader();
InputStream csvStream = classloader.getResourceAsStream("examples/csv/1_scatter_plot.csv");
Reader csvReader = new BufferedReader(new InputStreamReader(csvStream));
try {
parser = new CsvParser(csvReader, ',', '\"');
} catch (Exception e) {
-
+ throw new Exception();
}
}
diff --git a/src/test/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvXAlignedCategoriesParserTest.java b/src/test/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvXAlignedCategoriesParserTest.java
index d7826481..d25fe8fc 100644
--- a/src/test/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvXAlignedCategoriesParserTest.java
+++ b/src/test/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvXAlignedCategoriesParserTest.java
@@ -21,14 +21,14 @@ public class CsvXAlignedCategoriesParserTest {
public static CsvParser parser;
@BeforeAll
- public static void initialize() {
+ public static void initialize() throws Exception {
ClassLoader classloader = Thread.currentThread().getContextClassLoader();
InputStream csvStream = classloader.getResourceAsStream("examples/csv/0_bar_chart_categorical.csv");
Reader csvReader = new BufferedReader(new InputStreamReader(csvStream));
try {
parser = new CsvParser(csvReader, ',', '\"');
} catch (Exception e) {
-
+ throw new Exception();
}
}
diff --git a/src/test/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvXAlignedParserTest.java b/src/test/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvXAlignedParserTest.java
index c40e13a3..065964d2 100644
--- a/src/test/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvXAlignedParserTest.java
+++ b/src/test/java/de/tudresden/inf/mci/brailleplot/csvparser/CsvXAlignedParserTest.java
@@ -21,14 +21,14 @@ public class CsvXAlignedParserTest {
public static CsvParser parser;
@BeforeAll
- public static void initialize() {
+ public static void initialize() throws Exception {
ClassLoader classloader = Thread.currentThread().getContextClassLoader();
InputStream csvStream = classloader.getResourceAsStream("examples/csv/0_bar_chart.csv");
Reader csvReader = new BufferedReader(new InputStreamReader(csvStream));
try {
parser = new CsvParser(csvReader, ',', '\"');
} catch (Exception e) {
-
+ throw new Exception();
}
}
diff --git a/src/test/java/de/tudresden/inf/mci/brailleplot/point/Point2DValuedTest.java b/src/test/java/de/tudresden/inf/mci/brailleplot/point/Point2DValuedTest.java
index 8d257f28..f9070797 100644
--- a/src/test/java/de/tudresden/inf/mci/brailleplot/point/Point2DValuedTest.java
+++ b/src/test/java/de/tudresden/inf/mci/brailleplot/point/Point2DValuedTest.java
@@ -16,17 +16,17 @@ public class Point2DValuedTest {
Assertions.assertThrows(NullPointerException.class, () -> {new Point2DValued(a, b, null);});
- Point2DValued point = new Point2DValued(a, b, value);
+ Point2DValued<Integer, Integer> point = new Point2DValued(a, b, value);
Assertions.assertEquals(value, point.getVal());
}
@Test
public void testEquals () {
- Point2DValued point_1 = new Point2DValued(1, 2, 3);
- Point2DValued point_2 = new Point2DValued(1, 2, 3);
- Point2DValued point_3 = new Point2DValued(2, 2, 3);
- Point2DValued point_4 = new Point2DValued(1, 1, 3);
- Point2DValued point_5 = new Point2DValued(1, 2, 2);
+ Point2DValued<Integer, Integer> point_1 = new Point2DValued(1, 2, 3);
+ Point2DValued<Integer, Integer> point_2 = new Point2DValued(1, 2, 3);
+ Point2DValued<Integer, Integer> point_3 = new Point2DValued(2, 2, 3);
+ Point2DValued<Integer, Integer> point_4 = new Point2DValued(1, 1, 3);
+ Point2DValued<Integer, Integer> point_5 = new Point2DValued(1, 2, 2);
String string = "test";
Assertions.assertEquals(true, point_1.equals(point_2));
--
GitLab