Code cleaning

Author: jwnasambu

api/src/test/java/org/openmrs/validator/BedTagValidatorTest.java

@@ -18,7 +18,6 @@
 
 import java.util.Arrays;
 import java.util.Collections;
-import java.util.Date;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -39,18 +38,17 @@ public void setup() {
         activeTag = new BedTag();
         activeTag.setName("ICU-1");
         activeTag.setUuid("active-uuid");
-        activeTag.setDateVoided(null);
+        activeTag.setVoided(false);
 
         expiredTag = new BedTag();
         expiredTag.setName("ExpiredTag");
         expiredTag.setUuid("expired-uuid");
-        expiredTag.setDateVoided(new Date(System.currentTimeMillis() - 24 * 60 * 60 * 1000));
+        expiredTag.setVoided(true);
     }
 
     @Test
     public void validate_shouldFailIfNameIsNullOrEmptyOrWhitespace() {
         BedTag tag = new BedTag();
-
         tag.setName(null);
         Errors errors = new BindException(tag, "tag");
         validator.validate(tag, errors);
@@ -126,31 +124,12 @@ public void validate_shouldRejectNonBedTagObjects() {
         assertTrue(errors.hasGlobalErrors());
     }
 
-    @Test
-    public void saveBedTag_shouldInvokeValidator() {
-        BedTagValidator spyValidator = spy(new BedTagValidator(bedManagementService));
-        BedManagementService service = mock(BedManagementService.class);
-
-        BedTag tag = new BedTag();
-        tag.setName("AnotherUniqueTag");
-
-        doAnswer(invocation -> {
-            Errors errors = new BindException(tag, "tag");
-            spyValidator.validate(tag, errors);
-            return null;
-        }).when(service).saveBedTag(tag);
-
-        service.saveBedTag(tag);
-
-        verify(spyValidator, times(1)).validate(eq(tag), any(Errors.class));
-    }
-
     @Test
     public void shouldUpdateBedTag() throws Exception {
         BedTag existingTag = new BedTag();
         existingTag.setName("ICU-1");
         existingTag.setUuid("existing-uuid");
-        existingTag.setDateVoided(null);
+        existingTag.setVoided(false);
         when(bedManagementService.getAllBedTags()).thenReturn(Arrays.asList(existingTag));
 
         BedTag tagToUpdate = new BedTag();