Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 20663 invoked from network); 6 May 2009 19:05:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 May 2009 19:05:48 -0000 Received: (qmail 92472 invoked by uid 500); 6 May 2009 19:05:48 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 92417 invoked by uid 500); 6 May 2009 19:05:48 -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 92408 invoked by uid 99); 6 May 2009 19:05:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 May 2009 19:05:48 +0000 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; Wed, 06 May 2009 19:05:46 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 3A4E923889FD; Wed, 6 May 2009 19:05:26 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r772403 - in /directory/studio/trunk: ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java Date: Wed, 06 May 2009 19:05:26 -0000 To: commits@directory.apache.org From: seelmann@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090506190526.3A4E923889FD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: seelmann Date: Wed May 6 19:05:25 2009 New Revision: 772403 URL: http://svn.apache.org/viewvc?rev=772403&view=rev Log: Fix for DIRSTUDIO-486 (Include Version Specifier in LDIF export) Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java Modified: directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java?rev=772403&r1=772402&r2=772403&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java (original) +++ directory/studio/trunk/ldapbrowser-core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportLdifJob.java Wed May 6 19:05:25 2009 @@ -50,12 +50,14 @@ import org.apache.directory.studio.ldapbrowser.core.utils.JNDIUtils; import org.apache.directory.studio.ldapbrowser.core.utils.ModelConverter; import org.apache.directory.studio.ldapbrowser.core.utils.Utils; +import org.apache.directory.studio.ldifparser.LdifFormatParameters; import org.apache.directory.studio.ldifparser.model.LdifEnumeration; import org.apache.directory.studio.ldifparser.model.container.LdifContainer; import org.apache.directory.studio.ldifparser.model.container.LdifContentRecord; import org.apache.directory.studio.ldifparser.model.lines.LdifAttrValLine; import org.apache.directory.studio.ldifparser.model.lines.LdifDnLine; import org.apache.directory.studio.ldifparser.model.lines.LdifSepLine; +import org.apache.directory.studio.ldifparser.model.lines.LdifVersionLine; /** @@ -153,7 +155,17 @@ try { JndiLdifEnumeration enumeration = search( browserConnection, searchParameter, monitor ); + LdifFormatParameters ldifFormatParameters = Utils.getLdifFormatParameters(); + // add version spec + LdifVersionLine ldifVersionLine = LdifVersionLine.create(); + String ldifVersionLineString = ldifVersionLine.toFormattedString( ldifFormatParameters ); + bufferedWriter.write( ldifVersionLineString ); + LdifSepLine ldifSepLine = LdifSepLine.create(); + String ldifSepLineString = ldifSepLine.toFormattedString( ldifFormatParameters ); + bufferedWriter.write( ldifSepLineString ); + + // add the records while ( !monitor.isCanceled() && !monitor.errorsReported() && enumeration.hasNext() ) { LdifContainer container = enumeration.next(); @@ -175,7 +187,7 @@ newRecord.addAttrVal( attrValLines[i] ); } newRecord.finish( sepLine ); - String s = newRecord.toFormattedString( Utils.getLdifFormatParameters() ); + String s = newRecord.toFormattedString( ldifFormatParameters ); // String s = record.toFormattedString(); bufferedWriter.write( s ); Modified: directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java?rev=772403&r1=772402&r2=772403&view=diff ============================================================================== --- directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java (original) +++ directory/studio/trunk/test-integration-ui/src/main/java/org/apache/directory/studio/test/integration/ui/ImportExportTest.java Wed May 6 19:05:25 2009 @@ -104,11 +104,13 @@ eBot.comboBoxWithLabel( "LDIF File:" ).setText( file ); eBot.button( "Finish" ).click(); - // verify that exported LDIF starts with the Base64 encoded DN eBot.sleep( 2000 ); - String content = FileUtils.readFileToString( new File( file ) ); - assertTrue( "LDIF must start with Base64 encoded DN.", content - .startsWith( "dn:: Y249V29sZmdhbmcgS8O2bGJlbCxvdT11c2VycyxvdT1zeXN0ZW0=" ) ); + List lines = FileUtils.readLines( new File( file ) ); + // verify that the first line of exported LDIF is "version: 1" + assertEquals( "LDIF must start with version: 1", lines.get( 0 ), "version: 1" ); + // verify that the third line of exported LDIF is the Base64 encoded DN + assertEquals( "Expected Base64 encoded DN", lines.get( 2 ), + "dn:: Y249V29sZmdhbmcgS8O2bGJlbCxvdT11c2VycyxvdT1zeXN0ZW0=" ); // delete entry SWTBotUtils.asyncClick( eBot, browserTree.contextMenu( "Delete Entry" ), new DefaultCondition()