You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/09/03 11:04:24 UTC
svn commit: r1519606 - in /openmeetings/trunk/singlewebapp: ./
src/main/java/org/apache/openmeetings/installation/
src/main/java/org/apache/openmeetings/persistence/beans/lang/
src/test/java/org/apache/openmeetings/test/backup/
src/test/java/org/apache...
Author: solomax
Date: Tue Sep 3 09:04:23 2013
New Revision: 1519606
URL: http://svn.apache.org/r1519606
Log:
[OPENMEETINGS-778] tests are modified to check labels count in DB;
source tree cleanup (nightly tests are not using root for tests)
Modified:
openmeetings/trunk/singlewebapp/build.xml
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
Modified: openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/build.xml?rev=1519606&r1=1519605&r2=1519606&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/build.xml (original)
+++ openmeetings/trunk/singlewebapp/build.xml Tue Sep 3 09:04:23 2013
@@ -777,7 +777,8 @@
<junit maxmemory="1024m" printsummary="yes" dir="${junit.base.dir}" tempdir="${junit.base.dir}" fork="yes"
forkmode="perBatch" failureproperty="junit.failed" errorproperty="junit.error">
<classpath refid="junit.classpath" />
- <jvmarg value="-Dom.home=${webapp.dir}" />
+ <jvmarg value="-Dom.home=${basedir}/${om.dist.webapp}" />
+ <jvmarg value="-Dlanguages.home=${webapp.dir}/languages" />
<jvmarg value="-Dred5.root=${red5.root}" />
<jvmarg value="-Dbasedir=${basedir}" />
<jvmarg value="-Dred5.config_root=${red5.root}/conf" />
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java?rev=1519606&r1=1519605&r2=1519606&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/installation/ImportInitvalues.java Tue Sep 3 09:04:23 2013
@@ -843,9 +843,7 @@ public class ImportInitvalues {
}
}
- public void loadLanguagesFile(
- Map<Integer, Map<String, Object>> listlanguages,
- Map<Long, Fieldvalues> fieldCache, int langId)
+ public void loadLanguagesFile(Map<Integer, Map<String, Object>> listlanguages, Map<Long, Fieldvalues> fieldCache, int langId)
throws Exception {
Map<String, Object> langMap = listlanguages.get(langId);
log.debug("loadInitLanguages lang: " + langMap);
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java?rev=1519606&r1=1519605&r2=1519606&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/persistence/beans/lang/FieldLanguage.java Tue Sep 3 09:04:23 2013
@@ -130,4 +130,10 @@ public class FieldLanguage implements Se
}
return result;
}
+
+ @Override
+ public String toString() {
+ return "FieldLanguage [id=" + language_id + ", name=" + name + ", deleted=" + deleted + ", rtl=" + rtl + ", code=" + code
+ + "]";
+ }
}
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java?rev=1519606&r1=1519605&r2=1519606&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/backup/TestOldBackups.java Tue Sep 3 09:04:23 2013
@@ -18,13 +18,13 @@
*/
package org.apache.openmeetings.test.backup;
+import static org.apache.openmeetings.OpenmeetingsVariables.webAppRootKey;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.File;
import java.io.FileInputStream;
-import org.apache.openmeetings.OpenmeetingsVariables;
import org.apache.openmeetings.data.calendar.daos.AppointmentDao;
import org.apache.openmeetings.data.calendar.daos.MeetingMemberDao;
import org.apache.openmeetings.data.conference.RoomManager;
@@ -39,8 +39,7 @@ import org.slf4j.Logger;
import org.springframework.beans.factory.annotation.Autowired;
public class TestOldBackups extends AbstractOpenmeetingsSpringTest {
- private static final Logger log = Red5LoggerFactory.getLogger(
- TestOldBackups.class, OpenmeetingsVariables.webAppRootKey);
+ private static final Logger log = Red5LoggerFactory.getLogger(TestOldBackups.class, webAppRootKey);
@Autowired
private BackupImport backupController;
Modified: openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java?rev=1519606&r1=1519605&r2=1519606&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java (original)
+++ openmeetings/trunk/singlewebapp/src/test/java/org/apache/openmeetings/test/labels/FillLabels.java Tue Sep 3 09:04:23 2013
@@ -18,6 +18,8 @@
*/
package org.apache.openmeetings.test.labels;
+import static org.junit.Assert.assertEquals;
+
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileOutputStream;
@@ -27,8 +29,12 @@ import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Map.Entry;
+import org.apache.openmeetings.data.basic.FieldLanguageDao;
+import org.apache.openmeetings.data.basic.FieldValueDao;
+import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.persistence.beans.lang.Fieldvalues;
+import org.apache.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.apache.openmeetings.utils.LangExport;
import org.apache.openmeetings.utils.OmFileHelper;
import org.dom4j.Document;
@@ -36,6 +42,7 @@ import org.dom4j.DocumentException;
import org.dom4j.Element;
import org.dom4j.io.SAXReader;
import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
/**
* Syncs all labels from a given master language file to all language files You
@@ -57,15 +64,16 @@ import org.junit.Test;
* @author sebawagner
*
*/
-public class FillLabels {
-
+public class FillLabels extends AbstractOpenmeetingsSpringTest {
private final String basePath = "languages/";
-
private final String masterLangFile = "english.xml";
-
private final String[] excludeFiles = { "errorvalues.xml",
"countries.xml", "timezones.xml", "languages.xml" };
-
+ @Autowired
+ private FieldLanguageDao fieldLanguageDao;
+ @Autowired
+ private FieldValueDao fieldValueDao;
+
/**
* those labels will be overwritten from the master to all language files,
* other label-id's will be only filled up if missing at the end of the
@@ -76,10 +84,26 @@ public class FillLabels {
private Map<Long, Fieldlanguagesvalues> masterLabels;
@Test
+ public void testCount() throws Exception {
+ FieldLanguage prevLanguage = null;
+ long prevCount = -1;
+ for (FieldLanguage l : fieldLanguageDao.getLanguages()) {
+ long count = fieldValueDao.count(l.getLanguage_id(), null);
+ if (prevLanguage != null) {
+ assertEquals(String.format("Language: %s contains %d labels while %s contains %d labels"
+ , prevLanguage.getCode(), prevCount, l.getCode(), count), prevCount, count);
+ }
+ prevLanguage = l;
+ prevCount = count;
+ }
+ }
+
+ @Test
public void test() throws Exception {
+ String languagesFolder = System.getProperty("languages.home", null);
OmFileHelper.setOmHome(System.getProperty("om.home", "."));
// Read master file
- File base = new File(OmFileHelper.getOmHome(), basePath);
+ File base = null == languagesFolder ? new File(OmFileHelper.getOmHome(), basePath) : new File(languagesFolder);
masterLabels = parseToLabelsArray(new File(base, masterLangFile));
File langFolder = new File(OmFileHelper.getOmHome(), basePath);