This is an automated email from the ASF dual-hosted git repository.
radu pushed a commit to branch master
in repository
https://gitbox.apache.org/repos/asf/sling-org-apache-sling-graphql-core.git
The following commit(s) were added to refs/heads/master by this push:
new 46482b5 SLING-9744 - Add metrics for the persisted queries
46482b5 is described below
commit 46482b5d171d4828765a47320f0074ca6b210883
Author: Radu Cotescu <[email protected]>
AuthorDate: Mon Sep 21 17:31:52 2020 +0200
SLING-9744 - Add metrics for the persisted queries
* updated tests setup
---
.../core/cache/SimpleGraphQLCacheProviderTest.java | 20 ++++++++++++++++++++
.../graphql/core/it/GraphQLCoreTestSupport.java | 2 ++
.../graphql/core/servlet/GraphQLServletTest.java | 22 ++++++++++++++++++++++
3 files changed, 44 insertions(+)
diff --git
a/src/test/java/org/apache/sling/graphql/core/cache/SimpleGraphQLCacheProviderTest.java
b/src/test/java/org/apache/sling/graphql/core/cache/SimpleGraphQLCacheProviderTest.java
index fa13429..f0c4f5d 100644
---
a/src/test/java/org/apache/sling/graphql/core/cache/SimpleGraphQLCacheProviderTest.java
+++
b/src/test/java/org/apache/sling/graphql/core/cache/SimpleGraphQLCacheProviderTest.java
@@ -18,20 +18,40 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
package org.apache.sling.graphql.core.cache;
+import org.apache.sling.commons.metrics.Counter;
+import org.apache.sling.commons.metrics.MetricsService;
+import org.apache.sling.commons.metrics.Timer;
import org.apache.sling.graphql.api.cache.GraphQLCacheProvider;
import org.apache.sling.testing.mock.osgi.junit.OsgiContext;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import com.codahale.metrics.MetricRegistry;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public class SimpleGraphQLCacheProviderTest {
@Rule
public OsgiContext context = new OsgiContext();
+ @Before
+ public void setUp() {
+ MetricsService metricsService = mock(MetricsService.class);
+
when(metricsService.counter(anyString())).thenReturn(mock(Counter.class));
+ when(metricsService.timer(anyString())).thenReturn(mock(Timer.class));
+ context.registerService(MetricsService.class, metricsService);
+
+ MetricRegistry metricRegistry = mock(MetricRegistry.class);
+ context.registerService(MetricRegistry.class, metricRegistry, "name",
"sling");
+ }
+
@Test
public void getHash() {
context.registerInjectActivateService(new
SimpleGraphQLCacheProvider());
diff --git
a/src/test/java/org/apache/sling/graphql/core/it/GraphQLCoreTestSupport.java
b/src/test/java/org/apache/sling/graphql/core/it/GraphQLCoreTestSupport.java
index 1ebe0dc..20cf3e5 100644
--- a/src/test/java/org/apache/sling/graphql/core/it/GraphQLCoreTestSupport.java
+++ b/src/test/java/org/apache/sling/graphql/core/it/GraphQLCoreTestSupport.java
@@ -41,6 +41,7 @@ import org.ops4j.pax.tinybundles.core.TinyBundle;
import org.osgi.framework.Constants;
import org.apache.sling.engine.SlingRequestProcessor;
+import static
org.apache.sling.testing.paxexam.SlingOptions.slingCommonsMetrics;
import static org.junit.Assert.fail;
import static
org.apache.sling.testing.paxexam.SlingOptions.slingQuickstartOakTar;
import static
org.apache.sling.testing.paxexam.SlingOptions.slingResourcePresence;
@@ -95,6 +96,7 @@ public abstract class GraphQLCoreTestSupport extends
TestSupport {
mavenBundle().groupId("org.apache.sling").artifactId("org.apache.sling.servlet-helpers").versionAsInProject(),
mavenBundle().groupId("com.cedarsoftware").artifactId("json-io").versionAsInProject(),
slingResourcePresence(),
+ slingCommonsMetrics(),
jsonPath(),
junitBundles()
);
diff --git
a/src/test/java/org/apache/sling/graphql/core/servlet/GraphQLServletTest.java
b/src/test/java/org/apache/sling/graphql/core/servlet/GraphQLServletTest.java
index da9dbab..8ea6265 100644
---
a/src/test/java/org/apache/sling/graphql/core/servlet/GraphQLServletTest.java
+++
b/src/test/java/org/apache/sling/graphql/core/servlet/GraphQLServletTest.java
@@ -25,6 +25,9 @@ import javax.servlet.Servlet;
import org.apache.sling.api.resource.Resource;
import org.apache.sling.api.resource.ResourceResolver;
import org.apache.sling.api.servlets.ServletResolverConstants;
+import org.apache.sling.commons.metrics.Counter;
+import org.apache.sling.commons.metrics.MetricsService;
+import org.apache.sling.commons.metrics.Timer;
import org.apache.sling.graphql.core.cache.SimpleGraphQLCacheProvider;
import org.apache.sling.graphql.core.engine.SlingDataFetcherSelector;
import org.apache.sling.graphql.core.scalars.SlingScalarsProvider;
@@ -33,18 +36,37 @@ import
org.apache.sling.testing.mock.sling.junit.SlingContext;
import org.apache.sling.testing.mock.sling.servlet.MockRequestPathInfo;
import org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletRequest;
import
org.apache.sling.testing.mock.sling.servlet.MockSlingHttpServletResponse;
+import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import com.codahale.metrics.MetricRegistry;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
public class GraphQLServletTest {
@Rule
public SlingContext context = new SlingContext();
+ @Before
+ public void setUp() {
+ MetricsService metricsService = mock(MetricsService.class);
+
when(metricsService.counter(anyString())).thenReturn(mock(Counter.class));
+
+ Timer timer = mock(Timer.class);
+ when(timer.time()).thenReturn(mock(Timer.Context.class));
+ when(metricsService.timer(anyString())).thenReturn(timer);
+ context.registerService(MetricsService.class, metricsService);
+
+ MetricRegistry metricRegistry = mock(MetricRegistry.class);
+ context.registerService(MetricRegistry.class, metricRegistry, "name",
"sling");
+ }
+
@Test
public void testDisabledSuffix() throws IOException {
RankedSchemaProviders rankedSchemaProviders =
mock(RankedSchemaProviders.class);
