SLING-10261 - remove ignored tests
diff --git a/src/test/java/org/apache/sling/distribution/it/DistributionAgentResourcesIntegrationTest.java b/src/test/java/org/apache/sling/distribution/it/DistributionAgentResourcesIntegrationTest.java
index e62dfed..edb3f67 100644
--- a/src/test/java/org/apache/sling/distribution/it/DistributionAgentResourcesIntegrationTest.java
+++ b/src/test/java/org/apache/sling/distribution/it/DistributionAgentResourcesIntegrationTest.java
@@ -20,7 +20,6 @@
import java.util.UUID;
-import org.junit.Ignore;
import org.junit.Test;
import static org.apache.sling.distribution.it.DistributionUtils.agentRootUrl;
@@ -181,20 +180,4 @@
assertNotExists(authorClient, "/etc/distribution/" + agentName);
}
-
- @Test
- @Ignore
- public void testAgentConfigurationResourceUpdate() throws Exception {
- String agentName = "sample-create-config" + UUID.randomUUID();
- String newConfigResource = authorAgentConfigUrl(agentName);
-
- authorClient.createNode(newConfigResource, "name", agentName);
- assertExists(authorClient, newConfigResource);
- authorClient.setProperties(newConfigResource, "packageExporter", "exporters/remote/updated");
- assertResponseContains(author, newConfigResource,
- "sling:resourceType", "sling/distribution/setting/agent",
- "name", agentName,
- "packageExporter", "updated");
- }
-
}
\ No newline at end of file
diff --git a/src/test/java/org/apache/sling/distribution/it/MultipleForwardDistributionTest.java b/src/test/java/org/apache/sling/distribution/it/MultipleForwardDistributionTest.java
index a60def5..325d03b 100644
--- a/src/test/java/org/apache/sling/distribution/it/MultipleForwardDistributionTest.java
+++ b/src/test/java/org/apache/sling/distribution/it/MultipleForwardDistributionTest.java
@@ -20,22 +20,15 @@
import org.apache.sling.distribution.DistributionRequestType;
import org.junit.After;
-import org.junit.Ignore;
import org.junit.Test;
import java.io.IOException;
-import javax.json.JsonArray;
-import javax.json.JsonObject;
-
-import static junit.framework.Assert.assertEquals;
import static org.apache.sling.distribution.it.DistributionUtils.assertExists;
import static org.apache.sling.distribution.it.DistributionUtils.assertNotExists;
import static org.apache.sling.distribution.it.DistributionUtils.assertPostResourceWithParameters;
import static org.apache.sling.distribution.it.DistributionUtils.createRandomNode;
import static org.apache.sling.distribution.it.DistributionUtils.distribute;
-import static org.apache.sling.distribution.it.DistributionUtils.doExport;
-import static org.apache.sling.distribution.it.DistributionUtils.getResource;
import static org.apache.sling.distribution.it.DistributionUtils.queueUrl;
/**
@@ -62,37 +55,6 @@
assertNotExists(publishClient, nodePath);
}
- @Ignore
- @Test
- public void testAddContentCheckPassiveQueue() throws Exception {
- String nodePath = createRandomNode(authorClient, "/content/forward_add_" + System.nanoTime());
- assertExists(authorClient, nodePath);
- distribute(author, "publish-multiple", DistributionRequestType.ADD, nodePath);
- assertExists(publishClient, nodePath);
-
- {
- JsonObject json = getResource(author, queueUrl("publish-multiple") + "/passivequeue1");
-
- JsonArray queueItems = json.getJsonArray("items");
- assertEquals(1, queueItems.size());
- assertEquals(1, json.get("itemsCount"));
- }
-
-
- String content = doExport(author, "publish-multiple-passivequeue1", DistributionRequestType.PULL, null);
-
- {
- JsonObject json = getResource(author, queueUrl("publish-multiple") + "/passivequeue1");
-
- JsonArray queueItems = json.getJsonArray("items");
- assertEquals(0, queueItems.size());
- assertEquals(0, json.get("itemsCount"));
- }
-
- }
-
-
-
@After
public void clean() throws IOException {
assertPostResourceWithParameters(author, 200, queueUrl("publish-multiple") + "/endpoint1",
diff --git a/src/test/java/org/apache/sling/distribution/it/MultipleQueueDistributionTest.java b/src/test/java/org/apache/sling/distribution/it/MultipleQueueDistributionTest.java
deleted file mode 100644
index 905ed57..0000000
--- a/src/test/java/org/apache/sling/distribution/it/MultipleQueueDistributionTest.java
+++ /dev/null
@@ -1,166 +0,0 @@
-/*
- * 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.it;
-
-
-import org.apache.sling.distribution.DistributionRequestType;
-import org.junit.After;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static org.apache.sling.distribution.it.DistributionUtils.assertExists;
-import static org.apache.sling.distribution.it.DistributionUtils.assertPostResourceWithParameters;
-import static org.apache.sling.distribution.it.DistributionUtils.createRandomNode;
-import static org.apache.sling.distribution.it.DistributionUtils.distribute;
-import static org.apache.sling.distribution.it.DistributionUtils.queueUrl;
-
-/**
- * Integration test for forward distribution
- */
-public class MultipleQueueDistributionTest extends DistributionIntegrationTestBase {
-
- final static String DELETE_LIMIT = "100";
-
- @Ignore
- @Test
- public void testQueues() throws Exception {
- Map<String, Map<String, Object>> queues = DistributionUtils.getQueues(author, "queue-multiple");
- assertEquals(2, queues.size());
- assertNotNull(queues.get("endpoint1"));
- assertEquals(true, queues.get("endpoint1").get("empty"));
- assertNotNull(queues.get("endpoint2"));
- assertEquals(true, queues.get("endpoint2").get("empty"));
-
-
- }
-
- @Ignore
- @Test
- public void testDistributeQueues() throws Exception {
-
- String nodePath = createRandomNode(authorClient, "/content/forward_add_" + System.nanoTime());
- assertExists(authorClient, nodePath);
-
-
- // Add two items in both queues
- distribute(author, "queue-multiple", DistributionRequestType.ADD, nodePath);
- distribute(author, "queue-multiple", DistributionRequestType.DELETE, nodePath);
-
- Map<String, Map<String, Object>> queues = DistributionUtils.getQueues(author, "queue-multiple");
- List<Map<String, Object>> firstQueueItems = DistributionUtils.getQueueItems(author, queueUrl("queue-multiple") + "/endpoint1");
- List<Map<String, Object>> secondQueueItems = DistributionUtils.getQueueItems(author, queueUrl("queue-multiple") + "/endpoint2");
-
- assertEquals(2, queues.size());
- assertEquals(false, queues.get("endpoint1").get("empty"));
- assertEquals(2, queues.get("endpoint1").get("itemsCount"));
- assertEquals(false, queues.get("endpoint2").get("empty"));
- assertEquals(2, queues.get("endpoint2").get("itemsCount"));
- assertEquals(2, firstQueueItems.size());
- assertEquals("ADD", firstQueueItems.get(0).get("action"));
- assertEquals(DistributionUtils.DISTRIBUTOR_USER, firstQueueItems.get(0).get("userid"));
- assertEquals("DELETE", firstQueueItems.get(1).get("action"));
- assertEquals(2, secondQueueItems.size());
- assertEquals("ADD", secondQueueItems.get(0).get("action"));
- assertEquals("DELETE", secondQueueItems.get(1).get("action"));
-
- String secondId = (String) firstQueueItems.get(0).get("id");
-
-
- // Delete second item from endpoint1
- assertPostResourceWithParameters(author, 200, queueUrl("queue-multiple") + "/endpoint1",
- "operation", "delete", "id", secondId);
-
- queues = DistributionUtils.getQueues(author, "queue-multiple");
-
- assertEquals(false, queues.get("endpoint1").get("empty"));
- assertEquals(1, queues.get("endpoint1").get("itemsCount"));
- assertEquals("ADD", firstQueueItems.get(0).get("action"));
- assertEquals(false, queues.get("endpoint2").get("empty"));
- assertEquals(2, queues.get("endpoint2").get("itemsCount"));
-
- // Delete 2 items from endpoint2
- assertPostResourceWithParameters(author, 200, queueUrl("queue-multiple") + "/endpoint2",
- "operation", "delete", "limit", "2");
-
- queues = DistributionUtils.getQueues(author, "queue-multiple");
-
- assertEquals(false, queues.get("endpoint1").get("empty"));
- assertEquals(1, queues.get("endpoint1").get("itemsCount"));
- assertEquals(true, queues.get("endpoint2").get("empty"));
- assertEquals(0, queues.get("endpoint2").get("itemsCount"));
- }
-
- @Ignore
- @Test
- public void testCopyDistributeQueues() throws Exception {
-
- String nodePath = createRandomNode(authorClient, "/content/forward_add_" + System.nanoTime());
- assertExists(authorClient, nodePath);
-
-
- // Add two items in both queues
- distribute(author, "queue-multiple", DistributionRequestType.ADD, nodePath);
-
- Map<String, Map<String, Object>> queues = DistributionUtils.getQueues(author, "queue-multiple");
- assertEquals(1, queues.get("endpoint1").get("itemsCount"));
- assertEquals(1, queues.get("endpoint2").get("itemsCount"));
- assertPostResourceWithParameters(author, 200, queueUrl("queue-multiple") + "/endpoint1",
- "operation", "delete", "limit", DELETE_LIMIT);
-
- queues = DistributionUtils.getQueues(author, "queue-multiple");
- assertEquals(0, queues.get("endpoint1").get("itemsCount"));
- assertEquals(1, queues.get("endpoint2").get("itemsCount"));
-
- List<Map<String, Object>> firstQueueItems = DistributionUtils.getQueueItems(author, queueUrl("queue-multiple") + "/endpoint1");
- List<Map<String, Object>> secondQueueItems = DistributionUtils.getQueueItems(author, queueUrl("queue-multiple") + "/endpoint2");
-
- assertEquals(0, firstQueueItems.size());
- assertEquals(1, secondQueueItems.size());
-
-
- String secondQueueItemId = (String) secondQueueItems.get(0).get("id");
-
- assertPostResourceWithParameters(author, 200, queueUrl("queue-multiple") + "/endpoint1",
- "operation", "copy", "id", secondQueueItemId, "from", "endpoint2");
-
- firstQueueItems = DistributionUtils.getQueueItems(author, queueUrl("queue-multiple") + "/endpoint1");
- secondQueueItems = DistributionUtils.getQueueItems(author, queueUrl("queue-multiple") + "/endpoint2");
-
- assertEquals(1, firstQueueItems.size());
- assertEquals(1, secondQueueItems.size());
- }
-
-
- @After
- public void clean() throws IOException {
- assertPostResourceWithParameters(author, 200, queueUrl("queue-multiple") + "/endpoint1",
- "operation", "delete", "limit", DELETE_LIMIT);
-
- assertPostResourceWithParameters(author, 200, queueUrl("queue-multiple") + "/endpoint2",
- "operation", "delete", "limit", DELETE_LIMIT);
-
- }
-
-}
diff --git a/src/test/java/org/apache/sling/distribution/it/triggers/DistributionTriggerResourcesTest.java b/src/test/java/org/apache/sling/distribution/it/triggers/DistributionTriggerResourcesTest.java
deleted file mode 100644
index c543d54..0000000
--- a/src/test/java/org/apache/sling/distribution/it/triggers/DistributionTriggerResourcesTest.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.it.triggers;
-
-
-import org.apache.sling.distribution.it.DistributionIntegrationTestBase;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.apache.sling.distribution.it.DistributionUtils.assertExists;
-import static org.apache.sling.distribution.it.DistributionUtils.triggerUrl;
-
-@Ignore
-public class DistributionTriggerResourcesTest extends DistributionIntegrationTestBase {
-
- @Test
- public void testTestTriggersOnAuthor() throws Exception {
- String[] names = new String[]{
- "test-content-event",
- "test-remote-event",
- "test-distribute-event",
- "test-scheduled-event",
- "test-persisting-event"
- };
- for (String name : names) {
- assertExists(authorClient, triggerUrl(name));
- }
- }
-}
diff --git a/src/test/java/org/apache/sling/distribution/it/triggers/ScheduledDistributionTriggerTest.java b/src/test/java/org/apache/sling/distribution/it/triggers/ScheduledDistributionTriggerTest.java
deleted file mode 100644
index 1ea6e7d..0000000
--- a/src/test/java/org/apache/sling/distribution/it/triggers/ScheduledDistributionTriggerTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.it.triggers;
-
-import org.apache.sling.distribution.it.DistributionIntegrationTestBase;
-import org.junit.Ignore;
-import org.junit.Test;
-
-import static org.apache.sling.distribution.it.DistributionUtils.assertResponseContains;
-import static org.apache.sling.distribution.it.DistributionUtils.triggerEventUrl;
-
-@Ignore
-
-public class ScheduledDistributionTriggerTest extends DistributionIntegrationTestBase {
-
- @Test
- public void testTestTriggersOnAuthor() throws Exception {
- assertResponseContains(author, triggerEventUrl("test-scheduled-event"), "PULL");
- }
-}
