You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/04/10 19:51:15 UTC
svn commit: r1311888 -
/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java
Author: sebawagner
Date: Tue Apr 10 17:51:15 2012
New Revision: 1311888
URL: http://svn.apache.org/viewvc?rev=1311888&view=rev
Log:
OPENMEETINGS-122 Fix Navigation Test
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java?rev=1311888&r1=1311887&r2=1311888&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/test/navi/TestNavi.java Tue Apr 10 17:51:15 2012
@@ -18,50 +18,36 @@
*/
package org.openmeetings.test.navi;
-import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import java.util.List;
import org.junit.Test;
+import org.openmeetings.app.data.basic.Navimanagement;
import org.openmeetings.app.persistence.beans.basic.Naviglobal;
import org.openmeetings.app.persistence.beans.basic.Navimain;
-import org.openmeetings.app.persistence.beans.basic.Sessiondata;
-import org.openmeetings.app.persistence.beans.domain.Organisation_Users;
-import org.openmeetings.app.persistence.beans.user.Users;
-import org.openmeetings.app.remote.MainService;
import org.openmeetings.test.AbstractOpenmeetingsSpringTest;
import org.springframework.beans.factory.annotation.Autowired;
public class TestNavi extends AbstractOpenmeetingsSpringTest {
+
@Autowired
- private MainService mService;
+ private Navimanagement navimanagement;
@Test
public void testGetNavi(){
- Sessiondata sessionData = mService.getsessiondata();
-
- Users us = (Users) mService.loginUser(sessionData.getSession_id(), username, userpass, false, null, -1L);
-
- assertNotNull("User is unable to login", us);
- System.out.println("us: "+ us.getFirstname());
-
- for (Organisation_Users ou : us.getOrganisation_users()) {
-
- Long organization_id = ou.getOrganisation().getOrganisation_id();
- List<Naviglobal> ll = mService.getNavi(sessionData.getSession_id(), 1, organization_id);
+ List<Naviglobal> ll = navimanagement.getMainMenu(3L, 1L, 1L);
- assertTrue("GlobalNavi size should be greater than zero: " + ll.size(), ll.size() > 0);
- System.out.println("NaviGlobal size: " + ll.size());
+ assertTrue("GlobalNavi size should be greater than zero: " + ll.size(), ll.size() > 0);
+ System.out.println("NaviGlobal size: " + ll.size());
- for (Naviglobal navigl : ll) {
- System.out.println("Naviglobal label: " + navigl.getLabel().getValue());
+ for (Naviglobal navigl : ll) {
+ System.out.println("Naviglobal label: " + navigl.getLabel().getValue());
- for (Navimain navim : navigl.getMainnavi()) {
- System.out.println("-->" + navim.getLabel().getValue());
+ for (Navimain navim : navigl.getMainnavi()) {
+ System.out.println("-->" + navim.getLabel().getValue());
- }
}
}