Author: cziegeler
Date: Thu Apr 25 15:08:12 2013
New Revision: 1475815
URL: http://svn.apache.org/r1475815
Log:
Code cleanup
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/IgnoreQueueTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java?rev=1475815&r1=1475814&r2=1475815&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/jobs/config/InternalQueueConfigurationTest.java
Thu Apr 25 15:08:12 2013
@@ -24,21 +24,11 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-import java.util.Dictionary;
import java.util.HashMap;
-import java.util.Hashtable;
import java.util.Map;
-import org.apache.sling.event.jobs.JobUtil;
-import org.osgi.service.event.Event;
-
public class InternalQueueConfigurationTest {
- private Event getJobEvent(final String topic) {
- final Dictionary<String, Object> dict = new Hashtable<String,
Object>();
- dict.put(JobUtil.PROPERTY_JOB_TOPIC, topic);
- return new Event(topic, dict);
- }
@org.junit.Test public void testMaxParallel() {
final Map<String, Object> p = new HashMap<String, Object>();
p.put(ConfigurationConstants.PROP_MAX_PARALLEL, -1);
@@ -54,12 +44,12 @@ public class InternalQueueConfigurationT
InternalQueueConfiguration c =
InternalQueueConfiguration.fromConfiguration(p);
assertTrue(c.isValid());
- assertNotNull(c.match(getJobEvent("a/b").getTopic()));
- assertNotNull(c.match(getJobEvent("a/c").getTopic()));
- assertNull(c.match(getJobEvent("a").getTopic()));
- assertNull(c.match(getJobEvent("a/b/c").getTopic()));
- assertNull(c.match(getJobEvent("t").getTopic()));
- assertNull(c.match(getJobEvent("t/x").getTopic()));
+ assertNotNull(c.match("a/b"));
+ assertNotNull(c.match("a/c"));
+ assertNull(c.match("a"));
+ assertNull(c.match("a/b/c"));
+ assertNull(c.match("t"));
+ assertNull(c.match("t/x"));
}
@org.junit.Test public void testTopicMatchersStar() {
@@ -69,12 +59,12 @@ public class InternalQueueConfigurationT
InternalQueueConfiguration c =
InternalQueueConfiguration.fromConfiguration(p);
assertTrue(c.isValid());
- assertNotNull(c.match(getJobEvent("a/b").getTopic()));
- assertNotNull(c.match(getJobEvent("a/c").getTopic()));
- assertNull(c.match(getJobEvent("a").getTopic()));
- assertNotNull(c.match(getJobEvent("a/b/c").getTopic()));
- assertNull(c.match(getJobEvent("t").getTopic()));
- assertNull(c.match(getJobEvent("t/x").getTopic()));
+ assertNotNull(c.match("a/b"));
+ assertNotNull(c.match("a/c"));
+ assertNull(c.match("a"));
+ assertNotNull(c.match("a/b/c"));
+ assertNull(c.match("t"));
+ assertNull(c.match("t/x"));
}
@org.junit.Test public void testTopicMatchers() {
@@ -84,12 +74,12 @@ public class InternalQueueConfigurationT
InternalQueueConfiguration c =
InternalQueueConfiguration.fromConfiguration(p);
assertTrue(c.isValid());
- assertNull(c.match(getJobEvent("a/b").getTopic()));
- assertNull(c.match(getJobEvent("a/c").getTopic()));
- assertNotNull(c.match(getJobEvent("a").getTopic()));
- assertNull(c.match(getJobEvent("a/b/c").getTopic()));
- assertNull(c.match(getJobEvent("t").getTopic()));
- assertNull(c.match(getJobEvent("t/x").getTopic()));
+ assertNull(c.match("a/b"));
+ assertNull(c.match("a/c"));
+ assertNotNull(c.match("a"));
+ assertNull(c.match("a/b/c"));
+ assertNull(c.match("t"));
+ assertNull(c.match("t/x"));
}
@org.junit.Test public void testTopicMatcherAndReplacement() {
@@ -99,12 +89,12 @@ public class InternalQueueConfigurationT
InternalQueueConfiguration c =
InternalQueueConfiguration.fromConfiguration(p);
assertTrue(c.isValid());
- final Event b = getJobEvent("a/b");
- assertNotNull(c.match(b.getTopic()));
- assertEquals("test-queue-b", c.match(b.getTopic()));
- final Event d = getJobEvent("a/d");
- assertNotNull(c.match(d.getTopic()));
- assertEquals("test-queue-d", c.match(d.getTopic()));
+ final String b = "a/b";
+ assertNotNull(c.match(b));
+ assertEquals("test-queue-b", c.match(b));
+ final String d = "a/d";
+ assertNotNull(c.match(d));
+ assertEquals("test-queue-d", c.match(d));
}
@org.junit.Test public void testTopicMatchersDotAndSlash() {
@@ -114,12 +104,12 @@ public class InternalQueueConfigurationT
InternalQueueConfiguration c =
InternalQueueConfiguration.fromConfiguration(p);
assertTrue(c.isValid());
- assertNotNull(c.match(getJobEvent("a/b").getTopic()));
- assertNotNull(c.match(getJobEvent("a/c").getTopic()));
- assertNull(c.match(getJobEvent("a").getTopic()));
- assertNull(c.match(getJobEvent("a/b/c").getTopic()));
- assertNull(c.match(getJobEvent("t").getTopic()));
- assertNull(c.match(getJobEvent("t/x").getTopic()));
+ assertNotNull(c.match("a/b"));
+ assertNotNull(c.match("a/c"));
+ assertNull(c.match("a"));
+ assertNull(c.match("a/b/c"));
+ assertNull(c.match("t"));
+ assertNull(c.match("t/x"));
}
@org.junit.Test public void testTopicMatchersStarAndSlash() {
@@ -129,12 +119,12 @@ public class InternalQueueConfigurationT
InternalQueueConfiguration c =
InternalQueueConfiguration.fromConfiguration(p);
assertTrue(c.isValid());
- assertNotNull(c.match(getJobEvent("a/b").getTopic()));
- assertNotNull(c.match(getJobEvent("a/c").getTopic()));
- assertNull(c.match(getJobEvent("a").getTopic()));
- assertNotNull(c.match(getJobEvent("a/b/c").getTopic()));
- assertNull(c.match(getJobEvent("t").getTopic()));
- assertNull(c.match(getJobEvent("t/x").getTopic()));
+ assertNotNull(c.match("a/b"));
+ assertNotNull(c.match("a/c"));
+ assertNull(c.match("a"));
+ assertNotNull(c.match("a/b/c"));
+ assertNull(c.match("t"));
+ assertNull(c.match("t/x"));
}
@org.junit.Test public void testTopicMatcherAndReplacementAndSlash() {
@@ -144,12 +134,12 @@ public class InternalQueueConfigurationT
InternalQueueConfiguration c =
InternalQueueConfiguration.fromConfiguration(p);
assertTrue(c.isValid());
- final Event b = getJobEvent("a/b");
- assertNotNull(c.match(b.getTopic()));
- assertEquals("test-queue-b", c.match(b.getTopic()));
- final Event d = getJobEvent("a/d");
- assertNotNull(c.match(d.getTopic()));
- assertEquals("test-queue-d", c.match(d.getTopic()));
+ final String b = "a/b";
+ assertNotNull(c.match(b));
+ assertEquals("test-queue-b", c.match(b));
+ final String d = "a/d";
+ assertNotNull(c.match(d));
+ assertEquals("test-queue-d", c.match(d));
}
@org.junit.Test public void testNoTopicMatchers() {
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java?rev=1475815&r1=1475814&r2=1475815&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
Thu Apr 25 15:08:12 2013
@@ -55,8 +55,6 @@ public class ClassloadingTest extends Ab
private static final String QUEUE_NAME = "cltest";
private static final String TOPIC = "sling/cltest";
- private String queueConfPid;
-
@Override
@Before
public void setup() throws IOException {
@@ -70,8 +68,6 @@ public class ClassloadingTest extends Ab
orderedProps.put(ConfigurationConstants.PROP_TOPICS, TOPIC);
orderedConfig.update(orderedProps);
- this.queueConfPid = orderedConfig.getPid();
-
this.sleep(1000L);
}
@@ -126,7 +122,7 @@ public class ClassloadingTest extends Ab
// no jobs queued, none processed and no available
assertEquals(0,
jobManager.getStatistics().getNumberOfQueuedJobs());
assertEquals(1, count.get());
- assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC, -1).size());
+ assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC, -1, (Map<String, Object>[])null).size());
final String jobTopic =
(String)finishedEvents.get(0).getProperty(JobUtil.NOTIFICATION_PROPERTY_JOB_TOPIC);
assertNotNull(jobTopic);
@@ -167,7 +163,6 @@ public class ClassloadingTest extends Ab
// dao is an invisible class for the dynamic class loader as it is
not public
// therefore scheduling this job should fail!
final DataObject dao = new DataObject();
- dao.message = "Hello World";
// we start a single job
final Map<String, Object> props = new HashMap<String, Object>();
@@ -180,7 +175,7 @@ public class ClassloadingTest extends Ab
assertEquals(0, count.get());
assertEquals(0, finishedEvents.size());
- assertEquals(1, jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC + "/failed", -1).size());
+ assertEquals(1, jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC + "/failed", -1, (Map<String, Object>[])null).size());
assertEquals(0,
jobManager.getStatistics().getNumberOfQueuedJobs());
assertEquals(0,
jobManager.getStatistics().getNumberOfActiveJobs());
@@ -191,6 +186,6 @@ public class ClassloadingTest extends Ab
}
private static final class DataObject implements Serializable {
- public String message;
+ private static final long serialVersionUID = 1L;
}
}
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java?rev=1475815&r1=1475814&r2=1475815&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java
Thu Apr 25 15:08:12 2013
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEqu
import java.io.IOException;
import java.util.Dictionary;
import java.util.Hashtable;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.sling.event.impl.jobs.config.ConfigurationConstants;
@@ -104,10 +105,11 @@ public class DropQueueTest extends Abstr
// no jobs queued, none processed and no available
assertEquals(0,
jobManager.getStatistics().getNumberOfQueuedJobs());
assertEquals(0, count.get());
- assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC, -1).size());
+ assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC, -1, (Map<String, Object>[])null).size());
// let'see if restarting helps with a new queue config
final org.osgi.service.cm.Configuration cf =
this.configAdmin.getConfiguration(this.queueConfPid, null);
+ @SuppressWarnings("unchecked")
final Dictionary<String, Object> orderedProps = cf.getProperties();
orderedProps.put(ConfigurationConstants.PROP_TYPE,
QueueConfiguration.Type.UNORDERED.name());
@@ -120,7 +122,7 @@ public class DropQueueTest extends Abstr
// no jobs queued, none processed and no available
assertEquals(0,
jobManager.getStatistics().getNumberOfQueuedJobs());
assertEquals(0, count.get());
- assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC, -1).size());
+ assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC, -1, (Map<String, Object>[])null).size());
} finally {
jcReg.unregister();
ehReg.unregister();
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/IgnoreQueueTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/IgnoreQueueTest.java?rev=1475815&r1=1475814&r2=1475815&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/IgnoreQueueTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/IgnoreQueueTest.java
Thu Apr 25 15:08:12 2013
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertEqu
import java.io.IOException;
import java.util.Dictionary;
import java.util.Hashtable;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.sling.event.impl.jobs.config.ConfigurationConstants;
@@ -87,7 +88,7 @@ public class IgnoreQueueTest extends Abs
sleep(200);
// we wait until NUM_JOBS have been processed by the JobManager
- while ( jobManager.findJobs(JobManager.QueryType.ALL, TOPIC,
-1).size() < NUM_JOBS ) {
+ while ( jobManager.findJobs(JobManager.QueryType.ALL, TOPIC, -1,
(Map<String, Object>[])null).size() < NUM_JOBS ) {
sleep(200);
}
@@ -95,10 +96,11 @@ public class IgnoreQueueTest extends Abs
assertEquals(0,
jobManager.getStatistics().getNumberOfQueuedJobs());
assertEquals(0,
jobManager.getStatistics().getNumberOfProcessedJobs());
assertEquals(0, count.get());
- assertEquals(NUM_JOBS,
jobManager.findJobs(JobManager.QueryType.ALL, TOPIC, -1).size());
+ assertEquals(NUM_JOBS,
jobManager.findJobs(JobManager.QueryType.ALL, TOPIC, -1, (Map<String,
Object>[])null).size());
// let'see if restarting helps with a new queue config
final org.osgi.service.cm.Configuration cf =
this.configAdmin.getConfiguration(this.queueConfPid, null);
+ @SuppressWarnings("unchecked")
final Dictionary<String, Object> orderedProps = cf.getProperties();
orderedProps.put(ConfigurationConstants.PROP_TYPE,
QueueConfiguration.Type.UNORDERED.name());
@@ -113,7 +115,7 @@ public class IgnoreQueueTest extends Abs
assertEquals(0,
jobManager.getStatistics().getNumberOfQueuedJobs());
assertEquals(NUM_JOBS,
jobManager.getStatistics().getNumberOfProcessedJobs());
assertEquals(NUM_JOBS, count.get());
- assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC, -1).size());
+ assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
TOPIC, -1, (Map<String, Object>[])null).size());
} finally {
jcReg.unregister();
}
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java
URL:
http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java?rev=1475815&r1=1475814&r2=1475815&view=diff
==============================================================================
---
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java
(original)
+++
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java
Thu Apr 25 15:08:12 2013
@@ -30,10 +30,9 @@ import java.util.Collections;
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
+import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import javax.inject.Inject;
-
import org.apache.sling.event.impl.Barrier;
import org.apache.sling.event.impl.jobs.config.ConfigurationConstants;
import org.apache.sling.event.jobs.Job;
@@ -50,7 +49,6 @@ import org.ops4j.pax.exam.junit.JUnit4Te
import org.ops4j.pax.exam.spi.reactors.AllConfinedStagedReactorFactory;
import org.osgi.framework.ServiceRegistration;
import org.osgi.service.event.Event;
-import org.osgi.service.event.EventAdmin;
import org.osgi.service.event.EventHandler;
@RunWith(JUnit4TestRunner.class)
@@ -59,9 +57,6 @@ public class JobHandlingTest extends Abs
public static final String TOPIC = "sling/test";
- @Inject
- protected EventAdmin eventAdmin;
-
@Override
@Before
public void setup() throws IOException {
@@ -219,7 +214,7 @@ public class JobHandlingTest extends Abs
jobManager.addJob(TOPIC, "myid2", null);
cb.block();
- assertEquals(1, jobManager.findJobs(JobManager.QueryType.ALL,
"sling/test", -1).size());
+ assertEquals(1, jobManager.findJobs(JobManager.QueryType.ALL,
"sling/test", -1, (Map<String, Object>[])null).size());
// job is currently waiting, therefore cancel fails
final Event e1 = jobManager.findJob("sling/test",
Collections.singletonMap(JobUtil.PROPERTY_JOB_NAME, (Object)"myid2"));
assertNotNull(e1);
@@ -232,7 +227,7 @@ public class JobHandlingTest extends Abs
final Event e2 = jobManager.findJob("sling/test",
Collections.singletonMap(JobUtil.PROPERTY_JOB_NAME, (Object)"myid2"));
assertNotNull(e2);
assertTrue(jobManager.removeJob((String)e2.getProperty(JobUtil.JOB_ID)));
- assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
"sling/test", -1).size());
+ assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
"sling/test", -1, (Map<String, Object>[])null).size());
} finally {
jcReg.unregister();
}
@@ -259,13 +254,13 @@ public class JobHandlingTest extends Abs
jobManager.addJob(TOPIC, "myid3", null);
cb.block();
- assertEquals(1, jobManager.findJobs(JobManager.QueryType.ALL,
"sling/test", -1).size());
+ assertEquals(1, jobManager.findJobs(JobManager.QueryType.ALL,
"sling/test", -1, (Map<String, Object>[])null).size());
// job is currently sleeping, but force cancel always waits!
final Event e = jobManager.findJob("sling/test",
Collections.singletonMap(JobUtil.PROPERTY_JOB_NAME, (Object)"myid3"));
assertNotNull(e);
jobManager.forceRemoveJob((String)e.getProperty(JobUtil.JOB_ID));
// the job is now removed
- assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
"sling/test", -1).size());
+ assertEquals(0, jobManager.findJobs(JobManager.QueryType.ALL,
"sling/test", -1, (Map<String, Object>[])null).size());
} finally {
jcReg.unregister();
}
