From 4829a75785d65afff37c292b8b5d4dc597cd90a8 Mon Sep 17 00:00:00 2001
From: graywolf336 <graywolf336@craftyn.com>
Date: Tue, 22 Jul 2014 21:39:26 -0500
Subject: [PATCH] Move the time parsing tests into the util tests, as that's
 what it really is testing.

---
 .../com/graywolf336/jail/TestTimeParsing.java | 43 -------------------
 .../com/graywolf336/jail/TestUtilClass.java   | 32 ++++++++++++++
 2 files changed, 32 insertions(+), 43 deletions(-)
 delete mode 100644 src/test/java/test/java/com/graywolf336/jail/TestTimeParsing.java

diff --git a/src/test/java/test/java/com/graywolf336/jail/TestTimeParsing.java b/src/test/java/test/java/com/graywolf336/jail/TestTimeParsing.java
deleted file mode 100644
index 410a25f..0000000
--- a/src/test/java/test/java/com/graywolf336/jail/TestTimeParsing.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package test.java.com.graywolf336.jail;
-
-import static org.junit.Assert.*;
-import static org.hamcrest.CoreMatchers.is;
-
-import org.junit.Test;
-
-import com.graywolf336.jail.Util;
-
-public class TestTimeParsing {
-	
-	@Test
-	public void testNoFormat() throws Exception {
-		assertThat(60000L, is(Util.getTime("1")));
-		assertThat(360000L, is(Util.getTime("6")));
-	}
-	
-	@Test
-	public void testSeconds() throws Exception {
-		assertThat(2000L, is(Util.getTime("2s")));
-		assertThat(2000L, is(Util.getTime("2second")));
-		assertThat(2000L, is(Util.getTime("2seconds")));
-	}
-	
-	@Test
-	public void testMinutes() throws Exception {
-		assertThat(60000L, is(Util.getTime("1m")));
-		assertThat(60000L, is(Util.getTime("1minute")));
-		assertThat(60000L, is(Util.getTime("1minutes")));
-	}
-	
-	@Test
-	public void testHours() throws Exception {
-		assertThat(3600000L, is(Util.getTime("1h")));
-		assertThat(3600000L, is(Util.getTime("1hours")));
-	}
-	
-	@Test
-	public void testDays() throws Exception {
-		assertThat(86400000L, is(Util.getTime("1d")));
-		assertThat(86400000L, is(Util.getTime("1days")));
-	}
-}
diff --git a/src/test/java/test/java/com/graywolf336/jail/TestUtilClass.java b/src/test/java/test/java/com/graywolf336/jail/TestUtilClass.java
index f6786e4..6805b0c 100644
--- a/src/test/java/test/java/com/graywolf336/jail/TestUtilClass.java
+++ b/src/test/java/test/java/com/graywolf336/jail/TestUtilClass.java
@@ -66,4 +66,36 @@ public class TestUtilClass {
 		assertFalse(Util.isStringInsideList(list, "SAND"));
 		assertFalse(Util.isStringInsideList(list, Material.BEDROCK.toString()));
 	}
+	
+	@Test
+	public void testNoFormat() throws Exception {
+		assertEquals(60000L, Util.getTime("1"), 0);
+		assertEquals(360000L, Util.getTime("6"), 0);
+	}
+	
+	@Test
+	public void testSeconds() throws Exception {
+		assertEquals(2000L, Util.getTime("2s"), 0);
+		assertEquals(2000L, Util.getTime("2second"), 0);
+		assertEquals(2000L, Util.getTime("2seconds"), 0);
+	}
+	
+	@Test
+	public void testMinutes() throws Exception {
+		assertEquals(60000L, Util.getTime("1m"), 0);
+		assertEquals(60000L, Util.getTime("1minute"), 0);
+		assertEquals(60000L, Util.getTime("1minutes"), 0);
+	}
+	
+	@Test
+	public void testHours() throws Exception {
+		assertEquals(3600000L, Util.getTime("1h"), 0);
+		assertEquals(3600000L, Util.getTime("1hours"), 0);
+	}
+	
+	@Test
+	public void testDays() throws Exception {
+		assertEquals(86400000L, Util.getTime("1d"), 0);
+		assertEquals(86400000L, Util.getTime("1days"), 0);
+	}
 }