Revision: 4064
Author: solomax666
Date: Wed Aug 17 09:28:37 2011
Log: - test for ErrorService is added (to test injection works as
expected)
http://code.google.com/p/openmeetings/source/detail?r=4064
Added:
/branches/dev/injection/src/test/org/openmeetings/test/service
/branches/dev/injection/src/test/org/openmeetings/test/service/TestErrorService.java
Modified:
/branches/dev/injection/build.xml
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
/branches/dev/injection/src/app/org/openmeetings/app/remote/LanguageService.java
=======================================
--- /dev/null
+++
/branches/dev/injection/src/test/org/openmeetings/test/service/TestErrorService.java
Wed Aug 17 09:28:37 2011
@@ -0,0 +1,28 @@
+package org.openmeetings.test.service;
+
+import org.junit.Test;
+import org.openmeetings.app.persistence.beans.lang.FieldLanguage;
+import org.openmeetings.app.remote.ErrorService;
+import org.openmeetings.app.remote.LanguageService;
+import org.openmeetings.test.AbstractOpenmeetingsSpringTest;
+import org.springframework.beans.factory.annotation.Autowired;
+import static junit.framework.Assert.assertNotNull;
+
+public class TestErrorService extends AbstractOpenmeetingsSpringTest {
+ @Autowired
+ private LanguageService languageService;
+ @Autowired
+ private ErrorService errorService;
+
+ @Test
+ public void getErrorByCode() {
+ for (FieldLanguage lng : languageService.getLanguages()) {
+ for (long i = -52; i < 0; ++i) {
+ assertNotNull(
+ "Not null error result should be returned: i : " + i + "; lng_id = "
+ lng.getLanguage_id()
+ , errorService.getErrorByCode(null, i,
lng.getLanguage_id())
+ );
+ }
+ }
+ }
+}
=======================================
--- /branches/dev/injection/build.xml Tue Aug 16 10:32:14 2011
+++ /branches/dev/injection/build.xml Wed Aug 17 09:28:37 2011
@@ -28,9 +28,9 @@
<property name="userservice.src.dir"
value="${basedir}/src/userservice"/>
<property name="classes.dir" value="${basedir}/bin"/>
- <property name="dist.dir" value="dist"/>
+ <property name="dist.dir" value="${basedir}/dist"/>
<property name="red5.root" value="${dist.dir}/red5"/>
- <property name="report.dir" value="junitreport"/>
+ <property name="report.dir" value="${basedir}/junitreport"/>
<!-- Conf dirs -->
<property name="conf.dir" value="${basedir}/conf"/>
@@ -39,7 +39,7 @@
<property name="project.distname" value="openmeetings"/>
<!-- libraries -->
- <property name="project.lib" value="./lib"/>
+ <property name="project.lib" value="${basedir}/lib"/>
<!-- LPS Properties -->
<property name="out.dir.swf" value
= "${basedir}/${dist.dir}/red5/webapps/${project.distname}/" />
@@ -611,7 +611,11 @@
<!-- Unit Tests -->
<property name="om.dist.webapp"
value="${red5.root}/webapps/${project.distname}"/>
- <path id="junit.classpath">
+ <condition property="junit.test.pattern" value="${testcases}"
else="Test*">
+ <isset property="testcases" />
+ </condition>
+
+ <path id="junit.classpath">
<fileset dir="${red5.root}" includes="*.jar" />
<path refid="compile.classpath" />
<pathelement path="${classes.dir}" />
@@ -622,7 +626,7 @@
<pathelement path="${om.dist.webapp}" />
<pathelement path="${om.dist.webapp}/WEB-INF" />
</path>
- <target name="test" depends="enhance">
+ <target name="test" depends="enhance" description="Will run all tests
unless -Dtestcases=_file_name_pattern_ will be passed">
<mkdir dir="${report.dir}"/>
<property name="myclsp" refid="junit.classpath" />
<!-- <echo message="${myclsp}" /> -->
@@ -633,7 +637,7 @@
<formatter type="plain"/>
<batchtest fork="yes" todir="${report.dir}">
<fileset dir="${main.out.dir}">
- <include name="org/openmeetings/test/**/Test*"/>
+ <include
name="org/openmeetings/test/**/${junit.test.pattern}"/>
</fileset>
</batchtest>
</junit>
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
Sat Aug 13 04:12:18 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/ErrorService.java
Wed Aug 17 09:28:37 2011
@@ -16,7 +16,6 @@
*
*/
public class ErrorService {
-
private static final Logger log = Red5LoggerFactory.getLogger(
MainService.class,
ScopeApplicationAdapter.webAppRootKey);
@@ -40,7 +39,7 @@
// Usermanagement.getInstance().getUserLevelByID(users_id);
if (errorid < 0) {
- // log.debug("errorid,language_id:
"+errorid+"|"+language_id);
+ log.debug("errorid, language_id: " + errorid + "|" +
language_id);
ErrorValues eValues =
errorManagement.getErrorValuesById(errorid
* (-1));
if (eValues != null) {
=======================================
---
/branches/dev/injection/src/app/org/openmeetings/app/remote/LanguageService.java
Mon Aug 15 11:47:14 2011
+++
/branches/dev/injection/src/app/org/openmeetings/app/remote/LanguageService.java
Wed Aug 17 09:28:37 2011
@@ -11,6 +11,7 @@
import org.openmeetings.app.data.basic.Sessionmanagement;
import org.openmeetings.app.data.beans.basic.SearchResult;
import org.openmeetings.app.data.user.Usermanagement;
+import org.openmeetings.app.persistence.beans.lang.FieldLanguage;
import org.openmeetings.app.persistence.beans.lang.Fieldlanguagesvalues;
import org.openmeetings.app.persistence.beans.lang.Fieldvalues;
import org.openmeetings.app.remote.red5.ScopeApplicationAdapter;
@@ -45,7 +46,7 @@
*
* @return
*/
- public List getLanguages() {
+ public List<FieldLanguage> getLanguages() {
return fieldLanguageDaoImpl.getLanguages();
}
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
