rework tests to minimize warnings

MidnightBSD · Jan 4, 2024 · e92957b · e92957b
1 parent 2289565
commit e92957b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 9 deletions.
diff --git a/src/test/java/org/midnightbsd/appstore/ctl/OperatingSystemControllerTest.java b/src/test/java/org/midnightbsd/appstore/ctl/OperatingSystemControllerTest.java
@@ -39,20 +39,19 @@ public void setup() {
         os.setName("NAME");
         os.setId(1);
         os.setCreated(Calendar.getInstance().getTime());
-
-        when(service.list()).thenReturn(Collections.singletonList(os));
-        when(service.get(1)).thenReturn(os);
     }
 
     @Test
     void testList() {
+        when(service.list()).thenReturn(Collections.singletonList(os));
         final ResponseEntity<List<OperatingSystem>> result = controller.list();
         assertNotNull(result);
         assertEquals(1, Objects.requireNonNull(result.getBody()).size());
     }
 
     @Test
     void testGet() {
+        when(service.get(1)).thenReturn(os);
         final ResponseEntity<OperatingSystem> result = controller.get(1);
         assertNotNull(result);
         assertEquals("NAME", Objects.requireNonNull(result.getBody()).getName());

diff --git a/src/test/java/org/midnightbsd/appstore/ctl/PackageControllerTest.java b/src/test/java/org/midnightbsd/appstore/ctl/PackageControllerTest.java
@@ -39,20 +39,19 @@ public void setup() {
         pkg.setName("NAME");
         pkg.setId(1);
         pkg.setCreated(Calendar.getInstance().getTime());
-
-        when(service.list()).thenReturn(Collections.singletonList(pkg));
-        when(service.get(1)).thenReturn(pkg);
     }
 
     @Test
     void testList() {
+        when(service.list()).thenReturn(Collections.singletonList(pkg));
         final ResponseEntity<List<Package>> result = controller.list();
         assertNotNull(result);
         assertEquals(1, Objects.requireNonNull(result.getBody()).size());
     }
 
     @Test
     void testGet() {
+        when(service.get(1)).thenReturn(pkg);
         final ResponseEntity<Package> result = controller.get(1);
         assertNotNull(result);
         assertEquals("NAME", Objects.requireNonNull(result.getBody()).getName());

diff --git a/src/test/java/org/midnightbsd/appstore/ctl/RatingControllerTest.java b/src/test/java/org/midnightbsd/appstore/ctl/RatingControllerTest.java
@@ -41,20 +41,19 @@ public void setup() {
         rating.setScore(3);
         rating.setPkg(new Package());
         rating.setCreated(Calendar.getInstance().getTime());
-
-        when(service.list()).thenReturn(Collections.singletonList(rating));
-        when(service.get(1)).thenReturn(rating);
     }
 
     @Test
     void testList() {
+        when(service.list()).thenReturn(Collections.singletonList(rating));
         final ResponseEntity<List<Rating>> result = controller.list();
         assertNotNull(result);
         assertEquals(1, Objects.requireNonNull(result.getBody()).size());
     }
 
     @Test
     void testGet() {
+        when(service.get(1)).thenReturn(rating);
         final ResponseEntity<Rating> result = controller.get(1);
         assertNotNull(result);
         assertEquals(3, Objects.requireNonNull(result.getBody()).getScore());