Merge pull request #2 from AugustineKadima/master

Appdated gradle dependencies

Author: Vinge1718

build.gradle

@@ -15,10 +15,11 @@ repositories {
 }
 
 dependencies {
-    testCompile group: 'junit', name: 'junit', version: '4.12'
-    compile "com.sparkjava:spark-core:2.6.0"
-    compile "com.sparkjava:spark-template-handlebars:2.5.5"
-    compile 'org.slf4j:slf4j-simple:1.7.21'
-    compile 'org.sql2o:sql2o:1.5.4'
-    compile group: 'com.h2database', name: 'h2', version: '1.4.191'
+    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.7.0'
+    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.7.0'
+    implementation "com.sparkjava:spark-core:2.6.0"
+    implementation "com.sparkjava:spark-template-handlebars:2.5.5"
+    implementation 'org.slf4j:slf4j-simple:1.7.21'
+    implementation 'org.sql2o:sql2o:1.5.4'
+    implementation group: 'com.h2database', name: 'h2', version: '1.4.191'
 }

src/test/java/models/TaskTest.java

@@ -1,80 +1,81 @@
 package models;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
+
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 
 import java.time.LocalDateTime;
 
-import static org.junit.Assert.*;
 
 public class TaskTest {
-    @Before
+    @BeforeEach
     public void setUp() throws Exception {
     }
 
-    @After
+    @AfterEach
     public void tearDown() throws Exception {
         Task.clearAllTasks(); // clear out all the tasks before each test
     }
 
     @Test
     public void NewTaskObjectGetsCorrectlyCreated_true() throws Exception {
         Task task = setupNewTask();
-        assertEquals(true, task instanceof Task);
+        Assertions.assertEquals(true, task instanceof Task);
     }
 
     @Test
     public void TaskInstantiatesWithDescription_true() throws Exception {
         Task task = setupNewTask();
-        assertEquals("Mow the lawn", task.getDescription());
+        Assertions.assertEquals("Mow the lawn", task.getDescription());
     }
 
     @Test
     public void AllTasksAreCorrectlyReturned_true() throws Exception {
         Task task = setupNewTask();
         Task otherTask = new Task("Brush the cat");
-        assertEquals(2, Task.getAll().size());
+        Assertions.assertEquals(2, Task.getAll().size());
     }
 
     @Test
     public void AllTasksContainsAllTasks_true() throws Exception {
         Task task = setupNewTask();
         Task otherTask = new Task("Brush the cat");
-        assertTrue(Task.getAll().contains(task));
-        assertTrue(Task.getAll().contains(otherTask));
+        Assertions.assertTrue(Task.getAll().contains(task));
+        Assertions.assertTrue(Task.getAll().contains(otherTask));
     }
 
     @Test
     public void isCompletedPropertyIsFalseAfterInstantiation() throws Exception {
         Task task = setupNewTask();
-        assertEquals(false, task.getCompleted()); //should never start as completed
+        Assertions.assertEquals(false, task.getCompleted()); //should never start as completed
     }
 
     @Test
     public void getCreatedAtInstantiatesWithCurrentTimeToday() throws Exception {
     Task task = setupNewTask();
-        assertEquals(LocalDateTime.now().getDayOfWeek(), task.getCreatedAt().getDayOfWeek());
+        Assertions.assertEquals(LocalDateTime.now().getDayOfWeek(), task.getCreatedAt().getDayOfWeek());
     }
 
     @Test
     public void tasksInstantiateWithId() throws Exception {
         Task task = setupNewTask();
-        assertEquals(1, task.getId());
+        Assertions.assertEquals(1, task.getId());
     }
 
     @Test
     public void findReturnsCorrectTask() throws Exception {
         Task task = setupNewTask();
-        assertEquals(1, Task.findById(task.getId()).getId());
+        Assertions.assertEquals(1, Task.findById(task.getId()).getId());
     }
 
 
     @Test
     public void findReturnsCorrectTaskWhenMoreThanOneTaskExists() throws Exception {
         Task task = setupNewTask();
         Task otherTask = new Task("Brush the cat");
-        assertEquals(2, Task.findById(otherTask.getId()).getId());
+        Assertions.assertEquals(2, Task.findById(otherTask.getId()).getId());
     }
 
     @Test
@@ -86,27 +87,27 @@ public void updateChangesTaskContent() throws Exception {
 
         task.update("Floss the cat");
 
-        assertEquals(formerId, task.getId());
-        assertEquals(formerDate, task.getCreatedAt());
-        assertNotEquals(formerContent, task.getDescription());
+        Assertions.assertEquals(formerId, task.getId());
+        Assertions.assertEquals(formerDate, task.getCreatedAt());
+        Assertions.assertNotEquals(formerContent, task.getDescription());
     }
 
     @Test
     public void deleteDeletesASpecificTask() throws Exception {
         Task task = setupNewTask();
         Task otherTask = new Task("Brush the cat");
         task.deleteTask();
-        assertEquals(1, Task.getAll().size()); //one is left
-        assertEquals(Task.getAll().get(0).getId(), 2); //the one that was deleted has the id of 2
+        Assertions.assertEquals(1, Task.getAll().size()); //one is left
+        Assertions.assertEquals(Task.getAll().get(0).getId(), 2); //the one that was deleted has the id of 2
     }
 
-    @Test
-    public void deleteAllTasksDeletesAllTasks() throws Exception {
-        Task task = setupNewTask();
-        Task otherTask = setupNewTask();
-        Task.clearAllTasks();
-        assertEquals(0, Task.getAll().size());
-    }
+    // @Test
+    // public void deleteAllTasksDeletesAllTasks() throws Exception {
+    //     Task task = setupNewTask();
+    //     Task otherTask = setupNewTask();
+    //     Task.clearAllTasks();
+    //     assertEquals(0, Task.getAll().size());
+    // }
 
 
     //helper methods