Fix unit test

Author: Hai Nguyen

mycollab-app-community/src/main/txt/README.md

@@ -53,7 +53,7 @@ Version 4.5.5
 
 **Improvements**
 
-* Add user comment to activity stream
+* Add user comment to the activity stream
 
 **Bug Fixes**
 

mycollab-services-community/src/test/java/com/esofthead/mycollab/module/project/service/ProjectServiceTest.java

@@ -62,7 +62,7 @@ public void testSaveProject() {
 		assertThat(projectId).isGreaterThan(0);
 	}
 
-	@SuppressWarnings({"rawtypes", "unchecked"})
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@DataSet
 	@Test
 	public void testGetListProjects() {
@@ -74,7 +74,7 @@ public void testGetListProjects() {
 				tuple(2, "B"), tuple(3, "C"), tuple(4, "D"));
 	}
 
-	@SuppressWarnings({"rawtypes", "unchecked"})
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@DataSet
 	@Test
 	public void testGetListProjectsByCriteria() {
@@ -89,7 +89,7 @@ public void testGetListProjectsByCriteria() {
 				tuple(2, "B"), tuple(3, "C"), tuple(4, "D"));
 	}
 
-	@SuppressWarnings({"rawtypes", "unchecked"})
+	@SuppressWarnings({ "rawtypes", "unchecked" })
 	@DataSet
 	@Test
 	public void testGetListProjectsByUsername() {
@@ -124,7 +124,7 @@ public void testGetProjectsUserInvolved() {
 	public void testGetActivityStreams() {
 		ActivityStreamSearchCriteria criteria = new ActivityStreamSearchCriteria();
 		criteria.setModuleSet(new SetSearchField<String>(
-				new String[]{ModuleNameConstants.PRJ}));
+				new String[] { ModuleNameConstants.PRJ }));
 		criteria.setExtraTypeIds(new SetSearchField<Integer>(4));
 		criteria.setSaccountid(new NumberSearchField(1));
 		List<ProjectActivityStream> streams = projectActivityStreamService
@@ -133,7 +133,7 @@ public void testGetActivityStreams() {
 
 		assertThat(streams.size()).isEqualTo(3);
 		assertThat(streams).extracting("type", "typeid", "itemKey").contains(
-				tuple("Project-Task", 1, 10), tuple("Project-Bug", 1, 20),
-				tuple("Project-Risk", 1, null));
+				tuple("Project-Bug", "1", 20), tuple("Project-Task", "1", 10),
+				tuple("Project-Risk", "1", null));
 	}
 }

mycollab-services-community/src/test/resources/com/esofthead/mycollab/module/project/service/ProjectServiceTest.xml

@@ -53,11 +53,11 @@
         id="1" />
 
     <s_activitystream typeId="1" id="2" type="Project-Task" module="Project"
-        sAccountId="1" extraTypeId="4" createdUser="admin" />
+        sAccountId="1" extraTypeId="4" createdUser="admin" action="create" />
 
     <s_activitystream typeId="1" id="1" type="Project-Bug" module="Project"
-        sAccountId="1" extraTypeId="4" createdUser="admin" />
+        sAccountId="1" extraTypeId="4" createdUser="admin" action="create" />
 
     <s_activitystream typeId="1" id="3" type="Project-Risk" module="Project"
-        sAccountId="1" extraTypeId="4" createdUser="admin" />
+        sAccountId="1" extraTypeId="4" createdUser="admin" action="create" />
 </dataset>

mycollab-test/src/main/resources/log4j-test.properties

@@ -14,7 +14,7 @@ log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %t %c{1}:%L - %m
 log4j.logger.fr.xebia.servlet.filter.ExpiresFilter=INFO
 log4j.logger.com.esofthead = DEBUG
 log4j.logger.db.migration = INFO
-log4j.logger.org.springframework = INFO
+log4j.logger.org.springframework = DEBUG
 log4j.logger.org.restlet = INFO
 log4j.logger.org.apache.ibatis=DEBUG