• Views
  • Iteration Report
  • My Iteration Report
  •  
OMERO.server
  • Login
  • Help/Guide
  • About Trac
  • Preferences
  • Wiki
  • Timeline
  • Roadmap
  • Browse Source
  • View Tickets
  • Search

Context Navigation

  • ← Previous Change
  • Next Change →

Changeset 100 for branches/omero

Show
Ignore:
Timestamp:
06/08/05 17:19:24 (4 years ago)
Author:
jmoore
Message:

Still moving things around to get integration tests working.
Now solidifying on **utests** and **itests**.

Location:
branches/omero
Files:
3 added
2 removed
14 modified
6 copied
6 moved

  • components/client/project.xml (modified) (2 diffs)
  • components/client/test/org/openmicroscopy/omero/tests/client/OmeroGrinderTest.java (modified) (1 diff)
  • components/client/test/org/openmicroscopy/omero/tests/client/OmeroHierarchyBrowsingIntegrationTest.java (modified) (7 diffs)
  • components/client/test/org/openmicroscopy/omero/tests/client/OmeroServiceTest.java (deleted)
  • components/client/test/org/openmicroscopy/omero/tests/client/test.xml (modified) (1 diff)
  • components/common (moved) (moved from branches/omero/components/model)
  • components/common/.classpath (copied) (copied from branches/omero/components/model/.classpath) (1 diff)
  • components/common/.project (modified) (1 diff)
  • components/common/maven.xml (copied) (copied from branches/omero/components/model/maven.xml)
  • components/common/middlegen (copied) (copied from branches/omero/components/model/middlegen)
  • components/common/project.xml (copied) (copied from branches/omero/components/model/project.xml) (1 diff)
  • components/common/src (copied) (copied from branches/omero/components/model/src)
  • components/common/src/org/openmicroscopy/omero/exceptions (added)
  • components/common/src/org/openmicroscopy/omero/tests (added)
  • components/common/src/org/openmicroscopy/omero/tests/AbstractOmeroHierarchyBrowserIntegrationTest.java (moved) (moved from branches/omero/components/client/test/org/openmicroscopy/omero/tests/client/AbstractOmeroHierarchyBrowserIntegrationTest.java) (1 diff)
  • components/common/src/org/openmicroscopy/omero/tests/OMEData.java (moved) (moved from branches/omero/components/client/test/org/openmicroscopy/omero/tests/client/OMEData.java) (1 diff)
  • components/common/src/org/openmicroscopy/omero/tests/OMEPerformanceData.java (moved) (moved from branches/omero/components/client/test/org/openmicroscopy/omero/tests/client/OMEPerformanceData.java) (1 diff)
  • components/common/src/org/openmicroscopy/omero/util (added)
  • components/common/src/org/openmicroscopy/omero/util/Utils.java (moved) (moved from branches/omero/components/client/test/org/openmicroscopy/omero/tests/client/Utils.java) (3 diffs)
  • components/server/itest (deleted)
  • components/server/project.properties (modified) (2 diffs)
  • components/server/project.xml (modified) (1 diff)
  • components/server/test/org/openmicroscopy/omero/server/itests (copied) (copied from branches/omero/components/server/itest/org/openmicroscopy/omero/server/itests)
  • components/server/test/org/openmicroscopy/omero/server/utests (moved) (moved from branches/omero/components/server/test/org/openmicroscopy/omero/server/tests)
  • components/shoola-adapter/.classpath (modified) (1 diff)
  • components/shoola-adapter/project.xml (modified) (1 diff)
  • components/test/.classpath (modified) (1 diff)
  • components/test/project.xml (modified) (1 diff)
  • components/test/src/org/openmicroscopy/shoola/env/data/t/GrinderTest.java (modified) (1 diff)
  • maven.xml (modified) (4 diffs)
  • project.properties (modified) (4 diffs)

Legend:

Unmodified
Added
Removed

  • branches/omero/components/client/project.xml

    r98 r100  
    44  <extend>../../project.xml</extend> 
    55  <pomVersion>3</pomVersion> 
    6   <id>${pom.groupId}-client</id> 
     6  <artifactId>${pom.groupId}-client</artifactId> 
    77  <name>OME Client Code</name> 
    88  <currentVersion>1.0</currentVersion> 
    … …  
    1212    <dependency> 
    1313      <groupId>${pom.groupId}</groupId> 
    14       <artifactId>${pom.groupId}-model</artifactId> 
     14      <artifactId>${pom.groupId}-common</artifactId> 
    1515      <version>1.0</version> 
    16     </dependency> 
    17     <dependency><!-- TODO: Make sure that nothing leaks!!! --> 
    18       <groupId>${pom.groupId}</groupId> 
    19       <artifactId>${pom.groupId}-server</artifactId> 
    20       <version>1.0</version> 
    21       <type>jar</type> 
    2216    </dependency> 
    2317    <dependency> 

  • branches/omero/components/client/test/org/openmicroscopy/omero/tests/client/OmeroGrinderTest.java

    r98 r100  
    33 */ 
    44package org.openmicroscopy.omero.tests.client; 
     5 
     6import org.openmicroscopy.omero.tests.AbstractOmeroHierarchyBrowserIntegrationTest; 
     7import org.openmicroscopy.omero.tests.OMEData; 
     8import org.openmicroscopy.omero.tests.OMEPerformanceData; 
    59 
    610/** 

  • branches/omero/components/client/test/org/openmicroscopy/omero/tests/client/OmeroHierarchyBrowsingIntegrationTest.java

    r98 r100  
    1313import org.openmicroscopy.omero.model.Image; 
    1414import org.openmicroscopy.omero.model.Project; 
     15import org.openmicroscopy.omero.tests.AbstractOmeroHierarchyBrowserIntegrationTest; 
     16import org.openmicroscopy.omero.tests.OMEData; 
     17import org.openmicroscopy.omero.tests.OMEPerformanceData; 
    1518 
    1619/** 
    … …  
    2023        extends 
    2124            AbstractOmeroHierarchyBrowserIntegrationTest { 
    22  
     25     
    2326    /** 
    2427     * @see org.springframework.test.AbstractDependencyInjectionSpringContextTests#getConfigLocations() 
    … …  
    3841    public void testContainerCallWithWrongParameters(){ 
    3942        try { 
    40             hb.loadPDIHierarchy(Object.class,1); 
     43            getHb().loadPDIHierarchy(Object.class,1); 
    4144            fail("loadPDIHierarchy(class,int) didn't choke on bad class."); 
    4245        } catch (IllegalArgumentException iae){ 
    … …  
    4548 
    4649        try { 
    47             hb.loadCGCIHierarchy(Object.class,1); 
     50            getHb().loadCGCIHierarchy(Object.class,1); 
    4851            fail("loadCGCIHierarchy(class,int) didn't choke on bad class."); 
    4952        } catch (IllegalArgumentException iae){ 
    … …  
    5962    public void testNulls(){ 
    6063        // Each method should return a null or an empty set as appropriate 
    61         //TODO hb.findCGCIHierarchies(  ); 
     64        //TODO getHb().findCGCIHierarchies(     ); 
    6265        //TODO generate OMENullData(); and use it here. 
    6366        //TODO OMEData toString(); 
    … …  
    6770        int nonExp = 0; // Non-existence experimenter ID 
    6871        // 
    69         assertTrue(emptyColl,hb.findDatasetAnnotations(test).size()==0); 
    70         assertTrue(emptyColl,hb.findDatasetAnnotations(new HashSet()).size()==0); 
     72        assertTrue(emptyColl,getHb().findDatasetAnnotations(test).size()==0); 
     73        assertTrue(emptyColl,getHb().findDatasetAnnotations(new HashSet()).size()==0); 
    7174        // 
    72         assertTrue(emptyColl,hb.findDatasetAnnotationsForExperimenter(test,nonExp).size()==0); 
    73         assertTrue(emptyColl,hb.findDatasetAnnotationsForExperimenter(new HashSet(),nonExp).size()==0); 
     75        assertTrue(emptyColl,getHb().findDatasetAnnotationsForExperimenter(test,nonExp).size()==0); 
     76        assertTrue(emptyColl,getHb().findDatasetAnnotationsForExperimenter(new HashSet(),nonExp).size()==0); 
    7477        // 
    75         assertTrue(emptyColl,hb.findImageAnnotations(test).size()==0); 
    76         assertTrue(emptyColl,hb.findImageAnnotations(new HashSet()).size()==0); 
     78        assertTrue(emptyColl,getHb().findImageAnnotations(test).size()==0); 
     79        assertTrue(emptyColl,getHb().findImageAnnotations(new HashSet()).size()==0); 
    7780        // 
    78         assertTrue(emptyColl,hb.findImageAnnotationsForExperimenter(test,nonExp).size()==0); 
    79         assertTrue(emptyColl,hb.findImageAnnotationsForExperimenter(new HashSet(),nonExp).size()==0); 
     81        assertTrue(emptyColl,getHb().findImageAnnotationsForExperimenter(test,nonExp).size()==0); 
     82        assertTrue(emptyColl,getHb().findImageAnnotationsForExperimenter(new HashSet(),nonExp).size()==0); 
    8083        // 
    81         assertTrue(emptyColl,hb.findPDIHierarchies(test).size()==0); 
    82         assertTrue(emptyColl,hb.findPDIHierarchies(new HashSet()).size()==0); 
     84        assertTrue(emptyColl,getHb().findPDIHierarchies(test).size()==0); 
     85        assertTrue(emptyColl,getHb().findPDIHierarchies(new HashSet()).size()==0); 
    8386        // 
    84         assertNull(nullObj,hb.loadCGCIHierarchy(CategoryGroup.class, 0)); 
    85         assertNull(nullObj,hb.loadCGCIHierarchy(Category.class, 0)); 
     87        assertNull(nullObj,getHb().loadCGCIHierarchy(CategoryGroup.class, 0)); 
     88        assertNull(nullObj,getHb().loadCGCIHierarchy(Category.class, 0)); 
    8689        // 
    87         assertNull(nullObj,hb.loadPDIHierarchy(Project.class, 0)); 
    88         assertNull(nullObj,hb.loadPDIHierarchy(Dataset.class, 0)); 
     90        assertNull(nullObj,getHb().loadPDIHierarchy(Project.class, 0)); 
     91        assertNull(nullObj,getHb().loadPDIHierarchy(Dataset.class, 0)); 
    8992    } 
    9093     
    … …  
    112115            } 
    113116        } 
    114         assertTrue("There should only be as many images as in the data.imagesPDI", test.size() == this.data.imgsPDI.size()); 
     117        assertTrue("There should only be as many images as in the data.imagesPDI", test.size() == this.getData().imgsPDI.size()); 
    115118//      TODO Make sure joins aren't leaving anything out because of empties! 
    116119    } 

  • branches/omero/components/client/test/org/openmicroscopy/omero/tests/client/test.xml

    r98 r100  
    55        <!-- Add this config file to the getConfigLocations() of your tests 
    66                if you want data and interfaces injected --> 
    7         <bean id="data" class="org.openmicroscopy.omero.tests.client.OMEPerformanceData" init-method="init"> 
     7        <bean id="data" class="org.openmicroscopy.omero.tests.OMEPerformanceData" init-method="init"> 
    88                <property name="dataSource" ref="dataSource"/> 
    99        </bean> 

  • branches/omero/components/common/.classpath

    r96 r100  
    11<?xml version="1.0" encoding="UTF-8"?> 
     2 
    23<classpath> 
    3         <classpathentry kind="src" path="src"/> 
    4         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    5         <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar"/> 
    6         <classpathentry kind="output" path="target/classes"/> 
     4  <classpathentry excluding="" kind="src" path="src"> 
     5  </classpathentry> 
     6  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> 
     7  </classpathentry> 
     8  <classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-1.2.1.jar"> 
     9  </classpathentry> 
     10  <classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-mock-1.2.1.jar"> 
     11  </classpathentry> 
     12  <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"> 
     13  </classpathentry> 
     14  <classpathentry kind="var" path="MAVEN_REPO/hessian/jars/hessian-2.1.12.jar"> 
     15  </classpathentry> 
     16  <classpathentry kind="var" path="MAVEN_REPO/commons-lang/jars/commons-lang-2.0.jar"> 
     17  </classpathentry> 
     18  <classpathentry kind="var" path="MAVEN_REPO/postgresql/jars/postgresql-7.4.1-jdbc3.jar"> 
     19  </classpathentry> 
     20  <classpathentry kind="output" path="target/classes"> 
     21  </classpathentry> 
    722</classpath> 

  • branches/omero/components/common/.project

    r48 r100  
    22 
    33<projectDescription> 
    4   <name>omero-model</name> 
    5   <comment>Model code generated from owl</comment> 
     4  <name>omero-common</name> 
     5  <comment>Common code: Model code generated from middlegen</comment> 
    66  <projects> 
    77  </projects> 

  • branches/omero/components/common/project.xml

    r96 r100  
    44  <extend>../../project.xml</extend> 
    55  <pomVersion>3</pomVersion> 
    6   <id>${pom.groupId}-model</id> 
    7   <name>OME Model Objects</name> 
     6  <id>${pom.groupId}-common</id> 
     7  <name>OME Common Objects</name> 
    88  <currentVersion>1.0</currentVersion> 
    9   <package>org.openmicroscopy.omero.model</package> 
    10   <description>Model code generated from middlegen</description> 
     9  <package>org.openmicroscopy.omero</package> 
     10  <description>Common code: Model code generated from middlegen</description> 
    1111  <dependencies> 
     12    <dependency> 
     13      <groupId>springframework</groupId> 
     14      <artifactId>spring</artifactId> 
     15      <version>1.2.1</version> 
     16    </dependency> 
     17    <dependency> 
     18      <groupId>springframework</groupId> 
     19      <artifactId>spring-mock</artifactId> 
     20      <version>1.2.1</version> 
     21    </dependency> 
     22    <dependency> 
     23      <groupId>junit</groupId> 
     24      <artifactId>junit</artifactId> 
     25      <version>3.8.1</version> 
     26    </dependency> 
     27    <dependency> 
     28      <groupId>hessian</groupId> 
     29      <artifactId>hessian</artifactId> 
     30      <version>2.1.12</version> 
     31    </dependency> 
    1232    <dependency> 
    1333      <groupId>commons-lang</groupId> 

  • branches/omero/components/common/src/org/openmicroscopy/omero/tests/AbstractOmeroHierarchyBrowserIntegrationTest.java

    r98 r100  
    22 * Created on Feb 27, 2005 
    33 */ 
    4 package org.openmicroscopy.omero.tests.client; 
     4package org.openmicroscopy.omero.tests; 
    55 
    66import org.springframework.test.AbstractDependencyInjectionSpringContextTests; 

  • branches/omero/components/common/src/org/openmicroscopy/omero/tests/OMEData.java

    r98 r100  
    22 * Created on May 22, 2005 
    33 */ 
    4 package org.openmicroscopy.omero.tests.client; 
     4package org.openmicroscopy.omero.tests; 
    55 
    66import java.util.ArrayList; 

  • branches/omero/components/common/src/org/openmicroscopy/omero/tests/OMEPerformanceData.java

    r98 r100  
    22 * Created on May 22, 2005 
    33 */ 
    4 package org.openmicroscopy.omero.tests.client; 
     4package org.openmicroscopy.omero.tests; 
    55 
    66import java.util.Random; 

  • branches/omero/components/common/src/org/openmicroscopy/omero/util/Utils.java

    r98 r100  
    22 * Created on May 12, 2005 
    33 */ 
    4 package org.openmicroscopy.omero.tests.client; 
     4package org.openmicroscopy.omero.util; 
    55 
    66import java.io.ByteArrayOutputStream; 
    … …  
    1212import com.caucho.hessian.io.HessianOutput; 
    1313 
    14 import net.sf.acegisecurity.Authentication; 
    15 import net.sf.acegisecurity.context.ContextHolder; 
    16 import net.sf.acegisecurity.context.security.SecureContext; 
    17 import net.sf.acegisecurity.context.security.SecureContextImpl; 
    18 import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken; 
     14//TODO 
     15//import net.sf.acegisecurity.Authentication; 
     16//import net.sf.acegisecurity.context.ContextHolder; 
     17//import net.sf.acegisecurity.context.security.SecureContext; 
     18//import net.sf.acegisecurity.context.security.SecureContextImpl; 
     19//import net.sf.acegisecurity.providers.UsernamePasswordAuthenticationToken; 
    1920 
    2021 
    … …  
    6667    } 
    6768     
    68     public static void setUserAuth(){ 
    69         Authentication auth =  
    70             new UsernamePasswordAuthenticationToken( 
    71                 "Josh","Moore"); 
    72         setAuth(auth); 
    73     } 
    74      
    75     public static void setAdminAuth(){ 
    76         Authentication auth =  
    77             new UsernamePasswordAuthenticationToken( 
    78                 "admin","admin"); 
    79         setAuth(auth); 
    80     } 
    81      
    82     public static void setAuth(Authentication auth){ 
    83         SecureContext secureContext = new SecureContextImpl(); 
    84         secureContext.setAuthentication(auth); 
    85         ContextHolder.setContext(secureContext); 
    86     } 
     69//    public static void setUserAuth(){ 
     70//        Authentication auth =  
     71//            new UsernamePasswordAuthenticationToken( 
     72//                "Josh","Moore"); 
     73//        setAuth(auth); 
     74//    } 
     75//     
     76//    public static void setAdminAuth(){ 
     77//        Authentication auth =  
     78//            new UsernamePasswordAuthenticationToken( 
     79//                "admin","admin"); 
     80//        setAuth(auth); 
     81//    } 
     82//     
     83//    public static void setAuth(Authentication auth){ 
     84//        SecureContext secureContext = new SecureContextImpl(); 
     85//        secureContext.setAuthentication(auth); 
     86//        ContextHolder.setContext(secureContext); 
     87//    } 
    8788} 

  • branches/omero/components/server/project.properties

    r99 r100  
    1 omero.home=${basedir}/../.. 
     1########################################## 
     2# WEBAPP : Allow the servlet context to be "omero" 
     3########################################## 
    24maven.war.src=${basedir}/web 
    35maven.multiproject.type=war 
    4  
    5 # 
    6 # Allow the servlet context to be "omero" 
    7 # 
    86maven.war.final.name=omero.war 
    97maven.tomcat.war.context=/omero 
    … …  
    1311 
    1412# For groovy 
    15 maven.test.search.classdir = true  
    16  
    17 # For itests 
    18 maven.test.mode=unit 
    19 test.unit.includes = ** 
    20 test.unit.excludes = itest/** 
    21 test.integration.includes = itest/** 
    22 test.integration.excludes = test/** 
     13#maven.test.search.classdir = true  
    2314 
    2415# ------------------------------------------------------------------- 
    2516# jam:master goal properties. 
    2617# ------------------------------------------------------------------- 
    27 maven.jam.master.basedir=${omero.home} 
    28 maven.jam.master.includes=${omero.hom}/components/*/project.xml 
    29 maven.jam.master.excludes= 
    30 maven.jam.master.ignoreFailures=false 
     18#maven.jam.master.basedir=${omero.home} 
     19#maven.jam.master.includes=${omero.hom}/components/*/project.xml 
     20#maven.jam.master.excludes= 
     21#maven.jam.master.ignoreFailures=false 
    3122 

  • branches/omero/components/server/project.xml

    r99 r100  
    243243    <sourceDirectory>src</sourceDirectory> 
    244244    <unitTestSourceDirectory>test</unitTestSourceDirectory> 
    245     <integrationUnitTestSourceDirectory>itest</integrationUnitTestSourceDirectory> 
    246245    <unitTest> 
    247246      <includes> 
    248         <include>${basedir}/test/**/*Test.java</include> 
    249         <include>${basedir}/itest/**/*Test.java</include> 
     247        <include>**/*Test.java</include> 
    250248      </includes> 
    251249    </unitTest> 

  • branches/omero/components/shoola-adapter/.classpath

    r96 r100  
    55        <classpathentry kind="var" path="MAVEN_REPO/junit/jars/junit-3.8.1.jar"/> 
    66        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> 
    7         <classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-model-1.0.jar"/> 
     7        <classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-common-1.0.jar"/> 
    88        <classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-client-1.0.jar"/> 
    99        <classpathentry kind="var" path="MAVEN_REPO/springframework/jars/spring-1.2.1.jar"/> 

  • branches/omero/components/shoola-adapter/project.xml

    r96 r100  
    1212    <dependency> 
    1313      <groupId>${pom.groupId}</groupId> 
    14       <artifactId>${pom.groupId}-model</artifactId> 
     14      <artifactId>${pom.groupId}-common</artifactId> 
    1515      <version>1.0</version> 
    1616    </dependency> 

  • branches/omero/components/test/.classpath

    r86 r100  
    66  <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"> 
    77  </classpathentry> 
    8   <classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-model-1.0.jar"> 
     8  <classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-common-1.0.jar"> 
    99  </classpathentry> 
    1010  <classpathentry kind="var" path="MAVEN_REPO/omero/jars/omero-client-1.0.jar"> 

  • branches/omero/components/test/project.xml

    r96 r100  
    1212    <dependency> 
    1313      <groupId>${pom.groupId}</groupId> 
    14       <artifactId>${pom.groupId}-model</artifactId> 
     14      <artifactId>${pom.groupId}-common</artifactId> 
    1515      <version>1.0</version> 
    1616    </dependency> 

  • branches/omero/components/test/src/org/openmicroscopy/shoola/env/data/t/GrinderTest.java

    r86 r100  
    3636 
    3737//Application-internal dependencies 
    38 import org.openmicroscopy.omero.tests.client.OMEData; 
    39 import org.openmicroscopy.omero.tests.client.OMEPerformanceData; 
     38import org.openmicroscopy.omero.tests.OMEData; 
     39import org.openmicroscopy.omero.tests.OMEPerformanceData; 
    4040import org.openmicroscopy.shoola.env.data.DataManagementService; 
    4141import org.openmicroscopy.shoola.env.data.DataServicesTestCase; 

  • branches/omero/maven.xml

    r98 r100  
    11<?xml version="1.0" encoding="UTF-8"?> 
    2 <project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:maven="jelly:maven" default="build"> 
     2<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" 
     3xmlns:maven="jelly:maven" xmlns:u="jelly:util" default="help"> 
     4 
     5<!-- Dependencies --> 
     6   <preGoal name="jar:jar"> 
     7     <attainGoal name="jam"/> 
     8     <attainGoal name="create-properties"/> 
     9   </preGoal> 
     10   <preGoal name="war:init"> 
     11     <attainGoal name="jam"/> 
     12     <attainGoal name="create-properties"/> 
     13   </preGoal> 
     14   <preGoal name="test:test"> 
     15     <attainGoal name="filterTests"/> 
     16   </preGoal> 
     17 
     18<!-- Setup -->  
     19  <goal name="get-tomcat-plugin"> 
     20    <maven:property name="artifactId" defaultValue="maven-tomcat-plugin" /> 
     21    <maven:property name="groupId" defaultValue="codeczar-tomcat" /> 
     22    <maven:property name="version" defaultValue="1.1" /> 
     23    <attainGoal name="plugin:download"/> 
     24  </goal> 
     25 
    326 
    427<!-- For calling from the top level --> 
    … …  
    1437  </goal> 
    1538 
     39 
    1640<!-- From calling within a component --> 
    1741  <goal name="create-properties"> 
    1842    <ant:sequential> 
     43      <ant:mkdir dir="${maven.build.dest}"/> 
    1944      <ant:propertyfile  
    2045        comment=" Database and Server properties generated from build properties"  
    … …  
    3358   </goal> 
    3459 
    35    <preGoal name="jar:jar"> 
    36      <attainGoal name="jam"/> 
    37      <attainGoal name="create-properties"/> 
    38    </preGoal> 
    39    <preGoal name="war:init"> 
    40      <attainGoal name="jam"/> 
    41      <attainGoal name="create-properties"/> 
    42    </preGoal> 
    43  
    4460   <goal name="itest"> 
    4561     <ant:ant 
    … …  
    5167   </goal> 
    5268 
    53 <!-- Misc -->  
    54   <goal name="get-tomcat-plugin"> 
    55     <maven:property name="artifactId" defaultValue="maven-tomcat-plugin" /> 
    56     <maven:property name="groupId" defaultValue="codeczar-tomcat" /> 
    57     <maven:property name="version" defaultValue="1.1" /> 
    58     <attainGoal name="plugin:download"/> 
    59   </goal> 
     69  <goal name="filterTests"> 
     70   <j:set var="testModeX" value="${maven.test.mode}X" /> 
     71   <j:if test="${testModeX == 'X'}" > 
     72     <j:set var="maven.test.mode" value="all" /> 
     73   </j:if> 
     74   <echo>Running ${maven.test.mode} tests</echo> 
     75   <j:if test="${maven.test.mode != 'all'}" > 
     76     <j:set var="includeProp" value="test.${maven.test.mode}.includes" /> 
     77     <j:if test="${context.getVariable(includeProp) != null}"> 
     78       <u:tokenize var="patterns" delim=",">${context.getVariable(includeProp)}</u:tokenize> 
     79       <j:forEach var="pattern" items="${patterns}"> 
     80         <j:set var="dummy" value="${pom.build.unitTest.addInclude(pattern)}" /> 
     81       </j:forEach> 
     82     </j:if> 
     83     <j:set var="excludeProp" value="test.${maven.test.mode}.excludes" /> 
     84     <j:if test="${context.getVariable(excludeProp) != null}"> 
     85       <u:tokenize var="patterns" delim=",">${context.getVariable(excludeProp)}</u:tokenize>