svn commit: r1664351 - in /sling/trunk/testing/mocks/osgi-mock/src: main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java

[sseifert]

Author: sseifert
Date: Thu Mar  5 14:05:16 2015
New Revision: 1664351

URL: http://svn.apache.org/r1664351
Log:
SLING-4472 MockBundleContent.getProperty should return null

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

Modified: 
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java?rev=1664351&r1=1664350&r2=1664351&view=diff
==============================================================================
--- 
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
 (original)
+++ 
sling/trunk/testing/mocks/osgi-mock/src/main/java/org/apache/sling/testing/mock/osgi/MockBundleContext.java
 Thu Mar  5 14:05:16 2015
@@ -255,12 +255,13 @@ class MockBundleContext implements Bundl
         return new Bundle[0];
     }
 
-    // --- unsupported operations ---
     @Override
     public String getProperty(final String s) {
-        throw new UnsupportedOperationException();
+        // no mock implementation, simulate that no property is found and 
return null
+        return null;
     }
 
+    // --- unsupported operations ---
     @Override
     public Bundle installBundle(final String s) {
         throw new UnsupportedOperationException();

Modified: 
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
URL: 
http://svn.apache.org/viewvc/sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java?rev=1664351&r1=1664350&r2=1664351&view=diff
==============================================================================
--- 
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
 (original)
+++ 
sling/trunk/testing/mocks/osgi-mock/src/test/java/org/apache/sling/testing/mock/osgi/MockBundleContextTest.java
 Thu Mar  5 14:05:16 2015
@@ -173,4 +173,9 @@ public class MockBundleContextTest {
         bundleContext.removeFrameworkListener(null);
     }
 
+    @Test
+    public void testGetProperty() {
+        assertNull(bundleContext.getProperty("anyProperty"));
+    }
+
 }