PAN-11 Fixed integration tests

persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/AccountsIntegrationTest.java

@@ -29,7 +29,7 @@ public class AccountsIntegrationTest {
 
         assertEquals("Test username", savedAccount.getUsername());
         assertEquals("test password", savedAccount.getPassword());
-        assertTrue(savedAccount.getAdministrator());
+        assertTrue(savedAccount.isAdministrator());
 
         savedAccount.setPassword("Test Update");
 
@@ -37,7 +37,7 @@ public class AccountsIntegrationTest {
 
         assertEquals("Test username", savedAccount.getUsername());
         assertEquals("Test Update", savedAccount.getPassword());
-        assertTrue(savedAccount.getAdministrator());
+        assertTrue(savedAccount.isAdministrator());
         assertEquals(updatedAccount.getId(), id);
 
         accountsRepository.delete(account);

persistence/src/main/java/edu/msudenver/tsp/persistence/dto/Account.java

@@ -19,21 +19,11 @@ import java.util.Date;
 public class Account extends BaseDto implements Serializable {
     @NotBlank(groups = Insert.class, message = "A username must be specified") @Size(max = 50) private String username;
     @NotBlank(groups = Insert.class, message = "A password must be specified") @Size(max = 256) private String password;
-    @NotNull @Column(name = "administrator") private boolean administrator;
+    @NotNull private boolean administrator;
     @Temporal(TemporalType.DATE) @Column(name = "last_login") private Date lastLogin;
 
     private static final long serialVersionUID = 7095627971593953734L;
 
-    @JsonProperty("administrator_status")
-    public boolean getAdministrator() {
-        return administrator;
-    }
-
-    @JsonProperty("administrator_status")
-    public void setAdministrator(final boolean administrator) {
-        this.administrator = administrator;
-    }
-
     @JsonProperty("last_login")
     public Date getLastLogin() {
         return lastLogin;

persistence/src/test/java/edu/msudenver/tsp/persistence/controller/AccountControllerTest.java

@@ -25,10 +25,8 @@ import static org.mockito.Mockito.*;
 @RunWith(MockitoJUnitRunner.class)
 @WebMvcTest(controllers = AccountController.class)
 public class AccountControllerTest {
-    @Mock
+    @Mock private AccountsRepository accountsRepository;
-    private AccountsRepository accountsRepository;
+    @InjectMocks private AccountController accountController;
-    @InjectMocks
-    private AccountController accountController;
     @Mock private BindingResult bindingResult;
 
     @Test