commit 55f74cb55e7342b73060ca1da8e385796f683e54
author Konrad Windszus <kwin@apache.org> Wed Oct 28 09:32:23 2020 +0100
committer GitHub <noreply@github.com> Wed Oct 28 09:32:23 2020 +0100
tree f6fc24fb5113a01932ec98c17e03c3b3a2cc1bf4
parent 9f5d62b88b4716be5469f216b85f14b60760f13d

SLING-9858 remove commons testing (#22)

pom.xml

diff --git a/pom.xml b/pom.xml
index c68d5a6..2231db5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -211,8 +211,21 @@
         </dependency>
         <dependency>
             <groupId>org.apache.sling</groupId>
-            <artifactId>org.apache.sling.commons.testing</artifactId>
-            <version>2.0.26</version>
+            <artifactId>org.apache.sling.servlet-helpers</artifactId>
+            <version>1.4.2</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- transitive depedendencies of org.apache.sling.servlet-helpers -->
+        <dependency>
+            <groupId>javax.servlet</groupId>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-collections4</artifactId>
+            <version>4.1</version>
             <scope>test</scope>
         </dependency>
         <!-- for testing the annotations -->

src/test/java/org/apache/sling/models/impl/CachingTest.java

diff --git a/src/test/java/org/apache/sling/models/impl/CachingTest.java b/src/test/java/org/apache/sling/models/impl/CachingTest.java
index 20d3cd8..1ba37ca 100644
--- a/src/test/java/org/apache/sling/models/impl/CachingTest.java
+++ b/src/test/java/org/apache/sling/models/impl/CachingTest.java
@@ -16,7 +16,15 @@
  */
 package org.apache.sling.models.impl;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertSame;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
 import java.util.Collections;
+import java.util.Enumeration;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -24,11 +32,11 @@
 import org.apache.sling.api.resource.ValueMap;
 import org.apache.sling.api.wrappers.SlingHttpServletRequestWrapper;
 import org.apache.sling.api.wrappers.ValueMapDecorator;
-import org.apache.sling.commons.testing.sling.MockSlingHttpServletRequest;
 import org.apache.sling.models.impl.injectors.RequestAttributeInjector;
 import org.apache.sling.models.impl.injectors.ValueMapInjector;
 import org.apache.sling.models.testmodels.classes.CachedModel;
 import org.apache.sling.models.testmodels.classes.UncachedModel;
+import org.apache.sling.servlethelpers.MockSlingHttpServletRequest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,19 +44,11 @@
 import org.mockito.Spy;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotSame;
-import static org.junit.Assert.assertSame;
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
-
 @RunWith(MockitoJUnitRunner.class)
 public class CachingTest {
 
     @Spy
-    private MockRequest request;
+    private MockSlingHttpServletRequest request = new MockSlingHttpServletRequest(null);
 
     private SlingHttpServletRequestWrapper requestWrapper;
 
@@ -156,7 +156,10 @@
         verify(request, times(1)).getAttribute("testValue");
         
         // If we clear the request attributes, the sling model is no longer cached
-        request.clearAttributes();
+        Enumeration<String> attributeNames = request.getAttributeNames();
+        while (attributeNames.hasMoreElements()) {
+            request.removeAttribute(attributeNames.nextElement());
+        }
         CachedModel cached3 = factory.getAdapter(request, CachedModel.class);
         assertNotSame(cached1, cached3);
     }
@@ -172,29 +175,5 @@
 
         verify(request, times(1)).getAttribute("testValue");
     }
-    
-    // MockSlingHttpServletRequest doesn't implement set and get attributes
-    private static class MockRequest extends MockSlingHttpServletRequest {
-
-        private Map<String, Object> attributes = new HashMap<>();
-        
-        MockRequest() {
-            super(null, null, null, null, null);
-        }
-        
-        @Override
-        public void setAttribute(String name, Object o) {
-            attributes.put(name, o);
-        }
-        
-        @Override
-        public Object getAttribute(String name) {
-            return attributes.get(name);
-        }
-        
-        public void clearAttributes() {
-            attributes.clear();
-        }
-    }
 }