Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 37413 invoked from network); 26 May 2008 22:32:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 May 2008 22:32:24 -0000 Received: (qmail 50935 invoked by uid 500); 26 May 2008 22:32:26 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 50898 invoked by uid 500); 26 May 2008 22:32:26 -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 50889 invoked by uid 99); 26 May 2008 22:32:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 May 2008 15:32:26 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 May 2008 22:31:38 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CC86823889F7; Mon, 26 May 2008 15:31:58 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r660327 - /directory/apacheds/branches/bigbang/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Date: Mon, 26 May 2008 22:31:57 -0000 To: commits@directory.apache.org From: akarasulu@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080526223158.CC86823889F7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: akarasulu Date: Mon May 26 15:31:53 2008 New Revision: 660327 URL: http://svn.apache.org/viewvc?rev=660327&view=rev Log: fixing tests after adding {self:self} tuple in sublevel index Modified: directory/apacheds/branches/bigbang/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Modified: directory/apacheds/branches/bigbang/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java?rev=660327&r1=660326&r2=660327&view=diff ============================================================================== --- directory/apacheds/branches/bigbang/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java (original) +++ directory/apacheds/branches/bigbang/xdbm-search/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java Mon May 26 15:31:53 2008 @@ -155,6 +155,13 @@ assertTrue( cursor.available() ); IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); + assertEquals( 2L, ( long ) indexEntry.getId() ); + assertEquals( 2L, ( long ) indexEntry.getValue() ); + + assertTrue( cursor.next() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); assertEquals( 5L, ( long ) indexEntry.getId() ); assertEquals( 2L, ( long ) indexEntry.getValue() ); @@ -177,6 +184,13 @@ assertTrue( cursor.available() ); indexEntry = cursor.get(); assertNotNull( indexEntry ); + assertEquals( 2L, ( long ) indexEntry.getId() ); + assertEquals( 2L, ( long ) indexEntry.getValue() ); + + assertTrue( cursor.next() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); assertEquals( 5L, ( long ) indexEntry.getId() ); assertEquals( 2L, ( long ) indexEntry.getValue() ); @@ -210,6 +224,13 @@ assertEquals( 5L, ( long ) indexEntry.getId() ); assertEquals( 2L, ( long ) indexEntry.getValue() ); + assertTrue( cursor.previous() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); + assertEquals( 2L, ( long ) indexEntry.getId() ); + assertEquals( 2L, ( long ) indexEntry.getValue() ); + assertFalse( cursor.previous() ); assertFalse( cursor.available() ); @@ -232,6 +253,13 @@ assertEquals( 5L, ( long ) indexEntry.getId() ); assertEquals( 2L, ( long ) indexEntry.getValue() ); + assertTrue( cursor.previous() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); + assertEquals( 2L, ( long ) indexEntry.getId() ); + assertEquals( 2L, ( long ) indexEntry.getValue() ); + assertFalse( cursor.previous() ); assertFalse( cursor.available() ); @@ -254,6 +282,13 @@ assertEquals( 5L, ( long ) indexEntry.getId() ); assertEquals( 2L, ( long ) indexEntry.getValue() ); + assertTrue( cursor.previous() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); + assertEquals( 2L, ( long ) indexEntry.getId() ); + assertEquals( 2L, ( long ) indexEntry.getValue() ); + assertFalse( cursor.previous() ); assertFalse( cursor.available() ); } @@ -280,6 +315,13 @@ assertTrue( cursor.available() ); IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); + assertEquals( 3L, ( long ) indexEntry.getId() ); + assertEquals( 3L, ( long ) indexEntry.getValue() ); + + assertTrue( cursor.next() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); @@ -302,6 +344,13 @@ assertTrue( cursor.available() ); indexEntry = cursor.get(); assertNotNull( indexEntry ); + assertEquals( 3L, ( long ) indexEntry.getId() ); + assertEquals( 3L, ( long ) indexEntry.getValue() ); + + assertTrue( cursor.next() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); @@ -335,6 +384,13 @@ assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); + assertTrue( cursor.previous() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); + assertEquals( 3L, ( long ) indexEntry.getId() ); + assertEquals( 3L, ( long ) indexEntry.getValue() ); + assertFalse( cursor.previous() ); assertFalse( cursor.available() ); @@ -357,6 +413,13 @@ assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); + assertTrue( cursor.previous() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); + assertEquals( 3L, ( long ) indexEntry.getId() ); + assertEquals( 3L, ( long ) indexEntry.getValue() ); + assertFalse( cursor.previous() ); assertFalse( cursor.available() ); @@ -379,6 +442,13 @@ assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); + assertTrue( cursor.previous() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); + assertEquals( 3L, ( long ) indexEntry.getId() ); + assertEquals( 3L, ( long ) indexEntry.getValue() ); + assertFalse( cursor.previous() ); assertFalse( cursor.available() ); @@ -391,6 +461,13 @@ assertTrue( cursor.available() ); indexEntry = cursor.get(); assertNotNull( indexEntry ); + assertEquals( 3L, ( long ) indexEntry.getId() ); + assertEquals( 3L, ( long ) indexEntry.getValue() ); + + assertTrue( cursor.next() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); @@ -430,6 +507,13 @@ assertTrue( cursor.available() ); IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); + assertEquals( 7L, ( long ) indexEntry.getId() ); + assertEquals( 7L, ( long ) indexEntry.getValue() ); + + assertTrue( cursor.next() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); assertEquals( 6L, ( long ) indexEntry.getId() ); assertEquals( 7L, ( long ) indexEntry.getValue() ); @@ -445,6 +529,13 @@ assertTrue( cursor.available() ); indexEntry = cursor.get(); assertNotNull( indexEntry ); + assertEquals( 7L, ( long ) indexEntry.getId() ); + assertEquals( 7L, ( long ) indexEntry.getValue() ); + + assertTrue( cursor.next() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); assertEquals( 6L, ( long ) indexEntry.getId() ); assertEquals( 7L, ( long ) indexEntry.getValue() ); @@ -464,6 +555,13 @@ assertEquals( 6L, ( long ) indexEntry.getId() ); assertEquals( 7L, ( long ) indexEntry.getValue() ); + assertTrue( cursor.previous() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); + assertEquals( 7L, ( long ) indexEntry.getId() ); + assertEquals( 7L, ( long ) indexEntry.getValue() ); + assertFalse( cursor.previous() ); assertFalse( cursor.available() ); @@ -479,6 +577,13 @@ assertEquals( 6L, ( long ) indexEntry.getId() ); assertEquals( 7L, ( long ) indexEntry.getValue() ); + assertTrue( cursor.previous() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); + assertEquals( 7L, ( long ) indexEntry.getId() ); + assertEquals( 7L, ( long ) indexEntry.getValue() ); + assertFalse( cursor.previous() ); assertFalse( cursor.available() ); @@ -494,6 +599,13 @@ assertEquals( 6L, ( long ) indexEntry.getId() ); assertEquals( 7L, ( long ) indexEntry.getValue() ); + assertTrue( cursor.previous() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); + assertEquals( 7L, ( long ) indexEntry.getId() ); + assertEquals( 7L, ( long ) indexEntry.getValue() ); + assertFalse( cursor.previous() ); assertFalse( cursor.available() ); } @@ -546,6 +658,13 @@ assertTrue( cursor.available() ); IndexEntry indexEntry = cursor.get(); assertNotNull( indexEntry ); + assertEquals( 3L, ( long ) indexEntry.getId() ); + assertEquals( 3L, ( long ) indexEntry.getValue() ); + + assertTrue( cursor.next() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); @@ -583,6 +702,13 @@ assertTrue( cursor.available() ); indexEntry = cursor.get(); assertNotNull( indexEntry ); + assertEquals( 7L, ( long ) indexEntry.getId() ); + assertEquals( 3L, ( long ) indexEntry.getValue() ); + + assertTrue( cursor.next() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); assertEquals( 13L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); @@ -637,6 +763,13 @@ assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); + assertTrue( cursor.previous() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); + assertEquals( 3L, ( long ) indexEntry.getId() ); + assertEquals( 3L, ( long ) indexEntry.getValue() ); + assertFalse( cursor.previous() ); assertFalse( cursor.available() ); @@ -673,6 +806,13 @@ assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); + assertTrue( cursor.previous() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); + assertEquals( 3L, ( long ) indexEntry.getId() ); + assertEquals( 3L, ( long ) indexEntry.getValue() ); + assertFalse( cursor.previous() ); assertFalse( cursor.available() ); @@ -709,6 +849,13 @@ assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() ); + assertTrue( cursor.previous() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); + assertEquals( 3L, ( long ) indexEntry.getId() ); + assertEquals( 3L, ( long ) indexEntry.getValue() ); + assertFalse( cursor.previous() ); assertFalse( cursor.available() ); @@ -721,6 +868,13 @@ assertTrue( cursor.available() ); indexEntry = cursor.get(); assertNotNull( indexEntry ); + assertEquals( 3L, ( long ) indexEntry.getId() ); + assertEquals( 3L, ( long ) indexEntry.getValue() ); + + assertTrue( cursor.next() ); + assertTrue( cursor.available() ); + indexEntry = cursor.get(); + assertNotNull( indexEntry ); assertEquals( 7L, ( long ) indexEntry.getId() ); assertEquals( 3L, ( long ) indexEntry.getValue() );