Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 42563 invoked from network); 5 May 2005 15:35:13 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 5 May 2005 15:35:13 -0000 Received: (qmail 29402 invoked by uid 500); 5 May 2005 15:32:08 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 29348 invoked by uid 500); 5 May 2005 15:32:07 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 29249 invoked by uid 99); 5 May 2005 15:32:06 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Thu, 05 May 2005 08:32:06 -0700 Received: (qmail 41014 invoked by uid 65534); 5 May 2005 15:29:40 -0000 Message-ID: <20050505152940.41013.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Subject: svn commit: r168341 - /directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/spnego/codec/SpnegoTest.java Date: Thu, 05 May 2005 15:29:40 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.0-dev X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: elecharny Date: Thu May 5 08:29:39 2005 New Revision: 168341 URL: http://svn.apache.org/viewcvs?rev=3D168341&view=3Drev Log: Fixed a reference to BindRequestTest that were still used, due to a copy/pa= st.=20 Changed the function that checks the reqFlags. Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/spnego/= codec/SpnegoTest.java Modified: directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/s= pnego/codec/SpnegoTest.java URL: http://svn.apache.org/viewcvs/directory/sandbox/trunk/asn1-new-codec/s= rc/test/org/apache/asn1/spnego/codec/SpnegoTest.java?rev=3D168341&r1=3D1683= 40&r2=3D168341&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/trunk/asn1-new-codec/src/test/org/apache/asn1/spnego/= codec/SpnegoTest.java (original) +++ directory/sandbox/trunk/asn1-new-codec/src/test/org/apache/asn1/spnego/= codec/SpnegoTest.java Thu May 5 08:29:39 2005 @@ -21,7 +21,6 @@ import org.apache.asn1.DecoderException; import org.apache.asn1.ber.Asn1Decoder; import org.apache.asn1.ber.containers.IAsn1Container; -import org.apache.asn1.ldap.codec.BindRequestTest; import org.apache.asn1.primitives.OID; import org.apache.asn1.primitives.OctetString; import org.apache.asn1.spnego.pojo.SpnegoNegTokenInitPOJO; @@ -38,7 +37,7 @@ */ public class SpnegoTest extends TestCase { /** Logger */ - protected static Logger log =3D Logger.getLogger( BindRequestTest.clas= s ); + private static Logger log =3D Logger.getLogger( SpnegoTest.class ); =20 static { @@ -49,15 +48,15 @@ * Check the default value of Req Flags * @param spnego The spnego POJO to test */ - private void checkDefaultReqFlags(SpnegoPOJO spnego) + private boolean checkDefaultReqFlags(SpnegoNegTokenInitPOJO spnegoNegT= okenInit) { - Assert.assertEquals(false, ((SpnegoNegTokenInitPOJO)spnego).isAnon= Flag()); - Assert.assertEquals(false, ((SpnegoNegTokenInitPOJO)spnego).isConf= Flag()); - Assert.assertEquals(false, ((SpnegoNegTokenInitPOJO)spnego).isDele= gFlag()); - Assert.assertEquals(false, ((SpnegoNegTokenInitPOJO)spnego).isInte= gFlag()); - Assert.assertEquals(false, ((SpnegoNegTokenInitPOJO)spnego).isMutu= alFlag()); - Assert.assertEquals(false, ((SpnegoNegTokenInitPOJO)spnego).isRepl= ayFlag()); - Assert.assertEquals(false, ((SpnegoNegTokenInitPOJO)spnego).isSequ= enceFlag()); + return !spnegoNegTokenInit.isAnonFlag() && + !spnegoNegTokenInit.isConfFlag() && + !spnegoNegTokenInit.isDelegFlag() && + !spnegoNegTokenInit.isIntegFlag() && + !spnegoNegTokenInit.isMutualFlag() && + !spnegoNegTokenInit.isReplayFlag() && + !spnegoNegTokenInit.isSequenceFlag(); } =20 /** @@ -123,7 +122,7 @@ Assert.assertEquals(0, nbOids); =20 // Check the reqFlags - checkDefaultReqFlags(spnego); + Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spn= ego)); =20 // Check the mech token Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMech= Token()); @@ -203,7 +202,7 @@ Assert.assertEquals("1.2.840.48018.1.2.2", oids[0].getOID()); =20 // Check the reqFlags - checkDefaultReqFlags(spnego); + Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spn= ego)); =20 // Check the mech token Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMech= Token()); @@ -296,7 +295,7 @@ } =20 // Check the reqFlags - checkDefaultReqFlags(spnego); + Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spn= ego)); =20 // Check the mech token Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMech= Token()); @@ -386,7 +385,7 @@ } =20 // Check the reqFlags - checkDefaultReqFlags(spnego); + Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spn= ego)); =20 // Check the mech token Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMech= Token()); @@ -556,7 +555,7 @@ Assert.assertEquals(0, nbOids); =20 // Check the reqFlags - checkDefaultReqFlags(spnego); + Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spn= ego)); =20 // Check the mech token OctetString mechToken =3D ((SpnegoNegTokenInitPOJO)spnego).getMech= Token(); @@ -636,7 +635,7 @@ Assert.assertEquals(0, nbOids); =20 // Check the reqFlags - checkDefaultReqFlags(spnego); + Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spn= ego)); =20 // Check the mech token Assert.assertEquals("[61][62][63][64]", ((SpnegoNegTokenInitPOJO)s= pnego).getMechToken().toString()); @@ -719,7 +718,7 @@ Assert.assertEquals(0, nbOids); =20 // Check the reqFlags - checkDefaultReqFlags(spnego); + Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spn= ego)); =20 // Check the mech token OctetString mechToken =3D ((SpnegoNegTokenInitPOJO)spnego).getMech= Token(); @@ -803,7 +802,7 @@ Assert.assertEquals(0, nbOids); =20 // Check the reqFlags - checkDefaultReqFlags(spnego); + Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spn= ego)); =20 // Check the mech token Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMech= Token()); @@ -883,7 +882,7 @@ Assert.assertEquals(0, nbOids); =20 // Check the reqFlags - checkDefaultReqFlags(spnego); + Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spn= ego)); =20 // Check the mech token Assert.assertEquals(null, ((SpnegoNegTokenInitPOJO)spnego).getMech= Token()); @@ -969,7 +968,7 @@ Assert.assertEquals("1.2.840.113554.1.2.2", oids[1].getOID()); =20 // Check the reqFlags - checkDefaultReqFlags(spnego); + Assert.assertTrue(checkDefaultReqFlags((SpnegoNegTokenInitPOJO)spn= ego)); =20 // Check the mech token Assert.assertEquals("[61][62][63][64]", ((SpnegoNegTokenInitPOJO)s= pnego).getMechToken().toString());