Added initial tests for PreferenceObjectBasedNotificationSet

java/com.sap.sse.security.test/src/com/sap/sse/security/test/JavaIoSerializablePreferenceConverter.java

@@ -0,0 +1,36 @@
+package com.sap.sse.security.test;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.util.Base64;
+
+import com.sap.sse.security.PreferenceConverter;
+
+public class JavaIoSerializablePreferenceConverter<T> implements PreferenceConverter<T> {
+    @Override
+    public String toString(T preference) {
+        try {
+            ByteArrayOutputStream stream = new ByteArrayOutputStream();
+            ObjectOutputStream oos = new ObjectOutputStream(stream);
+            oos.writeObject(preference);
+            oos.flush();
+            return Base64.getEncoder().encodeToString(stream.toByteArray());
+        } catch (IOException e) {
+            throw new IllegalStateException(e);
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public T toPreference(String stringPreference) {
+        try {
+            return (T) new ObjectInputStream(new ByteArrayInputStream(Base64.getDecoder().decode(stringPreference)))
+                    .readObject();
+        } catch (Exception e) {
+            throw new IllegalStateException(e);
+        }
+    }
+}

java/com.sap.sse.security.test/src/com/sap/sse/security/test/PreferenceObjectBasedNotificationSetTest.java

@@ -0,0 +1,136 @@
+package com.sap.sse.security.test;
+
+import java.net.UnknownHostException;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+
+import org.junit.Before;
+import org.junit.Test;
+
+import com.mongodb.DB;
+import com.mongodb.MongoException;
+import com.sap.sse.common.Util;
+import com.sap.sse.mongodb.MongoDBConfiguration;
+import com.sap.sse.mongodb.MongoDBService;
+import com.sap.sse.security.PreferenceObjectBasedNotificationSet;
+import com.sap.sse.security.UserStore;
+import com.sap.sse.security.userstore.mongodb.UserStoreImpl;
+import com.sap.sse.security.userstore.mongodb.impl.CollectionNames;
+
+import junit.framework.Assert;
+
+public class PreferenceObjectBasedNotificationSetTest {
+    
+    private static final String A = "a";
+    private static final String B = "b";
+    private static final String C = "c";
+
+    private UserStoreImpl store;
+    
+    private String user1 = "me";
+    private String user2 = "somebody_else";
+    
+    private JavaIoSerializablePreferenceConverter<HashSet<String>> prefConverter = new JavaIoSerializablePreferenceConverter<>();
+    private String prefKey = "prefKey";
+    private String otherPrefKey = "otherPrefKey";
+    private HashSet<String> values1 = values(A, B);
+    private HashSet<String> values2 = values(B, C);
+
+    @Before
+    public void setUp() throws UnknownHostException, MongoException {
+        final MongoDBConfiguration dbConfiguration = MongoDBConfiguration.getDefaultTestConfiguration();
+        final MongoDBService service = dbConfiguration.getService();
+        DB db = service.getDB();
+        db.getCollection(CollectionNames.USERS.name()).drop();
+        db.getCollection(CollectionNames.SETTINGS.name()).drop();
+        db.getCollection(CollectionNames.PREFERENCES.name()).drop();
+        db.getCollection(CollectionNames.PREFERENCES.name()).drop();
+        store = new UserStoreImpl();
+    }
+    
+    @Test
+    public void noPreferenceAvailableTest() {
+        PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store);
+        Assert.assertTrue(Util.isEmpty(notificationSet.getUsersnamesToNotifyFor(prefKey)));
+    }
+
+    @Test
+    public void preferenceAllreadySetTest() {
+        store.registerPreferenceConverter(prefKey, prefConverter);
+        store.setPreferenceObject(user1, prefKey, values1);
+        PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store);
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(A), values(user1)));
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(B), values(user1)));
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(C), values()));
+    }
+    
+    @Test
+    public void preferenceSetAfterNotificationSetCreationTest() {
+        store.registerPreferenceConverter(prefKey, prefConverter);
+        PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store);
+        store.setPreferenceObject(user1, prefKey, values1);
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(A), values(user1)));
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(B), values(user1)));
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(C), values()));
+    }
+    
+    @Test
+    public void preferenceSetForTwoUsersTest() {
+        store.registerPreferenceConverter(prefKey, prefConverter);
+        store.setPreferenceObject(user1, prefKey, values1);
+        store.setPreferenceObject(user2, prefKey, values2);
+        PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store);
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(A), values(user1)));
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(B), values(user1, user2)));
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(C), values(user2)));
+    }
+    
+    @Test
+    public void preferenceUpdateTest() {
+        store.registerPreferenceConverter(prefKey, prefConverter);
+        store.setPreferenceObject(user1, prefKey, values1);
+        PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store);
+        store.setPreferenceObject(user1, prefKey, values2);
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(A), values()));
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(B), values(user1)));
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(C), values(user1)));
+    }
+    
+    @Test
+    public void testForObjectThatIsntKnownTest() {
+        store.registerPreferenceConverter(prefKey, prefConverter);
+        store.setPreferenceObject(user1, prefKey, values1);
+        PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store);
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor("x"), values()));
+    }
+    
+    @Test
+    public void otherPrefDoesntInfluenceCalculationTest() {
+        store.registerPreferenceConverter(prefKey, prefConverter);
+        store.registerPreferenceConverter(otherPrefKey, prefConverter);
+        store.setPreferenceObject(user1, prefKey, values1);
+        store.setPreferenceObject(user1, otherPrefKey, values2);
+        PreferenceObjectBasedNotificationSetImpl notificationSet = new PreferenceObjectBasedNotificationSetImpl(prefKey, store);
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(A), values(user1)));
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(B), values(user1)));
+        Assert.assertTrue(Util.equals(notificationSet.getUsersnamesToNotifyFor(C), values()));
+    }
+    
+    private static HashSet<String> values(String... values) {
+        return new HashSet<>(Arrays.asList(values));
+    }
+    
+    private static class PreferenceObjectBasedNotificationSetImpl extends PreferenceObjectBasedNotificationSet<HashSet<String>, String> {
+
+        public PreferenceObjectBasedNotificationSetImpl(String key, UserStore store) {
+            super(key, store);
+        }
+
+        @Override
+        protected Collection<String> calculateObjectsToNotify(HashSet<String> preference) {
+            return preference;
+        }
+        
+    }
+}

