Skip to content

Commit

Permalink
Fix all unit test application context errors (WIP)
Browse files Browse the repository at this point in the history
  • Loading branch information
wwelling committed Feb 27, 2024
1 parent ff8b717 commit c1cd7e1
Show file tree
Hide file tree
Showing 11 changed files with 22 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,19 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.context.annotation.Import;
import org.springframework.http.MediaType;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult;

import edu.tamu.scholars.middleware.auth.UserTestUtility;
import edu.tamu.scholars.middleware.auth.model.User;
import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;

@AutoConfigureRestDocs
@WebMvcTest(AuthController.class)
@Import(value = { MiddlewareTestConfig.class })
public class AuthControllerTest {

private static final ConstraintDescriptionsHelper describeUser = new ConstraintDescriptionsHelper(User.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,17 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.context.annotation.Import;
import org.springframework.test.web.servlet.MockMvc;

import edu.tamu.scholars.middleware.auth.UserTestUtility;
import edu.tamu.scholars.middleware.auth.model.User;
import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;

@AutoConfigureRestDocs
@WebMvcTest
@Import(value = { MiddlewareTestConfig.class })
public class LoginControllerTest {

private static final ConstraintDescriptionsHelper describeUser = new ConstraintDescriptionsHelper(User.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,17 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.context.annotation.Import;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult;

import edu.tamu.scholars.middleware.auth.UserTestUtility;
import edu.tamu.scholars.middleware.auth.model.User;
import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;

@WebMvcTest
@AutoConfigureRestDocs
@WebMvcTest
@Import(value = { MiddlewareTestConfig.class })
public class LogoutControllerTest {

@Autowired
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.context.annotation.Import;
import org.springframework.security.core.token.Token;
import org.springframework.security.core.token.TokenService;
import org.springframework.test.web.servlet.MockMvc;
Expand All @@ -32,11 +33,13 @@

import edu.tamu.scholars.middleware.auth.RegistrationTestUtility;
import edu.tamu.scholars.middleware.auth.controller.request.Registration;
import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
import edu.tamu.scholars.middleware.service.EmailService;
import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;

@WebMvcTest(RegistrationController.class)
@AutoConfigureRestDocs
@WebMvcTest(RegistrationController.class)
@Import(value = { MiddlewareTestConfig.class })
public class RegistrationControllerTest {

private static final ConstraintDescriptionsHelper describeRegistration = new ConstraintDescriptionsHelper(Registration.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,18 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.context.annotation.Import;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.MvcResult;

import edu.tamu.scholars.middleware.auth.UserTestUtility;
import edu.tamu.scholars.middleware.auth.model.User;
import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;

@WebMvcTest
@AutoConfigureRestDocs
@WebMvcTest
@Import(value = { MiddlewareTestConfig.class })
public class UserControllerTest {

private static final ConstraintDescriptionsHelper describeUser = new ConstraintDescriptionsHelper(User.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,20 +27,23 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.context.annotation.Import;
import org.springframework.http.MediaType;
import org.springframework.security.test.context.support.WithMockUser;
import org.springframework.test.web.servlet.MockMvc;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;

import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
import edu.tamu.scholars.middleware.theme.ThemeTestUtility;
import edu.tamu.scholars.middleware.theme.model.Style;
import edu.tamu.scholars.middleware.theme.model.Theme;
import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;

@WebMvcTest
@AutoConfigureRestDocs
@Import(value = { MiddlewareTestConfig.class })
public class ThemeControllerTest {

private static final ConstraintDescriptionsHelper describeTheme = new ConstraintDescriptionsHelper(Theme.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
import edu.tamu.scholars.middleware.config.MiddlewareTestConfig;
import edu.tamu.scholars.middleware.view.model.View;

@WebMvcTest
@AutoConfigureRestDocs
@WebMvcTest
@Import(MiddlewareTestConfig.class)
public abstract class AbstractViewControllerTest<V extends View> {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;
import edu.tamu.scholars.middleware.view.model.DataAndAnalyticsView;

// TODO: mock calls to repo
public class DataAndAnalyticsViewControllerTest extends AbstractViewControllerTest<DataAndAnalyticsView> {

private static final ConstraintDescriptionsHelper describeDataAndAnalyticsView = new ConstraintDescriptionsHelper(DataAndAnalyticsView.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;
import edu.tamu.scholars.middleware.view.model.DirectoryView;

// TODO: mock calls to repo
public class DirectoryViewControllerTest extends AbstractViewControllerTest<DirectoryView> {

private static final ConstraintDescriptionsHelper describeDirectoryView = new ConstraintDescriptionsHelper(DirectoryView.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;
import edu.tamu.scholars.middleware.view.model.DiscoveryView;

// TODO: mock calls to repo
public class DiscoveryViewControllerTest extends AbstractViewControllerTest<DiscoveryView> {

private static final ConstraintDescriptionsHelper describeDiscoveryView = new ConstraintDescriptionsHelper(DiscoveryView.class);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import edu.tamu.scholars.middleware.utility.ConstraintDescriptionsHelper;
import edu.tamu.scholars.middleware.view.model.DisplayView;

// TODO: mock calls to repo
public class DisplayViewControllerTest extends AbstractViewControllerTest<DisplayView> {

private static final ConstraintDescriptionsHelper describeDisplayView = new ConstraintDescriptionsHelper(DisplayView.class);
Expand Down

0 comments on commit c1cd7e1

Please sign in to comment.