Skip to content

Commit 2cf3796

Browse files
committed
remove unnecessary stubbing
Signed-off-by: Andrew Azores <[email protected]>
1 parent aaa7ff2 commit 2cf3796

File tree

2 files changed

+9
-19
lines changed

2 files changed

+9
-19
lines changed

src/test/java/io/cryostat/net/web/http/api/v2/graph/TargetNodeRecurseFetcherTest.java

+5-12
Original file line numberDiff line numberDiff line change
@@ -110,16 +110,13 @@ void shouldHaveExpectedRequiredPermissions() {
110110

111111
@Test
112112
void shouldThrowIllegalStateExceptionOnUnknownNode() throws Exception {
113-
when(env.getGraphQlContext()).thenReturn(graphCtx);
114-
when(auth.validateHttpHeader(Mockito.any(), Mockito.any(), Mockito.any()))
115-
.thenReturn(CompletableFuture.completedFuture(true));
116-
117113
UnknownNode source = Mockito.mock(UnknownNode.class);
118114

119115
when(env.getSource()).thenReturn(source);
120116

121117
IllegalStateException ex =
122-
Assertions.assertThrows(IllegalStateException.class, () -> fetcher.get(env));
118+
Assertions.assertThrows(
119+
IllegalStateException.class, () -> fetcher.getAuthenticated(env));
123120
MatcherAssert.assertThat(ex.getMessage(), Matchers.equalTo(source.getClass().toString()));
124121
}
125122

@@ -130,16 +127,14 @@ void shouldReturnSource() throws Exception {
130127
HttpServerRequest req = Mockito.mock(HttpServerRequest.class);
131128
when(ctx.request()).thenReturn(req);
132129
when(req.headers()).thenReturn(MultiMap.caseInsensitiveMultiMap());
133-
when(auth.validateHttpHeader(Mockito.any(), Mockito.any(), Mockito.any()))
134-
.thenReturn(CompletableFuture.completedFuture(true));
135130

136131
TargetNode source = Mockito.mock(TargetNode.class);
137132
ServiceRef sr = new ServiceRef("id1", URI.create("uri1"), "alias1");
138133
when(source.getTarget()).thenReturn(sr);
139134

140135
when(env.getSource()).thenReturn(source);
141136

142-
List<TargetNode> nodes = fetcher.get(env);
137+
List<TargetNode> nodes = fetcher.getAuthenticated(env);
143138

144139
MatcherAssert.assertThat(nodes, Matchers.notNullValue());
145140
MatcherAssert.assertThat(nodes, Matchers.contains(source));
@@ -155,7 +150,6 @@ void shouldReturnTargetNodes() throws Exception {
155150
DataFetchingEnvironmentImpl.newDataFetchingEnvironment(
156151
Mockito.any(DataFetchingEnvironment.class)))
157152
.thenReturn(builder);
158-
when(env.getGraphQlContext()).thenReturn(graphCtx);
159153
when(graphCtx.get(RoutingContext.class)).thenReturn(ctx);
160154
HttpServerRequest req = Mockito.mock(HttpServerRequest.class);
161155
when(ctx.request()).thenReturn(req);
@@ -213,7 +207,7 @@ void shouldReturnTargetNodes() throws Exception {
213207
orphanNode,
214208
orphanNode);
215209

216-
List<TargetNode> nodes = fetcher.get(env);
210+
List<TargetNode> nodes = fetcher.getAuthenticated(env);
217211

218212
MatcherAssert.assertThat(nodes, Matchers.notNullValue());
219213
MatcherAssert.assertThat(
@@ -235,7 +229,6 @@ void shouldReturnTargetNodeFiltered() throws Exception {
235229
staticFilter
236230
.when(() -> FilterInput.from(Mockito.any(DataFetchingEnvironment.class)))
237231
.thenReturn(filter);
238-
when(env.getGraphQlContext()).thenReturn(graphCtx);
239232
when(graphCtx.get(RoutingContext.class)).thenReturn(ctx);
240233
HttpServerRequest req = Mockito.mock(HttpServerRequest.class);
241234
when(ctx.request()).thenReturn(req);
@@ -304,7 +297,7 @@ void shouldReturnTargetNodeFiltered() throws Exception {
304297
orphanNode,
305298
orphanNode);
306299

307-
List<TargetNode> nodes = fetcher.get(env);
300+
List<TargetNode> nodes = fetcher.getAuthenticated(env);
308301

309302
MatcherAssert.assertThat(nodes, Matchers.notNullValue());
310303
MatcherAssert.assertThat(nodes, Matchers.containsInAnyOrder(orphanNode));

src/test/java/io/cryostat/net/web/http/api/v2/graph/TargetNodesFetcherTest.java

+4-7
Original file line numberDiff line numberDiff line change
@@ -110,13 +110,10 @@ void shouldReturnEmptyList() throws Exception {
110110
staticEnv
111111
.when(() -> DataFetchingEnvironmentImpl.newDataFetchingEnvironment(env))
112112
.thenReturn(builder);
113-
when(env.getGraphQlContext()).thenReturn(graphCtx);
114-
when(auth.validateHttpHeader(Mockito.any(), Mockito.any(), Mockito.any()))
115-
.thenReturn(CompletableFuture.completedFuture(true));
116113

117114
when(recurseFetcher.get(Mockito.any())).thenReturn(List.of());
118115

119-
List<TargetNode> nodes = fetcher.get(env);
116+
List<TargetNode> nodes = fetcher.getAuthenticated(env);
120117

121118
MatcherAssert.assertThat(nodes, Matchers.notNullValue());
122119
MatcherAssert.assertThat(nodes, Matchers.empty());
@@ -145,7 +142,7 @@ void shouldReturnTarget() throws Exception {
145142

146143
when(recurseFetcher.get(Mockito.any())).thenReturn(List.of(target));
147144

148-
List<TargetNode> nodes = fetcher.get(env);
145+
List<TargetNode> nodes = fetcher.getAuthenticated(env);
149146

150147
MatcherAssert.assertThat(nodes, Matchers.notNullValue());
151148
MatcherAssert.assertThat(nodes, Matchers.contains(target));
@@ -189,7 +186,7 @@ void shouldReturnTargetsFiltered() throws Exception {
189186
when(recurseFetcher.get(Mockito.any()))
190187
.thenReturn(List.of(target1, target2, target3));
191188

192-
List<TargetNode> nodes = fetcher.get(env);
189+
List<TargetNode> nodes = fetcher.getAuthenticated(env);
193190

194191
MatcherAssert.assertThat(nodes, Matchers.notNullValue());
195192
MatcherAssert.assertThat(nodes, Matchers.containsInAnyOrder(target1, target3));
@@ -274,7 +271,7 @@ void shouldReturnTargetsMultipleFilters() throws Exception {
274271
when(recurseFetcher.get(Mockito.any()))
275272
.thenReturn(List.of(target1, target2, target3));
276273

277-
List<TargetNode> nodes = fetcher.get(env);
274+
List<TargetNode> nodes = fetcher.getAuthenticated(env);
278275

279276
MatcherAssert.assertThat(nodes, Matchers.notNullValue());
280277
MatcherAssert.assertThat(nodes, Matchers.contains(target1));

0 commit comments

Comments
 (0)