java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserPreferenceObjectAndConverterTest.java

@@ -1,13 +1,7 @@
 package com.sap.sse.security.test;
 
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectInputStream;
-import java.io.ObjectOutputStream;
 import java.io.Serializable;
 import java.net.UnknownHostException;
-import java.util.Base64;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -16,7 +10,6 @@ import com.mongodb.DB;
 import com.mongodb.MongoException;
 import com.sap.sse.mongodb.MongoDBConfiguration;
 import com.sap.sse.mongodb.MongoDBService;
-import com.sap.sse.security.PreferenceConverter;
 import com.sap.sse.security.userstore.mongodb.UserStoreImpl;
 import com.sap.sse.security.userstore.mongodb.impl.CollectionNames;
 
@@ -143,30 +136,4 @@ public class UserPreferenceObjectAndConverterTest {
             return true;
         }
     }
-    
-    
-    public static class JavaIoSerializablePreferenceConverter<T> implements PreferenceConverter<T> {
-        @Override
-        public String toString(T preference) {
-            try {
-                ByteArrayOutputStream stream = new ByteArrayOutputStream();
-                ObjectOutputStream oos = new ObjectOutputStream(stream);
-                oos.writeObject(preference);
-                oos.flush();
-                return Base64.getEncoder().encodeToString(stream.toByteArray());
-            } catch (IOException e) {
-                throw new IllegalStateException(e);
-            }
-        }
-
-        @SuppressWarnings("unchecked")
-        @Override
-        public T toPreference(String stringPreference) {
-            try {
-                return (T) new ObjectInputStream(new ByteArrayInputStream(Base64.getDecoder().decode(stringPreference))).readObject();
-            } catch (Exception e) {
-                throw new IllegalStateException(e);
-            }
-        }
-    }
 }

java/com.sap.sse.security/src/com/sap/sse/security/PreferenceObjectBasedNotificationSet.java

@@ -42,7 +42,7 @@ public abstract class PreferenceObjectBasedNotificationSet<PrefT, T> {
 
     protected abstract Collection<T> calculateObjectsToNotify(PrefT preference);
 
-    private Iterable<String> getUsersToNotifyFor(T object) {
+    public Iterable<String> getUsersnamesToNotifyFor(T object) {
         // TODO use read lock
         synchronized (notifications) {
             return new HashSet<>(Util.get(notifications, object, Collections.emptySet()));
@@ -53,7 +53,7 @@ public abstract class PreferenceObjectBasedNotificationSet<PrefT, T> {
      * The given consumer will be called for every user that needs to be notified about the given object.
      */
     public void forUsersMappedTo(T object, Consumer<User> consumer) {
-        for (String username : getUsersToNotifyFor(object)) {
+        for (String username : getUsersnamesToNotifyFor(object)) {
             // User objects can change silently. So we just keep the usernames and get the associated user objects on
             // the fly.
             User user = store.getUserByName(username);