SLING-4075 - Improve test coverage of SCD
* Add DistributionJcrUtils unit test coverage
diff --git a/src/test/java/org/apache/sling/distribution/util/DistributionJcrUtilsTest.java b/src/test/java/org/apache/sling/distribution/util/DistributionJcrUtilsTest.java
new file mode 100644
index 0000000..a202d56
--- /dev/null
+++ b/src/test/java/org/apache/sling/distribution/util/DistributionJcrUtilsTest.java
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.sling.distribution.util;
+
+import org.apache.jackrabbit.api.observation.JackrabbitEvent;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+import javax.jcr.RepositoryException;
+import javax.jcr.observation.Event;
+
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
+import static org.mockito.Mockito.when;
+
+public class DistributionJcrUtilsTest {
+
+ @Test
+ public void testIsSafeNonJackrabbitEvent() throws Exception {
+ Event event = Mockito.mock(Event.class);
+ assertFalse(DistributionJcrUtils.isSafe(event));
+ }
+
+ @Test
+ public void testIsSafeNonJackrabbitExternalEvent() throws Exception {
+ assertFalse(DistributionJcrUtils.isSafe(buildEvent(true, null)));
+ assertFalse(DistributionJcrUtils.isSafe(buildEvent(true, "user-data")));
+ }
+
+ @Test
+ public void testIsSafeNonJackrabbitNonExternalEvent() throws Exception {
+ assertTrue(DistributionJcrUtils.isSafe(buildEvent(false, null)));
+ assertTrue(DistributionJcrUtils.isSafe(buildEvent(false, "user-data")));
+ assertFalse(DistributionJcrUtils.isSafe(buildEvent(false, "do.not.distribute")));
+ }
+
+ private JackrabbitEvent buildEvent(boolean external, String userData)
+ throws RepositoryException {
+ JackrabbitEvent event = Mockito.mock(JackrabbitEvent.class);
+ when(event.isExternal()).thenReturn(external);
+ when(event.getUserData()).thenReturn(userData);
+ return event;
+ }
+}
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/distribution/util/RequestUtilsTest.java b/src/test/java/org/apache/sling/distribution/util/RequestUtilsTest.java
index 7b42b5d..9199135 100644
--- a/src/test/java/org/apache/sling/distribution/util/RequestUtilsTest.java
+++ b/src/test/java/org/apache/sling/distribution/util/RequestUtilsTest.java
@@ -24,7 +24,6 @@
import org.apache.sling.distribution.DistributionRequestType;
import org.junit.Test;
-import static org.apache.sling.distribution.util.RequestUtils.fromServletRequest;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.mock;
@@ -40,14 +39,14 @@
@Test
public void testFromServletRequest() throws Exception {
- DistributionRequest dr = fromServletRequest(buildServletRequest(REQ_TYPE.toString(), P_PATHS, "true"));
+ DistributionRequest dr = RequestUtils.fromServletRequest(buildServletRequest(REQ_TYPE.toString(), P_PATHS, "true"));
assertEquals(REQ_TYPE, dr.getRequestType());
assertArrayEquals(P_PATHS, dr.getPaths());
}
@Test
public void testFromServletRequestEmptyPath() throws Exception {
- DistributionRequest dr = fromServletRequest(buildServletRequest(REQ_TYPE.toString(), null, "true"));
+ DistributionRequest dr = RequestUtils.fromServletRequest(buildServletRequest(REQ_TYPE.toString(), null, "true"));
assertEquals(REQ_TYPE, dr.getRequestType());
assertArrayEquals(EMPTY_PATHS, dr.getPaths());
}
