Return-Path: Delivered-To: apmail-directory-dev-archive@www.apache.org Received: (qmail 8515 invoked from network); 25 Dec 2009 11:04:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 25 Dec 2009 11:04:39 -0000 Received: (qmail 50363 invoked by uid 500); 25 Dec 2009 11:04:39 -0000 Delivered-To: apmail-directory-dev-archive@directory.apache.org Received: (qmail 50264 invoked by uid 500); 25 Dec 2009 11:04:38 -0000 Mailing-List: contact dev-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Apache Directory Developers List" Delivered-To: mailing list dev@directory.apache.org Received: (qmail 50254 invoked by uid 99); 25 Dec 2009 11:04:38 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Dec 2009 11:04:38 +0000 X-ASF-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL,BAYES_00 X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of paliwalashish@gmail.com designates 209.85.216.179 as permitted sender) Received: from [209.85.216.179] (HELO mail-px0-f179.google.com) (209.85.216.179) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Dec 2009 11:04:27 +0000 Received: by pxi9 with SMTP id 9so6567233pxi.32 for ; Fri, 25 Dec 2009 03:04:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:in-reply-to:references :date:message-id:subject:from:to:content-type :content-transfer-encoding; bh=BkVf+aYwROiWHY0fDQSg3jw33At1FULNz0vXwmOz9iA=; b=CScK7Lwr2TChu68D/TKMcqwcz/DnB3D1FIOah2rDJgyyWWAFkfi3DSd2VpkZVcW86i lOcWuNdByeCPRD5JDULo4x9WwmRdIElaSC0q/qJGLvHcvg61PXuUlK7nNcqP6BtWPkHk eNIVCeAEhrcSy55Y7S+pV9r4F9GRHLhggCU9E= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :content-type:content-transfer-encoding; b=KXn/hhMg0jZuT7rs4wqfUYLrMXlGBPUrcP+xXTmY/rie1TyysHxiXvlVZ9RNFxKZgA 2a7Tg9XVXFCM0dat3cQ3KFPpzL+6wC6sSMgEHs5Wnby+xd11/sVbn09Cx7jZfo+X3miF dndtRSO1aW4Q37IBgjw6XopWLx8ExJcpJqZPk= MIME-Version: 1.0 Received: by 10.141.88.12 with SMTP id q12mr8789208rvl.258.1261739046436; Fri, 25 Dec 2009 03:04:06 -0800 (PST) In-Reply-To: References: Date: Fri, 25 Dec 2009 04:04:06 -0700 Message-ID: Subject: Re: Unsubscribe From: Ashish To: Apache Directory Developers List Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable To unsubscribe pl read http://mina.apache.org/mailing-lists.html On Thu, Dec 24, 2009 at 7:44 AM, Joseph king wrote: > On Dec 24, 2009 9:35 AM, wrote: > > Author: elecharny > Date: Thu Dec 24 14:35:16 2009 > New Revision: 893767 > > URL: http://svn.apache.org/viewvc?rev=3D893767&view=3Drev > Log: > Added a flag to tell the test that it is run in a suite or not. > > Modified: > > =A0directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apa= che/directory/server/core/integ/AbstractTestUnit.java > > =A0directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apa= che/directory/server/core/integ/FrameworkRunner.java > > =A0directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apa= che/directory/server/core/integ/TestClassA.java > > =A0directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apa= che/directory/server/core/integ/TestClassB.java > > =A0directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apa= che/directory/server/core/integ/TestClassC.java > > Modified: > directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache= /directory/server/core/integ/AbstractTestUnit.java > URL: > http://svn.apache.org/viewvc/directory/sandbox/kayyagari/integ-test-frame= work/src/main/java/org/apache/directory/server/core/integ/AbstractTestUnit.= java?rev=3D893767&r1=3D893766&r2=3D893767&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- > directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache= /directory/server/core/integ/AbstractTestUnit.java > (original) > +++ > directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache= /directory/server/core/integ/AbstractTestUnit.java > Thu Dec 24 14:35:16 2009 > @@ -21,7 +21,18 @@ > > =A0import org.apache.directory.server.core.DirectoryService; > > + > +/** > + * An abstract class created to hold common elements. > + * > + * @author Apache Directory > Project > + * @version $Rev$, $Date$ > + */ > =A0public abstract class AbstractTestUnit > =A0{ > + =A0 =A0/** The used DirectoryService instance */ > =A0 =A0 public static DirectoryService service; > + > + =A0 =A0/** A flag set if the test is run in a suite */ > + =A0 =A0public static boolean isRunInSuite; > =A0} > > Modified: > directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache= /directory/server/core/integ/FrameworkRunner.java > URL: > http://svn.apache.org/viewvc/directory/sandbox/kayyagari/integ-test-frame= work/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.j= ava?rev=3D893767&r1=3D893766&r2=3D893767&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- > directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache= /directory/server/core/integ/FrameworkRunner.java > (original) > +++ > directory/sandbox/kayyagari/integ-test-framework/src/main/java/org/apache= /directory/server/core/integ/FrameworkRunner.java > Thu Dec 24 14:35:16 2009 > @@ -54,7 +54,10 @@ > =A0 =A0 private static final Logger LOG =3D LoggerFactory.getLogger( > FrameworkRunner.class ); > > =A0 =A0 /** The 'service' field in the run tests */ > - =A0 =A0private static final String DIRECTORYSERVICE_FIELD_NAME =3D "ser= vice"; > + =A0 =A0private static final String DIRECTORY_SERVICE_FIELD_NAME =3D "se= rvice"; > + > + =A0 =A0/** The filed used to tell the test that it is run in a suite */ > + =A0 =A0private static final String IS_RUN_IN_SUITE_FIELD_NAME =3D > "isRunInSuite"; > > =A0 =A0 /** The suite this class depend on, if any */ > =A0 =A0 private FrameworkSuite suite; > @@ -263,7 +266,7 @@ > =A0 =A0 =A0 =A0 =A0 =A0 { > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 // Use the default DS > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 DirectoryServiceFactory dsf =3D > FrameworkDirectoryServiceFactory.DEFAULT; > - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dsf.init( "suite-" + UUID.randomUUID().t= oString() ); > + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0dsf.init( "default" + UUID.randomUUID().= toString() ); > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 service =3D dsf.getDirectoryService(); > > =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 // same as in above else-if condition > @@ -309,8 +312,13 @@ > > =A0 =A0 =A0 =A0 =A0 =A0 // At this point, we know which service to use. > =A0 =A0 =A0 =A0 =A0 =A0 // Inject it into the class > - =A0 =A0 =A0 =A0 =A0 =A0Field field =3D getTestClass().getJavaClass().ge= tField( > DIRECTORYSERVICE_FIELD_NAME ); > + =A0 =A0 =A0 =A0 =A0 =A0Field field =3D getTestClass().getJavaClass().ge= tField( > DIRECTORY_SERVICE_FIELD_NAME ); > =A0 =A0 =A0 =A0 =A0 =A0 field.set( getTestClass().getJavaClass(), service= ); > + > + =A0 =A0 =A0 =A0 =A0 =A0// if we run this class in a suite, tell it to t= he test > + =A0 =A0 =A0 =A0 =A0 =A0field =3D getTestClass().getJavaClass().getField= ( > IS_RUN_IN_SUITE_FIELD_NAME ); > + =A0 =A0 =A0 =A0 =A0 =A0field.set( getTestClass().getJavaClass(), suite = !=3D null ); > + > > =A0 =A0 =A0 =A0 =A0 =A0 super.runChild( method, notifier ); > > > Modified: > directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache= /directory/server/core/integ/TestClassA.java > URL: > http://svn.apache.org/viewvc/directory/sandbox/kayyagari/integ-test-frame= work/src/test/java/org/apache/directory/server/core/integ/TestClassA.java?r= ev=3D893767&r1=3D893766&r2=3D893767&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- > directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache= /directory/server/core/integ/TestClassA.java > (original) > +++ > directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache= /directory/server/core/integ/TestClassA.java > Thu Dec 24 14:35:16 2009 > @@ -49,7 +49,11 @@ > =A0 =A0 =A0 =A0 }) > =A0 =A0 public void testWithFactoryAnnotation() throws Exception > =A0 =A0 { > - =A0 =A0 =A0 =A0assertTrue( service.getAdminSession().exists( new LdapDN= ( > "cn=3DtestSuite,ou=3Dsystem" ) ) ); > + =A0 =A0 =A0 =A0if ( isRunInSuite ) > + =A0 =A0 =A0 =A0{ > + =A0 =A0 =A0 =A0 =A0 =A0assertTrue( service.getAdminSession().exists( ne= w LdapDN( > "cn=3DtestSuite,ou=3Dsystem" ) ) ); > + =A0 =A0 =A0 =A0} > + > =A0 =A0 =A0 =A0 assertTrue( service.getAdminSession().exists( new LdapDN( > "cn=3DtestClassA,ou=3Dsystem" ) ) ); > =A0 =A0 =A0 =A0 assertTrue( service.getAdminSession().exists( new LdapDN( > "cn=3DtestMethodA,ou=3Dsystem" ) ) ); > =A0 =A0 } > @@ -65,7 +69,11 @@ > =A0 =A0 =A0 =A0 }) > =A0 =A0 public void testWithoutFactoryAnnotation() throws Exception > =A0 =A0 { > - =A0 =A0 =A0 =A0assertTrue( service.getAdminSession().exists( new LdapDN= ( > "cn=3DtestSuite,ou=3Dsystem" ) ) ); > + =A0 =A0 =A0 =A0if ( isRunInSuite ) > + =A0 =A0 =A0 =A0{ > + =A0 =A0 =A0 =A0 =A0 =A0assertTrue( service.getAdminSession().exists( ne= w LdapDN( > "cn=3DtestSuite,ou=3Dsystem" ) ) ); > + =A0 =A0 =A0 =A0} > + > =A0 =A0 =A0 =A0 assertTrue( service.getAdminSession().exists( new LdapDN( > "cn=3DtestClassA,ou=3Dsystem" ) ) ); > =A0 =A0 =A0 =A0 assertFalse( service.getAdminSession().exists( new LdapDN= ( > "cn=3DtestMethodA,ou=3Dsystem" ) ) ); > =A0 =A0 =A0 =A0 assertTrue( service.getAdminSession().exists( new LdapDN( > "cn=3DtestMethodWithApplyLdif,ou=3Dsystem" ) ) ); > > Modified: > directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache= /directory/server/core/integ/TestClassB.java > URL: > http://svn.apache.org/viewvc/directory/sandbox/kayyagari/integ-test-frame= work/src/test/java/org/apache/directory/server/core/integ/TestClassB.java?r= ev=3D893767&r1=3D893766&r2=3D893767&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- > directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache= /directory/server/core/integ/TestClassB.java > (original) > +++ > directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache= /directory/server/core/integ/TestClassB.java > Thu Dec 24 14:35:16 2009 > @@ -40,7 +40,11 @@ > =A0 =A0 @DSBuilder( factory=3DFrameworkDirectoryServiceFactory.class, nam= e=3D"test" > ) > =A0 =A0 public void testWithFactoryAnnotation() throws Exception > =A0 =A0 { > - =A0 =A0 =A0 =A0assertTrue( service.getAdminSession().exists( new LdapDN= ( > "cn=3DtestSuite,ou=3Dsystem" ) ) ); > + =A0 =A0 =A0 =A0if ( isRunInSuite ) > + =A0 =A0 =A0 =A0{ > + =A0 =A0 =A0 =A0 =A0 =A0assertTrue( service.getAdminSession().exists( ne= w LdapDN( > "cn=3DtestSuite,ou=3Dsystem" ) ) ); > + =A0 =A0 =A0 =A0} > + > =A0 =A0 =A0 =A0 assertTrue( service.getAdminSession().exists( new LdapDN( > "cn=3DtestClassB,ou=3Dsystem" ) ) ); > =A0 =A0 } > > @@ -52,7 +56,11 @@ > =A0 =A0 =A0 =A0 // commenting this to make maven report test success, unc= omment in > an IDE > =A0 =A0 =A0 =A0 // while running the TestSuite > =A0 =A0 =A0 =A0 // assertTrue( service.getAdminSession().exists( new Ldap= DN( > "cn=3DtestSuite,ou=3Dsystem" ) ) ); > - =A0 =A0 =A0 =A0assertTrue( service.getAdminSession().exists( new LdapDN= ( > "cn=3DtestSuite,ou=3Dsystem" ) ) ); > + =A0 =A0 =A0 =A0if ( isRunInSuite ) > + =A0 =A0 =A0 =A0{ > + =A0 =A0 =A0 =A0 =A0 =A0assertTrue( service.getAdminSession().exists( ne= w LdapDN( > "cn=3DtestSuite,ou=3Dsystem" ) ) ); > + =A0 =A0 =A0 =A0} > + > =A0 =A0 =A0 =A0 assertTrue( service.getAdminSession().exists( new LdapDN( > "cn=3DtestClassB,ou=3Dsystem" ) ) ); > =A0 =A0 } > =A0} > > Modified: > directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache= /directory/server/core/integ/TestClassC.java > URL: > http://svn.apache.org/viewvc/directory/sandbox/kayyagari/integ-test-frame= work/src/test/java/org/apache/directory/server/core/integ/TestClassC.java?r= ev=3D893767&r1=3D893766&r2=3D893767&view=3Ddiff > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- > directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache= /directory/server/core/integ/TestClassC.java > (original) > +++ > directory/sandbox/kayyagari/integ-test-framework/src/test/java/org/apache= /directory/server/core/integ/TestClassC.java > Thu Dec 24 14:35:16 2009 > @@ -39,7 +39,11 @@ > =A0 =A0 @Test > =A0 =A0 public void testWithoutMethodOrClassLevelFactory() throws Excepti= on > =A0 =A0 { > - =A0 =A0 =A0 =A0assertTrue( service.getAdminSession().exists( new LdapDN= ( > "cn=3DtestSuite,ou=3Dsystem" ) ) ); > + =A0 =A0 =A0 =A0if ( isRunInSuite ) > + =A0 =A0 =A0 =A0{ > + =A0 =A0 =A0 =A0 =A0 =A0assertTrue( service.getAdminSession().exists( ne= w LdapDN( > "cn=3DtestSuite,ou=3Dsystem" ) ) ); > + =A0 =A0 =A0 =A0} > + > =A0 =A0 =A0 =A0 assertTrue( service.getAdminSession().exists( new LdapDN( > "cn=3DtestClassC,ou=3Dsystem" ) ) ); > > =A0 =A0 =A0 =A0 // the below DN will be injected in TestClassB when ran a= s suite, > but that DN > > > --=20 thanks ashish Blog: http://www.ashishpaliwal.com/blog My Photo Galleries: http://www.pbase.com/ashishpaliwal