#99 Changed name on methods

eirikdahlen · Apr 16, 2018 · 3f2eb7d · 3f2eb7d
1 parent 9563fb1
commit 3f2eb7d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/tdt4140-gr1802/app.core/src/test/java/tdt4140/gr1802/app/core/AnalyzeWorkoutTest.java b/tdt4140-gr1802/app.core/src/test/java/tdt4140/gr1802/app/core/AnalyzeWorkoutTest.java
@@ -62,9 +62,9 @@ public void testGetTimeInHRZones() throws Exception {
 		//
 
 	}
-	/*
+
 	@Test
-	public void testGetHRPercentage() throws Exception {
+	public void getHRPercentageTest() throws Exception {
 
 		//imports athlete and workout from db for testing
 		Athlete athlete1 = db.getAthlete("williamkvaale");
@@ -78,5 +78,5 @@ public void testGetHRPercentage() throws Exception {
 		assertFalse(percentageInHRZones.equals(Arrays.asList(12,12,10)));
 
 
-	}*/
+	}
 }
diff --git a/tdt4140-gr1802/app.core/src/test/java/tdt4140/gr1802/app/core/DatabaseTest.java b/tdt4140-gr1802/app.core/src/test/java/tdt4140/gr1802/app/core/DatabaseTest.java
@@ -443,9 +443,9 @@ public void testGetAllWorkoutsNonExistingAthlete() {
 
 
 	//_______jUnit_______
-/*
+
 	@Test
-	public void testGetAthlete() throws Exception {
+	public void getAthleteTest() throws Exception {
 
 		//adds athlete for testing
 		Athlete athlete1 = new Athlete("TeddyWestside", "theodor","Bajsunge");
@@ -464,7 +464,7 @@ public void testGetAthlete() throws Exception {
 
 
 	@Test
-	public void testGetCoach() throws Exception {
+	public void getCoachTest() throws Exception {
 
 		//adds coack for testing
 		Coach coach1 = new Coach("petter22", "petter123","Petter");
@@ -483,7 +483,7 @@ public void testGetCoach() throws Exception {
 
 
 	@Test
-	public void testGetWorkout() throws Exception {
+	public void getWorkoutTest() throws Exception {
 
 		//creates athlete and workout for testing 
 		Athlete athlete1 = new Athlete("williamkvaale","test123","William Kvaale");
@@ -507,7 +507,7 @@ public void testGetWorkout() throws Exception {
 
 
 	@Test
-	public void testGetPulseList() throws Exception {
+	public void getPulseListTest() throws Exception {
 
 		Athlete athl = new Athlete("williamkvaale","test123","William Kvaale");
 
@@ -525,7 +525,7 @@ public void testGetPulseList() throws Exception {
 
 
 	}
-*/
+
 
 }