[jboss-cvs] jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/info ...

[Chris Laprun]

  User: claprun 
  Date: 06/08/11 19:19:49

  Modified:    portlet/src/main/org/jboss/portal/test/portlet/info 
                        CapabilitiesInfoTest.java
  Log:
  - Fixed implementation of getWindowStates(String mimeType).
  - Improved implementation of getWindowStates().
  
  Revision  Changes    Path
  1.8       +7 -9      jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: CapabilitiesInfoTest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/test/portlet/info/CapabilitiesInfoTest.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -b -r1.7 -r1.8
  --- CapabilitiesInfoTest.java	31 Jul 2006 19:29:56 -0000	1.7
  +++ CapabilitiesInfoTest.java	11 Aug 2006 23:19:49 -0000	1.8
  @@ -22,27 +22,27 @@
   
   package org.jboss.portal.test.portlet.info;
   
  +import org.jboss.portal.Mode;
  +import org.jboss.portal.WindowState;
   import org.jboss.portal.portlet.container.PortletApplicationRegistry;
   import org.jboss.portal.portlet.container.PortletContainer;
   import org.jboss.portal.portlet.info.CapabilitiesInfo;
  +import org.jboss.portal.portlet.info.ModeInfo;
   import org.jboss.portal.portlet.info.PortletInfo;
   import org.jboss.portal.portlet.info.WindowStateInfo;
  -import org.jboss.portal.portlet.info.ModeInfo;
  -import org.jboss.portal.Mode;
   import org.jboss.portal.server.ServerInvocation;
   import org.jboss.portal.test.framework.container.result.AssertResult;
   import org.jboss.portal.test.framework.container.result.Result;
   import org.jboss.portal.test.server.AbstractTest;
  -import org.jboss.portal.WindowState;
   
  +import java.util.HashSet;
  +import java.util.Iterator;
   import java.util.Locale;
   import java.util.Set;
  -import java.util.Iterator;
  -import java.util.HashSet;
   
   /**
    * @author <a href="mailto:chris.laprun at jboss.com">Chris Laprun</a>
  - * @version $Revision: 1.7 $
  + * @version $Revision: 1.8 $
    */
   public class CapabilitiesInfoTest extends AbstractTest
   {
  @@ -78,8 +78,7 @@
               assertTrue(allLocales.contains(Locale.ENGLISH));
   
               //check mime types
  -            Set types = new HashSet();
  -            types = capInfo.getMimeTypes();
  +            Set types = capInfo.getMimeTypes();
               String[] mt = new String[types.size()];
               int count = 0;
               for (Iterator i = types.iterator(); i.hasNext();)
  @@ -132,7 +131,6 @@
               assertTrue(states.contains(WindowState.MINIMIZED));
               assertTrue(states.contains(WindowState.MAXIMIZED));
   
  -
               //simple check for text/vnd.wap.wml
               //TODO:is this really expected behaviour? shouldn't it return no states as this is unsupported by portal one?
               states = capInfo.getWindowStates("text/vnd.wap.wml");