You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by we...@apache.org on 2003/10/18 22:48:42 UTC

cvs commit: jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/aggregator TestAggregator.java

weaver      2003/10/18 13:48:42

  Modified:    portal/src/test/org/apache/jetspeed/aggregator
                        TestAggregator.java
  Log:
  All fulcrum, ServiceUtil AND JetpseedServices references removed and
  replaces with CPS.
  
  Revision  Changes    Path
  1.2       +20 -21    jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java
  
  Index: TestAggregator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-jetspeed-2/portal/src/test/org/apache/jetspeed/aggregator/TestAggregator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestAggregator.java	28 Jul 2003 23:47:54 -0000	1.1
  +++ TestAggregator.java	18 Oct 2003 20:48:42 -0000	1.2
  @@ -1,15 +1,14 @@
   package org.apache.jetspeed.aggregator;
   
  -
   import junit.framework.Test;
   import junit.framework.TestSuite;
   
  -import org.apache.jetspeed.services.JetspeedServices;
   import org.apache.jetspeed.test.JetspeedTest;
   
   import org.apache.jetspeed.request.RequestContext;
   import org.apache.jetspeed.request.RequestContextFactory;
   import org.apache.jetspeed.services.profiler.Profiler;
  +import org.apache.jetspeed.cps.CommonPortletServices;
   import org.apache.jetspeed.om.profile.Profile;
   
   /**
  @@ -26,26 +25,27 @@
        *
        * @param name the testcase's name.
        */
  -    public TestAggregator(String name) 
  +    public TestAggregator(String name)
       {
  -        super( name );
  +        super(name);
       }
  -    
  -    public static Test suite() {
  -         // All methods starting with "test" will be executed in the test suite.
  -         return new TestSuite( TestAggregator.class );
  -     }
  -         
  +
  +    public static Test suite()
  +    {
  +        // All methods starting with "test" will be executed in the test suite.
  +        return new TestSuite(TestAggregator.class);
  +    }
  +
       /**
        * Start the tests.
        *
        * @param args the arguments. Not used
        */
  -    public static void main(String args[]) 
  +    public static void main(String args[])
       {
  -        junit.awtui.TestRunner.main( new String[] { TestAggregator.class.getName() } );
  -    }    
  -    
  +        junit.awtui.TestRunner.main(new String[] { TestAggregator.class.getName()});
  +    }
  +
       /**
        * Simple test that verifies ...
        *
  @@ -53,15 +53,14 @@
        */
       public void testAggregator() throws Exception
       {
  -        Aggregator aggregator = (Aggregator)JetspeedServices
  -            .getInstance().getService(Aggregator.SERVICE_NAME);
  -    
  -        RequestContext request = RequestContextFactory.getInstance(null,null, null);
  +        Aggregator aggregator = (Aggregator) CommonPortletServices.getPortalService(Aggregator.SERVICE_NAME);
  +
  +        RequestContext request = RequestContextFactory.getInstance(null, null, null);
   
           Profile profile = Profiler.getProfile(request);
           request.setProfile(profile);
  -   
  +
           aggregator.build(request);
  -            
  +
       }
   }
  
  
  

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