gistfile1.diff

diff --git a/cis-modules/cis-management/cis-manager/cis-manager/src/test/java/org/societies/cis/manager/TestCisManager.java b/cis-modules/cis-management/cis-manager/cis-manager/src
index 86ff598..a0043f1 100644
--- a/cis-modules/cis-management/cis-manager/cis-manager/src/test/java/org/societies/cis/manager/TestCisManager.java
+++ b/cis-modules/cis-management/cis-manager/cis-manager/src/test/java/org/societies/cis/manager/TestCisManager.java
@@ -181,8 +181,8 @@ public class TestCisManager extends AbstractTransactionalJUnit4SpringContextTest
                System.out.println("in setup! cisManagerUnderTest.getSessionFactory(): "+sessionFactory);
                //ActivityFeed.setStaticSessionFactory(sessionFactory);
                //cisManagerUnderTest.setSessionFactory(sessionFactory);
-               cisManagerUnderTest.setSessionFactory(sessionFactory);
-               Mockito.when(ActivityFeed.startUp(anyString())).thenReturn(new ActivityFeed());
+               //cisManagerUnderTest.setSessionFactory(sessionFactory);^M
+               //Mockito.when(ActivityFeed.startUp(anyString())).thenReturn(new ActivityFeed());^M
                setUpFactory();
                
        }
@@ -198,7 +198,6 @@ public class TestCisManager extends AbstractTransactionalJUnit4SpringContextTest
                //      sessionFactory.getCurrentSession().disconnect();
 
        }
-       @Ignore
        @Test
        public void testConstructor() {
 
@@ -207,7 +206,6 @@ public class TestCisManager extends AbstractTransactionalJUnit4SpringContextTest
                cisManagerUnderTest.init();
                assertEquals(TEST_GOOD_JID, cisManagerUnderTest.cisManagerId.getJid());
        }
-       @Ignore
        @Test
        public void testCreateCIS() {
                
@@ -232,7 +230,6 @@ public class TestCisManager extends AbstractTransactionalJUnit4SpringContextTest
                
        
        }
-       @Ignore
        @Test
        public void testListCIS() throws InterruptedException, ExecutionException {
 
@@ -277,7 +274,6 @@ public class TestCisManager extends AbstractTransactionalJUnit4SpringContextTest
                 }
        
        }
-       @Ignore
        @Test
        public void testdeleteCIS() throws InterruptedException, ExecutionException {
 
@@ -320,7 +316,6 @@ public class TestCisManager extends AbstractTransactionalJUnit4SpringContextTest
        
        }
        
-       @Ignore
        //@Rollback
        @Test
        public void testAddMemberToOwnedCIS() throws InterruptedException, ExecutionException {
@@ -345,7 +340,6 @@ public class TestCisManager extends AbstractTransactionalJUnit4SpringContextTest
                }               
        
        }
-       @Ignore
        @Test
        public void listdMembersOnOwnedCIS() throws InterruptedException, ExecutionException {