rhbz736898 - Fix failing tests.

Reason for failure: incomplete test data in the dbunit file. Also add a version for the failsafe plugin so that -Dit.test works again.
zanata · Apr 30, 2012 · 5d4b170 · 5d4b170
1 parent 9478941
commit 5d4b170
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/zanata-war/pom.xml b/zanata-war/pom.xml
@@ -234,6 +234,7 @@
 			<!-- Configure Failsafe to run in integration-test phase -->
 			<plugin>
 				<artifactId>maven-failsafe-plugin</artifactId>
+                <version>2.11</version>
 				<executions>
 					<execution>
 						<id>integration-test</id>
@@ -262,8 +263,8 @@
 					</additionalClasspathElements>
 					<childDelegation>true</childDelegation>
 					<useSystemClassLoader>true</useSystemClassLoader>
-					<argLine xml:space="preserve">-Xmx1024m -XX:MaxPermSize=512m -XX:+UseConcMarkSweepGC
-						-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError
+					<argLine xml:space="preserve">-Xmx1024m -XX:MaxPermSize=512m -XX:+UseConcMarkSweepGC
+						-XX:+CMSClassUnloadingEnabled -XX:+HeapDumpOnOutOfMemoryError
 						-XX:HeapDumpPath=${project.build.directory} -Dsun.lang.ClassLoader.allowArraySyntax=true</argLine>
 					<classpathDependencyExcludes>
 						<classpathDependencyExclude>

diff --git a/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java b/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
@@ -173,7 +173,7 @@ public TranslatedDocResourceService(
          DocumentDAO documentDAO,
          TextFlowTargetDAO textFlowTargetDAO,
          ResourceUtils resourceUtils,
-         Identity identity,
+         ZanataIdentity identity,
          ETagUtils eTagUtils,
          LocaleService localeService,
          CopyTransService copyTransService,
@@ -187,6 +187,7 @@ public TranslatedDocResourceService(
       this.documentDAO = documentDAO;
       this.textFlowTargetDAO = textFlowTargetDAO;
       this.resourceUtils = resourceUtils;
+      this.identity = identity;
       this.eTagUtils = eTagUtils;
       this.localeServiceImpl = localeService;
       this.copyTransServiceImpl = copyTransService;

diff --git a/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java b/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
@@ -222,7 +222,7 @@ public boolean tryLogin()
             documentDAO,
             textFlowTargetDAO,
             resourceUtils,
-            identity,
+            mockIdentity,
             eTagUtils,
             localeService,
             copyTransService,

diff --git a/zanata-war/src/test/resources/org/zanata/test/model/AccountData.dbunit.xml b/zanata-war/src/test/resources/org/zanata/test/model/AccountData.dbunit.xml
@@ -80,97 +80,119 @@
         <HLocale_Member 
         	supportedLanguageId="3"
         	personId="1"
+            isCoordinator="false"
         />
 		<!-- es-ES -->
         <HLocale_Member 
         	supportedLanguageId="5"
         	personId="1"
+            isCoordinator="false"
         />
 		<!-- fr-FR -->
         <HLocale_Member 
         	supportedLanguageId="6"
         	personId="1"
+            isCoordinator="false"
         />
 		<!-- ja-JP -->
         <HLocale_Member 
         	supportedLanguageId="10"
         	personId="1"
+            isCoordinator="false"
         />
 		<!-- pt-BR -->
         <HLocale_Member 
         	supportedLanguageId="17"
         	personId="1"
+            isCoordinator="false"
         />
 		<!-- zh-CN -->
         <HLocale_Member 
         	supportedLanguageId="22"
         	personId="1"
+            isCoordinator="false"
         />
 		<!-- zh-TW -->
         <HLocale_Member 
         	supportedLanguageId="23"
         	personId="1"
+            isCoordinator="false"
         />
 <!--  
         <HLocale_Member 
         	supportedLanguageId="1"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="2"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="4"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="7"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="8"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="9"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="12"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="13"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="14"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="15"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="16"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="18"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="19"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="20"
         	personId="1"
+        	isCoordinator="false"
         />
         <HLocale_Member 
         	supportedLanguageId="21"
         	personId="1"
+        	isCoordinator="false"
         />
 -->
 </dataset>