More tests for PulsarMetric class

LaviniaCioloca · Sep 19, 2017 · de34e5f · de34e5f
1 parent 0017b0e
commit de34e5f
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/src/main/java/org/lavinia/metrics/MethodMetrics.java b/src/main/java/org/lavinia/metrics/MethodMetrics.java
@@ -44,13 +44,9 @@ public abstract class MethodMetrics {
 	protected final static Integer ACTIVELY_CHANGED = 3; // times changed
 	protected static Date now = null;
 
-	public static Date parseDate(String date) throws ParseException {
-		return new SimpleDateFormat("yyyy/MM/dd").parse(date);
-	}
-
 	public MethodMetrics() {
 		try {
-			now = parseDate("2017/09/06");
+			now = new SimpleDateFormat("yyyy/MM/dd").parse("2017/09/06");
 		} catch (ParseException e) {
 			e.printStackTrace();
 		}
@@ -68,6 +64,9 @@ protected Long getDifferenceInDays(Date start, Date end) {
 		Long startTime = start.getTime();
 		Long endTime = end.getTime();
 		Long diffTime = endTime - startTime;
+		if (diffTime < 0) {
+			return null;
+		}
 		return diffTime / (1000 * 60 * 60 * 24);
 	}
 

diff --git a/src/test/java/org/lavinia/metrics/MethodMetricsTest.java b/src/test/java/org/lavinia/metrics/MethodMetricsTest.java
@@ -31,10 +31,6 @@
 import org.junit.Test;
 
 public class MethodMetricsTest {
-	@Test(expected = ParseException.class)
-	public void testParseDate() throws ParseException {
-		MethodMetrics.parseDate("!13/13/13");
-	}
 
 	@Test
 	public void testGetDifferenceInDays() throws ParseException {

diff --git a/src/test/java/org/lavinia/metrics/PulsarMetricTest.java b/src/test/java/org/lavinia/metrics/PulsarMetricTest.java
@@ -239,15 +239,15 @@ public void testCountPulsarSeverityPointsMin() throws ParseException {
 	}
 
 	@Test
-	public void testGetPulsarSeverity() throws ParseException {
+	public void testGetPulsarSeveritySeven() throws ParseException {
 		PulsarMetric pulsarMetric = new PulsarMetric();
 		CSVData csvData = new CSVData();
 		csvData.setActualSize(200);
 		ArrayList<Commit> commits = new ArrayList<>();
 		ArrayList<Integer> changesList = new ArrayList<>();
-		changesList.add(-50);
+		changesList.add(-5);
+		changesList.add(5);
 		changesList.add(1);
-		changesList.add(50);
 		changesList.add(1);
 		Commit commit = new Commit();
 		commit.setDate(new SimpleDateFormat("yyyy/MM/dd").parse("2017/08/01"));
@@ -256,10 +256,26 @@ public void testGetPulsarSeverity() throws ParseException {
 		commits.add(commit);
 		commit.setDate(new SimpleDateFormat("yyyy/MM/dd").parse("2017/09/01"));
 		commits.add(commit);
-		commit.setDate(new SimpleDateFormat("yyyy/MM/dd").parse("2017/10/01"));
+		commit.setDate(new SimpleDateFormat("yyyy/MM/dd").parse("2017/09/03"));
 		commits.add(commit);
 		csvData.setCommits(commits);
 		csvData.setChangesList(changesList);
 		assertTrue(pulsarMetric.getPulsarSeverity(csvData) == 7);
 	}
+
+	@Test
+	public void testGetPulsarSeverityFour() throws ParseException {
+		PulsarMetric pulsarMetric = new PulsarMetric();
+		CSVData csvData = new CSVData();
+		csvData.setActualSize(10);
+		ArrayList<Commit> commits = new ArrayList<>();
+		ArrayList<Integer> changesList = new ArrayList<>();
+		changesList.add(-5);
+		Commit commit = new Commit();
+		commit.setDate(new SimpleDateFormat("yyyy/MM/dd").parse("2010/01/01"));
+		commits.add(commit);
+		csvData.setCommits(commits);
+		csvData.setChangesList(changesList);
+		assertTrue(pulsarMetric.getPulsarSeverity(csvData) == 4);
+	}
 }