svn commit: r1683189 - in /sling/trunk/testing/mocks/osgi-mock/src: main/java/org/apache/sling/testing/mock/osgi/MockBundle.java test/java/org/apache/sling/testing/mock/osgi/MockBundleTest.java

[sseifert]

Author: sseifert
Date: Tue Jun  2 21:25:07 2015
New Revision: 1683189

URL: http://svn.apache.org/r1683189
Log:
SLING-4771 Osgi Mock: Allow to set mock bundle symbolic name

Modified:
    
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
    
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleTest.java

Modified: 
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java?rev=1683189&r1=1683188&r2=1683189&view=diff
==============================================================================
--- 
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
 (original)
+++ 
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundle.java
 Tue Jun  2 21:25:07 2015
@@ -44,6 +44,7 @@ public final class MockBundle implements
     private final long bundleId;
     private final BundleContext bundleContext;
     private Map<String, String> headers = ImmutableMap.<String, String>of();
+    private String symbolicName = "mock-bundle";
 
     /**
      * Constructor
@@ -93,6 +94,18 @@ public final class MockBundle implements
         this.headers = value;
     }
 
+    @Override
+    public String getSymbolicName() {
+        return this.symbolicName;
+    }
+
+    /**
+     * Set symbolic name for mock bundle
+     * @param value Symbolic name
+     */
+    public void setSymbolicName(String value) {
+        this.symbolicName = value;
+    }
     
     // --- unsupported operations ---
     @Override
@@ -135,11 +148,6 @@ public final class MockBundle implements
         throw new UnsupportedOperationException();
     }
 
-    @Override
-    public String getSymbolicName() {
-        throw new UnsupportedOperationException();
-    }
-
     @Override
     public boolean hasPermission(final Object permission) {
         throw new UnsupportedOperationException();

Modified: 
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleTest.java?rev=1683189&r1=1683188&r2=1683189&view=diff
==============================================================================
--- 
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleTest.java
 (original)
+++ 
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleTest.java
 Tue Jun  2 21:25:07 2015
@@ -61,11 +61,15 @@ public class MockBundleTest {
 
     @Test
     public void testGetHeaders() {
-        assertTrue(bundle.getHeaders().isEmpty());
-        
         ((MockBundle)bundle).setHeaders(ImmutableMap.of("prop1", "value1"));
         assertEquals("value1", bundle.getHeaders().get("prop1"));
         assertEquals("value1", bundle.getHeaders("en").get("prop1"));
     }
 
+    @Test
+    public void testGetSymbolicName() throws Exception {
+        ((MockBundle)bundle).setSymbolicName("name-1");
+        assertEquals("name-1", bundle.getSymbolicName());
+    }
+
 }