portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pau...@apache.org
Subject cvs commit: jakarta-jetspeed/build build.xml
Date Sat, 13 Apr 2002 22:05:19 GMT
paulsp      02/04/13 15:05:18

  Modified:    src/java/org/apache/jetspeed/util/template
                        BaseJetspeedLink.java TestJetspeedLink.java
               build    build.xml
  Added:       src/java/org/apache/jetspeed/util/template
                        TestJetspeedLinkFactory.java
  Removed:     src/java/org/apache/jetspeed/util/template
                        TestUnitJetspeedLink.java
  Log:
  Part of PEID implementation
  
  o Renames TestUnitJetspeedLink.java to TestJetspeedLinkFactory.java
  o Added test to TestJetspeedLinkFactory
      Verify instances are pooled
  o Added test to TestJetspeedLink
      Add test when Group and Page are requested
      Verify many toString() return the same value
  o Include TestJetspeedLink in tomcat test
  o BaseJetspeedLink.toString() now returns the same value when called many times
  
  Revision  Changes    Path
  1.3       +6 -7      jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java
  
  Index: BaseJetspeedLink.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/BaseJetspeedLink.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BaseJetspeedLink.java	13 Apr 2002 08:24:44 -0000	1.2
  +++ BaseJetspeedLink.java	13 Apr 2002 22:05:18 -0000	1.3
  @@ -87,7 +87,7 @@
    * rendering code. This is done currently in VelocityPortlet.</p>
    *
    * @author <a href="mailto:paulsp@apache.org">Paul Spencer</a>
  - * @version $Id: BaseJetspeedLink.java,v 1.2 2002/04/13 08:24:44 paulsp Exp $
  + * @version $Id: BaseJetspeedLink.java,v 1.3 2002/04/13 22:05:18 paulsp Exp $
    */
   public class BaseJetspeedLink implements ApplicationTool, JetspeedLink
   {
  @@ -228,17 +228,16 @@
       {
           DynamicURI uri = null;
           if (profile == null)
  -        {
               profile = Profiler.getProfile(rundata);
  -            
  +        if ((locator == null) && (profile != null))
  +        {
               // Get ProfileLocator for path info.
               if ((profile instanceof ProfileLocator) == true)
  -            {
                   locator = (ProfileLocator) profile;
  -                if (locator != null)
  -                    uri = Profiler.makeDynamicURI(rundata, locator);
  -            }
           }
  +        if (locator != null)
  +          uri = Profiler.makeDynamicURI(rundata, locator);
  +
           if (uri == null)
               uri = new DynamicURI( rundata);
           
  
  
  
  1.3       +10 -3     jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/TestJetspeedLink.java
  
  Index: TestJetspeedLink.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/TestJetspeedLink.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestJetspeedLink.java	13 Apr 2002 08:24:44 -0000	1.2
  +++ TestJetspeedLink.java	13 Apr 2002 22:05:18 -0000	1.3
  @@ -93,7 +93,7 @@
    * TestJespeedLink
    *
    * @author <a href="paulsp@apache.org">Paul Spencer</a>
  - * @version $Id: TestJetspeedLink.java,v 1.2 2002/04/13 08:24:44 paulsp Exp $
  + * @version $Id: TestJetspeedLink.java,v 1.3 2002/04/13 22:05:18 paulsp Exp $
    */
   public class TestJetspeedLink extends ServletTestCase
   {
  @@ -332,6 +332,8 @@
        */
       public void testGroupPage2() throws Exception
       {
  +        JetspeedLink jetspeedLink = null;
  +        
           // Create the RunData object to be used during testing.
           RunData rundata = RunDataFactory.getRunData( request, response, config );
           assertNotNull( "Got rundata", rundata);
  @@ -351,10 +353,15 @@
           System.out.println("Group/Page Link = " + link);
           
           // Generate the link from JetspeedLink
  -        JetspeedLink jetspeedLink = JetspeedLinkFactory.getInstance(rundata);
  +        jetspeedLink = JetspeedLinkFactory.getInstance(rundata);
           System.out.println("Group/Page jetspeedLink = " + jetspeedLink.toString());
  -        assertTrue( "jlink = jetspeedLink", link.equals( jetspeedLink.toString()));
  +        assertEquals( "jlink = jetspeedLink", link, jetspeedLink.toString());
  +        JetspeedLinkFactory.putInstance(jlink);
           
  +        // Make sure 2 calls to toString() return the same value
  +        jetspeedLink = JetspeedLinkFactory.getInstance(rundata);
  +        assertEquals( "jlink = jetspeedLink", jetspeedLink.toString(), jetspeedLink.toString());
  +
           // Generatate and output thre page
           TurbineTestUtilities.generatePage(rundata);
           TurbineTestUtilities.outputPage(rundata);
  
  
  
  1.1                  jakarta-jetspeed/src/java/org/apache/jetspeed/util/template/TestJetspeedLinkFactory.java
  
  Index: TestJetspeedLinkFactory.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2001 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", nor may "Apache" appear in their name, without
   *    prior written permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  
  package org.apache.jetspeed.util.template;
  
  // Java imports
  import java.util.Stack;
  
  // Cactus and Junit imports
  import junit.framework.Test;
  import junit.framework.TestCase;
  import junit.framework.TestSuite;
  import junit.awtui.TestRunner;
  
  // Jetspeed imports
  import org.apache.jetspeed.util.template.JetspeedLink;
  
  // Turbine imports
  import org.apache.turbine.services.pool.PoolService;
  import org.apache.turbine.services.pool.TurbinePool;
  import org.apache.turbine.services.TurbineServices;
  import org.apache.turbine.util.TurbineConfig;
  import org.apache.turbine.util.StringUtils;
  
  /**
   * TestTurbineCache
   *
   * @author <a href="paulsp@apache.org">Paul Spencer</a>
   * @version $Id: TestJetspeedLinkFactory.java,v 1.1 2002/04/13 22:05:18 paulsp Exp $
   */
  public class TestJetspeedLinkFactory extends TestCase
  {
      
      /**
       * Configuration object to run Turbine outside a servlet container
       * ( uses turbine.properties )
       */
      private static TurbineConfig config = null;
      
      /**
       * Sets up TurbineConfig using the system property:
       * <pre>turbine.properties</pre>
       */
      static
      {
          try
          {
              config = new TurbineConfig( "../webapp",
              "/WEB-INF/conf/TurbineResources.properties");
              config.init();
          }
          catch (Exception e)
          {
              fail(StringUtils.stackTrace(e));
          }
      }
      
      /**
       * Defines the testcase name for JUnit.
       *
       * @param name the testcase's name.
       */
      public TestJetspeedLinkFactory(String name)
      {
          super( name );
      }
      
      /**
       * Start the tests.
       *
       * @param args the arguments. Not used
       */
      public static void main(String args[])
      {
          TestRunner.main( new String[]
          { TestJetspeedLinkFactory.class.getName() } );
      }
      
      /**
       * Creates the test suite.
       *
       * @return a test suite (<code>TestSuite</code>) that includes all methods
       *         starting with "test"
       */
      public static Test suite()
      {
          // All methods starting with "test" will be executed in the test suite.
          return new TestSuite( TestJetspeedLinkFactory.class );
      }
      
      /**
       * Simple test that get a JetspeedLink object
       *
       * @throws Exception
       */
      public void testSimpleGet() throws Exception
      {
          JetspeedLink jlink = JetspeedLinkFactory.getInstance();
          System.out.println("Class return by JetspeedLinkFactory: " + jlink.getClass().getName());
          assertNotNull( "Got JetspeedLink", jlink);
          assertTrue( "jlink instance of JetspeedLink", (jlink instanceof JetspeedLink));
      }
      
      /**
       * Simple test that gets and put a JetspeedLink object
       *
       * @throws Exception
       */
      public void testGetandPut() throws Exception
      {
          PoolService poolService = (PoolService) TurbineServices.
          getInstance().getService(PoolService.SERVICE_NAME);
          JetspeedLink jlink = null;
          int beforeSize;
          
          for (int counter = 0; counter < 10; counter++)
          {
              jlink = JetspeedLinkFactory.getInstance();
              assertNotNull( "Get loop - Got JetspeedLink", jlink);
              assertTrue( "Get loop - jlink instance of JetspeedLink", (jlink instanceof JetspeedLink));
          }
          String linkClassName = jlink.getClass().getName();
          jlink = null;
          
          for (int counter = 0; counter < 10; counter++)
          {
              jlink = JetspeedLinkFactory.getInstance();
              assertNotNull( "Get/put loop - Got JetspeedLink", jlink);
              assertTrue( "Get/put loop - jlink instance of JetspeedLink", (jlink instanceof
JetspeedLink));
              beforeSize = poolService.getSize( linkClassName);
              JetspeedLinkFactory.putInstance(jlink);
              assertTrue( "Class saved in pool", (beforeSize < poolService.getSize( linkClassName)));
              jlink = null;
          }
      }
      public void testFillPool() throws Exception
      {
          Stack jlinkStack = new Stack();
          JetspeedLink jlink = null;
  
          PoolService poolService = (PoolService) TurbineServices.
          getInstance().getService(PoolService.SERVICE_NAME);
          int poolCapacity;
  
          jlink = JetspeedLinkFactory.getInstance();
          String linkClassName = jlink.getClass().getName();
          poolCapacity = poolService.getCapacity( linkClassName);
  
          System.out.println("Class Name  " + linkClassName);
          System.out.println("Pool Capacity " + poolCapacity);
  
          // Fill stack with objects
          for (int counter = 0; counter < poolCapacity; counter++)
          {
              jlink = JetspeedLinkFactory.getInstance();
              assertNotNull( "Get loop - Got JetspeedLink", jlink);
              assertTrue( "Get loop - jlink instance of JetspeedLink", (jlink instanceof JetspeedLink));
              jlinkStack.push(jlink);
          }
          
          // Fill up the pool
          while (jlinkStack.empty() == false)
              JetspeedLinkFactory.putInstance( (JetspeedLink) jlinkStack.pop());
          assertEquals( "Pool is full", poolCapacity, poolService.getSize(linkClassName));
          
          // Empty pool
          for (int counter = 0; counter < poolCapacity; counter++)
          {
              jlink = JetspeedLinkFactory.getInstance();
              assertNotNull( "Get loop - Got JetspeedLink", jlink);
              assertTrue( "Get loop - jlink instance of JetspeedLink", (jlink instanceof JetspeedLink));
          }
          assertEquals( "Pool is empty", 0, poolService.getSize(linkClassName));
      }
  }
  
  
  
  1.140     +1 -5      jakarta-jetspeed/build/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed/build/build.xml,v
  retrieving revision 1.139
  retrieving revision 1.140
  diff -u -r1.139 -r1.140
  --- build.xml	13 Apr 2002 08:24:44 -0000	1.139
  +++ build.xml	13 Apr 2002 22:05:18 -0000	1.140
  @@ -643,9 +643,7 @@
               <!-- Cactus unit tests -->
               <test name="org.apache.jetspeed.modules.actions.TestJLoginUser"/>
               <test name="org.apache.jetspeed.test.TestBasicSanity"/>
  -<!--
               <test name="org.apache.jetspeed.util.template.TestJetspeedLink"/>
  --->
           </junit>
       </target>
   
  @@ -672,9 +670,7 @@
               <!-- Cactus unit tests -->
               <test name="org.apache.jetspeed.modules.actions.TestJLoginUser"/>
               <test name="org.apache.jetspeed.test.TestBasicSanity"/>
  -<!--
               <test name="org.apache.jetspeed.util.template.TestJetspeedLink"/>
  --->
           </junit>
       </target>
   
  @@ -809,7 +805,7 @@
               <test name="org.apache.jetspeed.services.registry.TestMarshallRegistry"/>
               <test name="org.apache.jetspeed.services.registry.TestRegistryCategories"/>
             <!--  <test name="org.apache.jetspeed.services.registry.TestRegistryPersistence"/>
-->
  -            <test name="org.apache.jetspeed.util.template.TestUnitJetspeedLink"/>
  +            <test name="org.apache.jetspeed.util.template.TestJetspeedLinkFactory"/>
           </junit>
       </target>
   
  
  
  

--
To unsubscribe, e-mail:   <mailto:jetspeed-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:jetspeed-dev-help@jakarta.apache.org>


Mime
View raw message