taylor 02/03/25 13:42:38
Modified: src/java/org/apache/jetspeed/services/psmlmanager
TestMarshalPsml.java
Log:
- updated tests for securityElement, removed Vector tests
Revision Changes Path
1.3 +83 -54
jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/TestMarshalPsml.java
Index: TestMarshalPsml.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/services/psmlmanager/TestMarshalPsml.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TestMarshalPsml.java 23 Mar 2002 19:39:42 -0000 1.2
+++ TestMarshalPsml.java 25 Mar 2002 21:42:38 -0000 1.3
@@ -3,7 +3,7 @@
import java.io.File;
import java.io.FileReader;
-import java.util.Vector;
+import java.util.Iterator;
// Junit imports
import junit.framework.Test;
@@ -31,7 +31,7 @@
* TestMarshalPsml
*
* @author <a href="[EMAIL PROTECTED]">David Sean Taylor</a>
- * @version $Id: TestMarshalPsml.java,v 1.2 2002/03/23 19:39:42 taylor Exp $
+ * @version $Id: TestMarshalPsml.java,v 1.3 2002/03/25 21:42:38 taylor Exp $
*/
//public class TestMarshalPsml extends ServletTestCase {
public class TestMarshalPsml extends TestCase {
@@ -100,13 +100,16 @@
ConfigElement rootset =
(ConfigElement)unmarshaller.unmarshal(reader);
assertTrue(rootset.getName().equals("theRootSet"));
- Vector params = rootset.getParameters();
-
assertTrue(((Parameter)params.elementAt(0)).getName().equals("city"));
-
assertTrue(((Parameter)params.elementAt(0)).getValue().equals("Atlanta"));
-
assertTrue(((Parameter)params.elementAt(1)).getName().equals("state"));
-
assertTrue(((Parameter)params.elementAt(1)).getValue().equals("Georgia"));
-
assertTrue(((Parameter)params.elementAt(2)).getName().equals("country"));
-
assertTrue(((Parameter)params.elementAt(2)).getValue().equals("USA"));
+ Iterator params = rootset.getParameterIterator();
+ Parameter param = (Parameter)params.next();
+ assertTrue(param.getName().equals("city"));
+ assertTrue(param.getValue().equals("Atlanta"));
+ param = (Parameter)params.next();
+ assertTrue(param.getName().equals("state"));
+ assertTrue(param.getValue().equals("Georgia"));
+ param = (Parameter)params.next();
+ assertTrue(param.getName().equals("country"));
+ assertTrue(param.getValue().equals("USA"));
assertTrue(rootset.getParameterValue("city").equals("Atlanta"));
assertTrue(rootset.getParameterValue("country").equals("USA"));
assertTrue(rootset.getParameter("state").getValue().equals("Georgia"));
@@ -163,14 +166,25 @@
assertTrue(rootset.getDescription().equals("This is the default
page for me"));
assertTrue(rootset.getImage().equals("me.png"));
- Vector params = rootset.getParameters();
- assertNotNull(params);
-
assertTrue(((Parameter)params.elementAt(0)).getName().equals("city"));
-
assertTrue(((Parameter)params.elementAt(0)).getValue().equals("Atlanta"));
-
assertTrue(((Parameter)params.elementAt(1)).getName().equals("state"));
-
assertTrue(((Parameter)params.elementAt(1)).getValue().equals("Georgia"));
-
assertTrue(((Parameter)params.elementAt(2)).getName().equals("country"));
-
assertTrue(((Parameter)params.elementAt(2)).getValue().equals("USA"));
+ Security security = rootset.getSecurity();
+ assertNotNull(security);
+ Iterator itRoles = security.getRolesIterator();
+ Role role = (Role)itRoles.next();
+ assertTrue(role.getName().equals("manager"));
+ role = (Role)itRoles.next();
+ assertTrue(role.getName().equals("user"));
+
+ Iterator params = rootset.getParameterIterator();
+ Parameter param = (Parameter)params.next();
+ assertTrue(param.getName().equals("city"));
+ assertTrue(param.getValue().equals("Atlanta"));
+ param = (Parameter)params.next();
+ assertTrue(param.getName().equals("state"));
+ assertTrue(param.getValue().equals("Georgia"));
+ param = (Parameter)params.next();
+ assertTrue(param.getName().equals("country"));
+ assertTrue(param.getValue().equals("USA"));
+
assertTrue(rootset.getParameterValue("city").equals("Atlanta"));
assertTrue(rootset.getParameterValue("country").equals("USA"));
assertTrue(rootset.getParameter("state").getValue().equals("Georgia"));
@@ -179,12 +193,14 @@
assertNotNull(skin);
assertTrue(skin.getName().equals("skinny"));
assertTrue(skin.getState().equals("DETACHED"));
- Vector skinParams = skin.getParameters();
+ Iterator skinParams = skin.getParameterIterator();
assertNotNull(skinParams);
-
assertTrue(((Parameter)skinParams.elementAt(0)).getName().equals("a"));
-
assertTrue(((Parameter)skinParams.elementAt(0)).getValue().equals("1"));
-
assertTrue(((Parameter)skinParams.elementAt(1)).getName().equals("b"));
-
assertTrue(((Parameter)skinParams.elementAt(1)).getValue().equals("2"));
+ Parameter skinParam = (Parameter)skinParams.next();
+ assertTrue(skinParam.getName().equals("a"));
+ assertTrue(skinParam.getValue().equals("1"));
+ skinParam = (Parameter)skinParams.next();
+ assertTrue(skinParam.getName().equals("b"));
+ assertTrue(skinParam.getValue().equals("2"));
Layout layout = rootset.getLayout();
assertNotNull(layout);
@@ -192,66 +208,75 @@
assertTrue(layout.getSize() == 1);
assertTrue(layout.getPosition() == 3);
- Vector layoutParams = layout.getParameters();
+ Iterator layoutParams = layout.getParameterIterator();
assertNotNull(layoutParams);
-
assertTrue(((Parameter)layoutParams.elementAt(0)).getName().equals("a"));
-
assertTrue(((Parameter)layoutParams.elementAt(0)).getValue().equals("1"));
-
assertTrue(((Parameter)layoutParams.elementAt(1)).getName().equals("b"));
-
assertTrue(((Parameter)layoutParams.elementAt(1)).getValue().equals("2"));
+ Parameter layoutParam = (Parameter)layoutParams.next();
+ assertTrue(layoutParam.getName().equals("a"));
+ assertTrue(layoutParam.getValue().equals("1"));
+ layoutParam = (Parameter)layoutParams.next();
+ assertTrue(layoutParam.getName().equals("b"));
+ assertTrue(layoutParam.getValue().equals("2"));
Control control = rootset.getControl();
assertNotNull(control);
- Vector controlParams = layout.getParameters();
+ Iterator controlParams = control.getParameterIterator();
assertNotNull(controlParams);
+ Parameter controlParam = (Parameter)controlParams.next();
assertTrue(control.getName().equals("TabControl"));
-
assertTrue(((Parameter)controlParams.elementAt(0)).getName().equals("a"));
-
assertTrue(((Parameter)controlParams.elementAt(0)).getValue().equals("1"));
-
assertTrue(((Parameter)controlParams.elementAt(1)).getName().equals("b"));
-
assertTrue(((Parameter)controlParams.elementAt(1)).getValue().equals("2"));
+ assertTrue(controlParam.getName().equals("a"));
+ assertTrue(controlParam.getValue().equals("1"));
+ controlParam = (Parameter)controlParams.next();
+ assertTrue(controlParam.getName().equals("b"));
+ assertTrue(controlParam.getValue().equals("2"));
Controller controller = rootset.getController();
assertNotNull(controller);
- Vector controllerParams = layout.getParameters();
+ Iterator controllerParams = controller.getParameterIterator();
assertNotNull(controllerParams);
+ Parameter controllerParam = (Parameter)controllerParams.next();
+
assertTrue(controller.getName().equals("TabController"));
-
assertTrue(((Parameter)controllerParams.elementAt(0)).getName().equals("a"));
-
assertTrue(((Parameter)controllerParams.elementAt(0)).getValue().equals("1"));
-
assertTrue(((Parameter)controllerParams.elementAt(1)).getName().equals("b"));
-
assertTrue(((Parameter)controllerParams.elementAt(1)).getValue().equals("2"));
+ assertTrue(controllerParam.getName().equals("a"));
+ assertTrue(controllerParam.getValue().equals("1"));
+ controllerParam = (Parameter)controllerParams.next();
+ assertTrue(controllerParam.getName().equals("b"));
+ assertTrue(controllerParam.getValue().equals("2"));
- Vector entries = rootset.getEntries();
+ Iterator entries = rootset.getEntriesIterator();
assertNotNull(entries);
- Entry entry = (Entry)entries.elementAt(0);
+ Entry entry = (Entry)entries.next();
assertTrue(entry.getParent().equals("LoggedInWelcome"));
assertTrue(entry.getId().equals("03"));
Layout elayout = entry.getLayout();
assertNotNull(elayout);
- Vector elayoutParams = elayout.getParameters();
+ Iterator elayoutParams = elayout.getParameterIterator();
assertNotNull(elayoutParams);
-
assertTrue(((Parameter)elayoutParams.elementAt(1)).getName().equals("row"));
-
assertTrue(((Parameter)elayoutParams.elementAt(0)).getName().equals("column"));
+ Parameter elayoutParam = (Parameter)elayoutParams.next();
+ assertTrue(elayoutParam.getName().equals("column"));
+ elayoutParam = (Parameter)elayoutParams.next();
+ assertTrue(elayoutParam.getName().equals("row"));
- Vector pv = rootset.getPortlets();
+ Iterator pv = rootset.getPortletsIterator();
- Portlets p = (Portlets)pv.elementAt(0);
+ Portlets p = (Portlets)pv.next();
assertNotNull(p);
Controller pc = p.getController();
assertNotNull(pc);
assertTrue(pc.getName().equals("TwoColumns"));
- Vector pe = p.getEntries();
+ Iterator pe = p.getEntriesIterator();
assertNotNull(pe);
- Entry e1 = (Entry)pe.elementAt(0);
+ Entry e1 = (Entry)pe.next();
assertTrue(e1.getParent().equals("HelloWhatever"));
assertTrue(e1.getId().equals("99"));
- Entry e2 = (Entry)pe.elementAt(1);
+ Entry e2 = (Entry)pe.next();
assertTrue(e2.getParent().equals("HelloVelocity"));
assertTrue(e2.getId().equals("100"));
- Entry e3 = (Entry)pe.elementAt(2);
+ Entry e3 = (Entry)pe.next();
assertTrue(e3.getParent().equals("HelloCleveland"));
assertTrue(e3.getId().startsWith("P-"));
System.out.println(e3.getId());
@@ -260,6 +285,7 @@
catch (Exception e)
{
String errmsg = "Error in psml mapping creation: " + e.toString();
+ e.printStackTrace();
System.err.println(errmsg);
assertNotNull(errmsg, null);
}
@@ -296,10 +322,13 @@
mapping.loadMapping( is );
Unmarshaller unmarshaller = new Unmarshaller(mapping);
Security rootset = (Security)unmarshaller.unmarshal(reader);
- Vector roles = rootset.getRoles();
- assertTrue(((Role)roles.elementAt(0)).getName().equals("admin"));
- assertTrue(((Role)roles.elementAt(1)).getName().equals("user"));
- assertTrue(((Role)roles.elementAt(2)).getName().equals("manager"));
+ Iterator roles = rootset.getRolesIterator();
+ Role role = (Role)roles.next();
+ assertTrue(role.getName().equals("admin"));
+ role = (Role)roles.next();
+ assertTrue(role.getName().equals("user"));
+ role = (Role)roles.next();
+ assertTrue(role.getName().equals("manager"));
}
catch (Exception e)
{
@@ -331,8 +360,8 @@
{
try
{
- config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
- config.init();
+ config = new TurbineConfig( "../webapp",
"/WEB-INF/conf/TurbineResources.properties");
+ config.init();
}
catch (Exception e)
{
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
