From 638866568f93ec7f2da685aaca01eeda70da791c Mon Sep 17 00:00:00 2001
From: Nikolaus Krismer <niko@krismer.de>
Date: Fri, 7 Feb 2014 14:41:47 +0100
Subject: [PATCH] changes to match package renamings fixing some checkstyle
warnings
---
.../unibz/inf/isochrones/db/DatabaseTest.java | 13 +++----
.../network/IsochroneComparisonTest.java | 20 ++++++-----
.../inf/isochrones/network/MineXTest.java | 16 ++++-----
.../inf/isochrones/network/MrneXTest.java | 16 ++++-----
.../inf/isochrones/network/QueryTest.java | 8 ++---
.../inf/isochrones/tests/Parameters.java | 6 ++--
.../unibz/inf/isochrones/tests/RunSimple.java | 13 +++----
.../inf/isochrones/tests/RuntimeTest.java | 34 +++++++------------
.../inf/isochrones/utils/ConfigTest.java | 2 ++
9 files changed, 61 insertions(+), 67 deletions(-)
diff --git a/src/test/java/it/unibz/inf/isochrones/db/DatabaseTest.java b/src/test/java/it/unibz/inf/isochrones/db/DatabaseTest.java
index 3c639f40..e15b6819 100644
--- a/src/test/java/it/unibz/inf/isochrones/db/DatabaseTest.java
+++ b/src/test/java/it/unibz/inf/isochrones/db/DatabaseTest.java
@@ -1,10 +1,11 @@
package it.unibz.inf.isochrones.db;
-import it.unibz.inf.isochrones.network.Link;
-import it.unibz.inf.isochrones.network.Node;
-import it.unibz.inf.isochrones.utils.Enums.Dataset;
-import it.unibz.inf.isochrones.utils.Enums.Direction;
-import it.unibz.inf.isochrones.utils.Enums.Mode;
+import it.unibz.inf.isochrone.db.Database;
+import it.unibz.inf.isochrone.network.Link;
+import it.unibz.inf.isochrone.network.Node;
+import it.unibz.inf.isochrone.util.Enums.Dataset;
+import it.unibz.inf.isochrone.util.Enums.Direction;
+import it.unibz.inf.isochrone.util.Enums.Mode;
import java.util.ArrayList;
import java.util.HashMap;
@@ -64,7 +65,7 @@ public class DatabaseTest {
final Link l1 = new Link(LINK_ID, 5172, 885, 15);
final List<Link> ll1 = new ArrayList<Link>();
- n1.initAdjLinks(ll1);
+ n1.setAdjLinks(ll1);
n1.addAdjLink(l1);
nodeHashMap.put(NODE_ID, n1);
diff --git a/src/test/java/it/unibz/inf/isochrones/network/IsochroneComparisonTest.java b/src/test/java/it/unibz/inf/isochrones/network/IsochroneComparisonTest.java
index 26a1b200..6f917bb2 100644
--- a/src/test/java/it/unibz/inf/isochrones/network/IsochroneComparisonTest.java
+++ b/src/test/java/it/unibz/inf/isochrones/network/IsochroneComparisonTest.java
@@ -1,18 +1,20 @@
package it.unibz.inf.isochrones.network;
-import it.unibz.inf.isochrones.algorithm.Isochrone;
-import it.unibz.inf.isochrones.algorithm.MDijkstra;
-import it.unibz.inf.isochrones.algorithm.MineX;
-import it.unibz.inf.isochrones.algorithm.MrneX;
-import it.unibz.inf.isochrones.utils.Enums.Dataset;
-import it.unibz.inf.isochrones.utils.Enums.Direction;
-import it.unibz.inf.isochrones.utils.Enums.Mode;
-import it.unibz.inf.isochrones.utils.Query;
+import it.unibz.inf.isochrone.algorithm.Isochrone;
+import it.unibz.inf.isochrone.algorithm.MDijkstra;
+import it.unibz.inf.isochrone.algorithm.MineX;
+import it.unibz.inf.isochrone.algorithm.MrneX;
+import it.unibz.inf.isochrone.network.MemoryOutput;
+import it.unibz.inf.isochrone.util.Enums.Dataset;
+import it.unibz.inf.isochrone.util.Enums.Direction;
+import it.unibz.inf.isochrone.util.Enums.Mode;
+import it.unibz.inf.isochrone.util.Query;
import java.util.GregorianCalendar;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
public class IsochroneComparisonTest {
private static final Double WALKING_SPEED = 1.0;
@@ -31,7 +33,7 @@ public class IsochroneComparisonTest {
mrnex = new MrneX(query, MAX_MEMORY_SIZE);
}
- @org.testng.annotations.Test
+ @Test
public void testCalculation() {
final MemoryOutput omdijkstra = new MemoryOutput();
final MemoryOutput ominex = new MemoryOutput();
diff --git a/src/test/java/it/unibz/inf/isochrones/network/MineXTest.java b/src/test/java/it/unibz/inf/isochrones/network/MineXTest.java
index f79a458b..38081ebe 100644
--- a/src/test/java/it/unibz/inf/isochrones/network/MineXTest.java
+++ b/src/test/java/it/unibz/inf/isochrones/network/MineXTest.java
@@ -1,11 +1,12 @@
package it.unibz.inf.isochrones.network;
-import it.unibz.inf.isochrones.algorithm.Isochrone;
-import it.unibz.inf.isochrones.algorithm.MineX;
-import it.unibz.inf.isochrones.utils.Enums.Dataset;
-import it.unibz.inf.isochrones.utils.Enums.Direction;
-import it.unibz.inf.isochrones.utils.Enums.Mode;
-import it.unibz.inf.isochrones.utils.Query;
+import it.unibz.inf.isochrone.algorithm.Isochrone;
+import it.unibz.inf.isochrone.algorithm.MineX;
+import it.unibz.inf.isochrone.network.MemoryOutput;
+import it.unibz.inf.isochrone.util.Enums.Dataset;
+import it.unibz.inf.isochrone.util.Enums.Direction;
+import it.unibz.inf.isochrone.util.Enums.Mode;
+import it.unibz.inf.isochrone.util.Query;
import java.util.GregorianCalendar;
@@ -27,8 +28,7 @@ public class MineXTest {
@Test
public void testCompute() {
- final Output output = new MemoryOutput();
- minex.compute(output);
+ minex.compute(new MemoryOutput());
}
}
diff --git a/src/test/java/it/unibz/inf/isochrones/network/MrneXTest.java b/src/test/java/it/unibz/inf/isochrones/network/MrneXTest.java
index f1cb534d..fad32fa4 100644
--- a/src/test/java/it/unibz/inf/isochrones/network/MrneXTest.java
+++ b/src/test/java/it/unibz/inf/isochrones/network/MrneXTest.java
@@ -1,11 +1,12 @@
package it.unibz.inf.isochrones.network;
-import it.unibz.inf.isochrones.algorithm.Isochrone;
-import it.unibz.inf.isochrones.algorithm.MrneX;
-import it.unibz.inf.isochrones.utils.Enums.Dataset;
-import it.unibz.inf.isochrones.utils.Enums.Direction;
-import it.unibz.inf.isochrones.utils.Enums.Mode;
-import it.unibz.inf.isochrones.utils.Query;
+import it.unibz.inf.isochrone.algorithm.Isochrone;
+import it.unibz.inf.isochrone.algorithm.MrneX;
+import it.unibz.inf.isochrone.network.MemoryOutput;
+import it.unibz.inf.isochrone.util.Enums.Dataset;
+import it.unibz.inf.isochrone.util.Enums.Direction;
+import it.unibz.inf.isochrone.util.Enums.Mode;
+import it.unibz.inf.isochrone.util.Query;
import java.util.GregorianCalendar;
@@ -28,8 +29,7 @@ public class MrneXTest {
@Test
public void testCompute() {
- final Output output = new MemoryOutput();
- mrnex.compute(output);
+ mrnex.compute(new MemoryOutput());
}
}
diff --git a/src/test/java/it/unibz/inf/isochrones/network/QueryTest.java b/src/test/java/it/unibz/inf/isochrones/network/QueryTest.java
index 9773a586..560dc08f 100644
--- a/src/test/java/it/unibz/inf/isochrones/network/QueryTest.java
+++ b/src/test/java/it/unibz/inf/isochrones/network/QueryTest.java
@@ -1,9 +1,9 @@
package it.unibz.inf.isochrones.network;
-import it.unibz.inf.isochrones.utils.Enums.Dataset;
-import it.unibz.inf.isochrones.utils.Enums.Direction;
-import it.unibz.inf.isochrones.utils.Enums.Mode;
-import it.unibz.inf.isochrones.utils.Query;
+import it.unibz.inf.isochrone.util.Query;
+import it.unibz.inf.isochrone.util.Enums.Dataset;
+import it.unibz.inf.isochrone.util.Enums.Direction;
+import it.unibz.inf.isochrone.util.Enums.Mode;
import java.util.Arrays;
import java.util.GregorianCalendar;
diff --git a/src/test/java/it/unibz/inf/isochrones/tests/Parameters.java b/src/test/java/it/unibz/inf/isochrones/tests/Parameters.java
index 66aca11b..9eb0e7d4 100644
--- a/src/test/java/it/unibz/inf/isochrones/tests/Parameters.java
+++ b/src/test/java/it/unibz/inf/isochrones/tests/Parameters.java
@@ -1,8 +1,8 @@
package it.unibz.inf.isochrones.tests;
-import it.unibz.inf.isochrones.utils.Enums.Dataset;
-import it.unibz.inf.isochrones.utils.Enums.Direction;
-import it.unibz.inf.isochrones.utils.Enums.Mode;
+import it.unibz.inf.isochrone.util.Enums.Dataset;
+import it.unibz.inf.isochrone.util.Enums.Direction;
+import it.unibz.inf.isochrone.util.Enums.Mode;
import java.util.Calendar;
import java.util.GregorianCalendar;
diff --git a/src/test/java/it/unibz/inf/isochrones/tests/RunSimple.java b/src/test/java/it/unibz/inf/isochrones/tests/RunSimple.java
index 10b7008d..26196560 100644
--- a/src/test/java/it/unibz/inf/isochrones/tests/RunSimple.java
+++ b/src/test/java/it/unibz/inf/isochrones/tests/RunSimple.java
@@ -1,10 +1,9 @@
package it.unibz.inf.isochrones.tests;
-import it.unibz.inf.isochrones.algorithm.Isochrone;
-import it.unibz.inf.isochrones.algorithm.MrneX;
-import it.unibz.inf.isochrones.network.MemoryOutput;
-import it.unibz.inf.isochrones.network.Output;
-import it.unibz.inf.isochrones.utils.Query;
+import it.unibz.inf.isochrone.algorithm.Isochrone;
+import it.unibz.inf.isochrone.algorithm.MrneX;
+import it.unibz.inf.isochrone.network.MemoryOutput;
+import it.unibz.inf.isochrone.util.Query;
import java.util.Calendar;
@@ -31,9 +30,7 @@ public final class RunSimple {
// final Isochrone iso = new MineX(query);
// final Isochrone iso = new MDijkstra(query);
final Isochrone iso = new MrneX(query, Integer.MAX_VALUE);
-
- final Output o = new MemoryOutput();
- iso.compute(o);
+ iso.compute(new MemoryOutput());
final long runTime = Calendar.getInstance().getTimeInMillis() - startTime;
System.out.println("Total running time: " + runTime + " ms");
diff --git a/src/test/java/it/unibz/inf/isochrones/tests/RuntimeTest.java b/src/test/java/it/unibz/inf/isochrones/tests/RuntimeTest.java
index e033a550..73ac4fb7 100644
--- a/src/test/java/it/unibz/inf/isochrones/tests/RuntimeTest.java
+++ b/src/test/java/it/unibz/inf/isochrones/tests/RuntimeTest.java
@@ -1,15 +1,14 @@
package it.unibz.inf.isochrones.tests;
-import it.unibz.inf.isochrones.algorithm.Isochrone;
-import it.unibz.inf.isochrones.algorithm.MDijkstra;
-import it.unibz.inf.isochrones.algorithm.MineX;
-import it.unibz.inf.isochrones.algorithm.MrneX;
-import it.unibz.inf.isochrones.network.MemoryOutput;
-import it.unibz.inf.isochrones.network.Output;
-import it.unibz.inf.isochrones.utils.Enums.Dataset;
-import it.unibz.inf.isochrones.utils.Enums.Direction;
-import it.unibz.inf.isochrones.utils.Enums.Mode;
-import it.unibz.inf.isochrones.utils.Query;
+import it.unibz.inf.isochrone.algorithm.Isochrone;
+import it.unibz.inf.isochrone.algorithm.MDijkstra;
+import it.unibz.inf.isochrone.algorithm.MineX;
+import it.unibz.inf.isochrone.algorithm.MrneX;
+import it.unibz.inf.isochrone.network.MemoryOutput;
+import it.unibz.inf.isochrone.util.Enums.Dataset;
+import it.unibz.inf.isochrone.util.Enums.Direction;
+import it.unibz.inf.isochrone.util.Enums.Mode;
+import it.unibz.inf.isochrone.util.Query;
import java.util.ArrayList;
import java.util.Calendar;
@@ -29,9 +28,8 @@ import org.testng.annotations.Test;
* time of 5 runs for each different algorithm and isochrone is
* stored, to account for changed test conditions.
*/
+// TODO: refactor test!
public final class RuntimeTest {
-
- // TODO: Refactor !!!
private static Isochrone mdijkstra, minex, mrnex;
private static final int REPEAT_COUNT = 5;
@@ -150,9 +148,7 @@ public final class RuntimeTest {
query.setNodes(params.getNodeId());
mdijkstra = new MDijkstra(query);
-
- final Output o = new MemoryOutput();
- mdijkstra.compute(o);
+ mdijkstra.compute(new MemoryOutput());
}
private static void runMineX(final Parameters params, final boolean expire) {
@@ -161,9 +157,7 @@ public final class RuntimeTest {
query.setNodes(params.getNodeId());
minex = new MineX(query);
-
- final Output o = new MemoryOutput();
- minex.compute(o);
+ minex.compute(new MemoryOutput());
}
private static void runMrneX(final Parameters params, final boolean expire) {
@@ -172,9 +166,7 @@ public final class RuntimeTest {
query.setNodes(params.getNodeId());
mrnex = new MrneX(query, Integer.MAX_VALUE);
-
- final Output o = new MemoryOutput();
- mrnex.compute(o);
+ mrnex.compute(new MemoryOutput());
}
private static void processResults(final Map<String, List<Long>> results, final Parameters params) {
diff --git a/src/test/java/it/unibz/inf/isochrones/utils/ConfigTest.java b/src/test/java/it/unibz/inf/isochrones/utils/ConfigTest.java
index 1c543f35..59cc719f 100644
--- a/src/test/java/it/unibz/inf/isochrones/utils/ConfigTest.java
+++ b/src/test/java/it/unibz/inf/isochrones/utils/ConfigTest.java
@@ -1,5 +1,7 @@
package it.unibz.inf.isochrones.utils;
+import it.unibz.inf.isochrone.util.Config;
+
import org.testng.Assert;
import org.testng.annotations.Test;
--
GitLab