[felix-dev] branch master updated: FELIX-6429 : Adding test showing the problem

[cziegeler]

This is an automated email from the ASF dual-hosted git repository.

cziegeler pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/felix-dev.git


The following commit(s) were added to refs/heads/master by this push:
     new 1269593  FELIX-6429 : Adding test showing the problem
1269593 is described below

commit 126959332207692c508f1733bcafc39c072a2c48
Author: Carsten Ziegeler <cziege...@apache.org>
AuthorDate: Sat Sep 11 10:04:56 2021 +0200

    FELIX-6429 : Adding test showing the problem
---
 .../felix/framework/ServiceRegistryTest.java       | 51 +++++++++++++++++++---
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git 
a/framework/src/test/java/org/apache/felix/framework/ServiceRegistryTest.java 
b/framework/src/test/java/org/apache/felix/framework/ServiceRegistryTest.java
index 3c8e478..b5f3c73 100644
--- 
a/framework/src/test/java/org/apache/felix/framework/ServiceRegistryTest.java
+++ 
b/framework/src/test/java/org/apache/felix/framework/ServiceRegistryTest.java
@@ -18,6 +18,10 @@
  */
 package org.apache.felix.framework;
 
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.nullValue;
+import static org.hamcrest.MatcherAssert.assertThat;
+
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,8 +36,6 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import junit.framework.TestCase;
-
 import org.apache.felix.framework.ServiceRegistrationImpl.ServiceReferenceImpl;
 import org.apache.felix.framework.ServiceRegistry.ServiceHolder;
 import org.apache.felix.framework.ServiceRegistry.UsageCount;
@@ -45,6 +47,7 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleContext;
+import org.osgi.framework.PrototypeServiceFactory;
 import org.osgi.framework.ServiceEvent;
 import org.osgi.framework.ServiceException;
 import org.osgi.framework.ServiceFactory;
@@ -54,9 +57,7 @@ import org.osgi.framework.hooks.service.EventHook;
 import org.osgi.framework.hooks.service.FindHook;
 import org.osgi.framework.hooks.service.ListenerHook;
 
-import static org.hamcrest.CoreMatchers.is;
-import static org.hamcrest.CoreMatchers.nullValue;
-import static org.hamcrest.MatcherAssert.assertThat;
+import junit.framework.TestCase;
 
 public class ServiceRegistryTest extends TestCase
 {
@@ -1070,7 +1071,7 @@ public class ServiceRegistryTest extends TestCase
                             }
                         }
 
-                    };
+                    }
 
                     @Override
                     public Observer getService(Bundle bundle, 
ServiceRegistration<Observer> registration)
@@ -1274,6 +1275,44 @@ public class ServiceRegistryTest extends TestCase
         assertThat(sr.getServicesInUse(clientBundle), nullValue());
     }
 
+    public void testPrototypeService() throws Exception
+    {
+        ServiceRegistry sr = new ServiceRegistry(null, null);
+        Bundle regBundle = Mockito.mock(Bundle.class);
+
+        final PrototypeServiceFactory<String> psv = new 
PrototypeServiceFactory<String>()
+        {
+
+            @Override
+            public void ungetService(Bundle bundle, 
ServiceRegistration<String> registration, String service)
+            {
+            }
+
+            @Override
+            public String getService(Bundle bundle, 
ServiceRegistration<String> registration) {
+                return "foo";
+            }
+        };
+
+        ServiceRegistration reg = sr.registerService(
+                regBundle, new String [] {String.class.getName()}, psv, null);
+
+        @SuppressWarnings("unchecked")
+        ServiceReference<String> ref =  reg.getReference();
+
+        final String val = sr.getService(regBundle, ref, true);
+        assertEquals("foo", val);
+
+        // first unget is ok
+        assertTrue(sr.ungetService(regBundle, ref, val));
+        // second unget of the same object, should be ok to
+        // This sould return true, but current returns false, see FELIX-6429
+        assertFalse(sr.ungetService(regBundle, ref, val));
+        // ungetting an unknown object must return false
+        assertFalse(sr.ungetService(regBundle, ref, "bar"));
+
+    }
+
     private ServiceReference<String> registerService(ServiceRegistry sr, 
Bundle regBundle, String svcObj) {
         ServiceRegistration reg = sr.registerService(
                 regBundle, new String [] {String.class.getName()}, svcObj, 
null);