Author: davidb
Date: Thu May 14 09:36:08 2015
New Revision: 1679330
URL: http://svn.apache.org/r1679330
Log:
Additional unit test for the thread marking implemented in the Service
Registration.
Added:
felix/trunk/framework/src/test/java/org/apache/felix/framework/ServiceRegistrationImplTest.java
Added:
felix/trunk/framework/src/test/java/org/apache/felix/framework/ServiceRegistrationImplTest.java
URL:
http://svn.apache.org/viewvc/felix/trunk/framework/src/test/java/org/apache/felix/framework/ServiceRegistrationImplTest.java?rev=1679330&view=auto
==============================================================================
---
felix/trunk/framework/src/test/java/org/apache/felix/framework/ServiceRegistrationImplTest.java
(added)
+++
felix/trunk/framework/src/test/java/org/apache/felix/framework/ServiceRegistrationImplTest.java
Thu May 14 09:36:08 2015
@@ -0,0 +1,97 @@
+/*
+ * 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.felix.framework;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+
+import org.mockito.Mockito;
+import org.osgi.framework.Bundle;
+
+public class ServiceRegistrationImplTest extends TestCase
+{
+ public void testMarkCurrentThread() throws Exception
+ {
+ final ServiceRegistrationImpl sri = new ServiceRegistrationImpl(
+ new ServiceRegistry(null, null), Mockito.mock(Bundle.class),
+ new String [] {String.class.getName()}, 1L, "foo", null);
+
+ assertFalse(sri.currentThreadMarked());
+ sri.markCurrentThread();
+ assertTrue(sri.currentThreadMarked());
+
+ final List<Throwable> exceptions = new ArrayList<Throwable>();
+ Thread t = new TestThread(exceptions, new Runnable() {
+ @Override
+ public void run()
+ {
+ assertFalse(sri.currentThreadMarked());
+ sri.markCurrentThread();
+ assertTrue(sri.currentThreadMarked());
+ }
+ });
+ t.start();
+ t.join();
+ assertEquals("There should be no exceptions: " + exceptions, 0,
exceptions.size());
+
+ sri.unmarkCurrentThread();
+ assertFalse(sri.currentThreadMarked());
+
+ Thread t2 = new TestThread(exceptions, new Runnable() {
+ @Override
+ public void run()
+ {
+ assertFalse(sri.currentThreadMarked());
+ sri.markCurrentThread();
+ assertTrue(sri.currentThreadMarked());
+ sri.unmarkCurrentThread();
+ assertFalse(sri.currentThreadMarked());
+ }
+ });
+ t2.start();
+ t2.join();
+ assertEquals("There should be no exceptions: " + exceptions, 0,
exceptions.size());
+ }
+
+ static class TestThread extends Thread {
+ private final Runnable runnable;
+ private final List<Throwable> exceptions;
+
+ public TestThread(List<Throwable> exceptionList, Runnable runnable)
+ {
+ this.runnable = runnable;
+ this.exceptions = exceptionList;
+ }
+
+ @Override
+ public void run()
+ {
+ try
+ {
+ runnable.run();
+ }
+ catch (Throwable th)
+ {
+ exceptions.add(th);
+ }
+ }
+ }
+}
\ No newline at end of file
