zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-14 08:27:14 +02:00
Code Issues Projects Releases Packages Wiki Activity

Remove unnecessary @Inject qualifiers in test classes

Browse source 
No actual injection is happening in test, and at least some compilers complain that @Inject qualifiers are not allowed on non-static inner classes.

-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=147835985
This commit is contained in:
mountford 2017-02-17 07:29:10 -08:00 • committed by Ben McIlwain
parent c23bbe35bb
commit a1537a51a9
1 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

36
javatests/google/registry/request/RequestHandlerTest.java
View file

@ -39,12 +39,10 @@ import google.registry.request.auth.LegacyAuthenticationMechanism;
import google.registry.request.auth.OAuthAuthenticationMechanism; import google.registry.request.auth.OAuthAuthenticationMechanism;
import google.registry.request.auth.RequestAuthenticator; import google.registry.request.auth.RequestAuthenticator;
import google.registry.testing.AppEngineRule; import google.registry.testing.AppEngineRule;
import google.registry.testing.InjectRule;
import google.registry.testing.Providers; import google.registry.testing.Providers;
import google.registry.testing.UserInfo; import google.registry.testing.UserInfo;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringWriter; import java.io.StringWriter;
import javax.inject.Inject;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;
import org.junit.After; import org.junit.After;
@ -66,9 +64,6 @@ public final class RequestHandlerTest {
.withUserService(UserInfo.create("test@example.com", "test@example.com")) .withUserService(UserInfo.create("test@example.com", "test@example.com"))
.build(); .build();
@Rule
public final InjectRule inject = new InjectRule();
@Action(path = "/bumblebee", method = {GET, POST}, isPrefix = true) @Action(path = "/bumblebee", method = {GET, POST}, isPrefix = true)
public static class BumblebeeTask implements Runnable { public static class BumblebeeTask implements Runnable {
@Override @Override
@ -122,7 +117,7 @@ public final class RequestHandlerTest {
@Override @Override
public void run() { public void run() {
injectedAuthResult = authResult; providedAuthResult = authResult;
} }
} }
@ -134,7 +129,7 @@ public final class RequestHandlerTest {
userPolicy = Auth.UserPolicy.IGNORED), userPolicy = Auth.UserPolicy.IGNORED),
method = Action.Method.GET) method = Action.Method.GET)
public class AuthNoneAction extends AuthBase { public class AuthNoneAction extends AuthBase {
@Inject AuthNoneAction(AuthResult authResult) { AuthNoneAction(AuthResult authResult) {
super(authResult); super(authResult);
} }
} }
@ -147,7 +142,7 @@ public final class RequestHandlerTest {
userPolicy = Auth.UserPolicy.ADMIN), userPolicy = Auth.UserPolicy.ADMIN),
method = Action.Method.GET) method = Action.Method.GET)
public class AuthAdminUserAnyMethodAction extends AuthBase { public class AuthAdminUserAnyMethodAction extends AuthBase {
@Inject AuthAdminUserAnyMethodAction(AuthResult authResult) { AuthAdminUserAnyMethodAction(AuthResult authResult) {
super(authResult); super(authResult);
} }
} }
@ -193,8 +188,7 @@ public final class RequestHandlerTest {
} }
public AuthAdminUserAnyMethodAction authAdminUserAnyMethodAction() { public AuthAdminUserAnyMethodAction authAdminUserAnyMethodAction() {
return new AuthAdminUserAnyMethodAction( return new AuthAdminUserAnyMethodAction(component.getRequestModule().provideAuthResult());
component.getRequestModule().provideAuthResult());
} }
} }
@ -231,7 +225,7 @@ public final class RequestHandlerTest {
private final Component component = new Component(); private final Component component = new Component();
private final StringWriter httpOutput = new StringWriter(); private final StringWriter httpOutput = new StringWriter();
private RequestHandler<Component, Builder> handler; private RequestHandler<Component, Builder> handler;
private AuthResult injectedAuthResult = null; private AuthResult providedAuthResult = null;
private final User testUser = new User("test@example.com", "test@example.com"); private final User testUser = new User("test@example.com", "test@example.com");
private RequestAuthenticator requestAuthenticator; private RequestAuthenticator requestAuthenticator;
@ -431,9 +425,9 @@ public final class RequestHandlerTest {
when(req.getMethod()).thenReturn("GET"); when(req.getMethod()).thenReturn("GET");
when(req.getRequestURI()).thenReturn("/auth/none"); when(req.getRequestURI()).thenReturn("/auth/none");
handler.handleRequest(req, rsp); handler.handleRequest(req, rsp);
assertThat(injectedAuthResult).isNotNull(); assertThat(providedAuthResult).isNotNull();
assertThat(injectedAuthResult.authLevel()).isEqualTo(AuthLevel.NONE); assertThat(providedAuthResult.authLevel()).isEqualTo(AuthLevel.NONE);
assertThat(injectedAuthResult.userAuthInfo()).isAbsent(); assertThat(providedAuthResult.userAuthInfo()).isAbsent();
} }
@Test @Test
@ -442,7 +436,7 @@ public final class RequestHandlerTest {
when(req.getRequestURI()).thenReturn("/auth/adminUserAnyMethod"); when(req.getRequestURI()).thenReturn("/auth/adminUserAnyMethod");
handler.handleRequest(req, rsp); handler.handleRequest(req, rsp);
verify(rsp).sendError(403); verify(rsp).sendError(403);
assertThat(injectedAuthResult).isNull(); assertThat(providedAuthResult).isNull();
} }
@Test @Test
@ -454,7 +448,7 @@ public final class RequestHandlerTest {
when(req.getRequestURI()).thenReturn("/auth/adminUserAnyMethod"); when(req.getRequestURI()).thenReturn("/auth/adminUserAnyMethod");
handler.handleRequest(req, rsp); handler.handleRequest(req, rsp);
verify(rsp).sendError(403); verify(rsp).sendError(403);
assertThat(injectedAuthResult).isNull(); assertThat(providedAuthResult).isNull();
} }
@Test @Test
@ -465,10 +459,10 @@ public final class RequestHandlerTest {
when(req.getMethod()).thenReturn("GET"); when(req.getMethod()).thenReturn("GET");
when(req.getRequestURI()).thenReturn("/auth/adminUserAnyMethod"); when(req.getRequestURI()).thenReturn("/auth/adminUserAnyMethod");
handler.handleRequest(req, rsp); handler.handleRequest(req, rsp);
assertThat(injectedAuthResult).isNotNull(); assertThat(providedAuthResult).isNotNull();
assertThat(injectedAuthResult.authLevel()).isEqualTo(AuthLevel.USER); assertThat(providedAuthResult.authLevel()).isEqualTo(AuthLevel.USER);
assertThat(injectedAuthResult.userAuthInfo()).isPresent(); assertThat(providedAuthResult.userAuthInfo()).isPresent();
assertThat(injectedAuthResult.userAuthInfo().get().user()).isEqualTo(testUser); assertThat(providedAuthResult.userAuthInfo().get().user()).isEqualTo(testUser);
assertThat(injectedAuthResult.userAuthInfo().get().oauthTokenInfo()).isAbsent(); assertThat(providedAuthResult.userAuthInfo().get().oauthTokenInfo()).isAbsent();
} }
} }