GH-142 remove MockXssApi

adobe · Sep 9, 2020 · 8469bad · 8469bad
1 parent 08b7be9
commit 8469bad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 135 deletions.
diff --git a/apps/admin/core/src/test/java/com/adobe/dx/admin/mocks/MockSlingXssApi.java b/apps/admin/core/src/test/java/com/adobe/dx/admin/mocks/MockSlingXssApi.java
diff --git a/apps/admin/core/src/test/java/com/adobe/dx/admin/servlet/EncryptionServletTest.java b/apps/admin/core/src/test/java/com/adobe/dx/admin/servlet/EncryptionServletTest.java
@@ -19,8 +19,10 @@
 import static javax.servlet.http.HttpServletResponse.SC_BAD_REQUEST;
 import static javax.servlet.http.HttpServletResponse.SC_OK;
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.mockito.Matchers.anyString;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
 
-import com.adobe.dx.admin.mocks.MockSlingXssApi;
 import com.adobe.dx.mocks.MockCryptoSupport;
 import com.adobe.dx.testing.AbstractTest;
 import com.adobe.granite.crypto.CryptoSupport;
@@ -50,7 +52,10 @@ private void setup() {
             "/apps/dx/services/private/encryptValues");
         context.currentResource( "/apps/dx/services/private/encryptValues");
         context.registerService(CryptoSupport.class, mockCryptoSupport);
-        context.registerService(XSSAPI.class, new MockSlingXssApi());
+        XSSAPI xssapi = mock(XSSAPI.class);
+        when(xssapi.encodeForJSString(anyString())).thenAnswer(i -> i.getArguments()[0]);
+        when(xssapi.filterHTML(anyString())).thenAnswer(i -> i.getArguments()[0]);
+        context.registerService(XSSAPI.class, xssapi);
         request = context.request();
         response = context.response();
         context.registerInjectActivateService(encryptionServlet);