You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2013/05/25 13:45:03 UTC
svn commit: r1486319 - in
/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication:
ClientServerReplicationIT.java StaleEventLogDetectionIT.java
Author: elecharny
Date: Sat May 25 11:45:03 2013
New Revision: 1486319
URL: http://svn.apache.org/r1486319
Log:
Commented some System.out.println
Modified:
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/StaleEventLogDetectionIT.java
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java?rev=1486319&r1=1486318&r2=1486319&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/ClientServerReplicationIT.java Sat May 25 11:45:03 2013
@@ -262,9 +262,9 @@ public class ClientServerReplicationIT
assertFalse( consumerSession.exists( provUser.getDn() ) );
// add the entry and check it is replicated
- System.out.println( ">--------------------------------------- Adding " + provUser );
+ //System.out.println( ">--------------------------------------- Adding " + provUser );
providerSession.add( provUser );
- System.out.println( ">--------------------------------------- Added " );
+ //System.out.println( ">--------------------------------------- Added " );
assertTrue( providerSession.exists( provUser.getDn() ) );
assertTrue( checkEntryReplicated( provUser.getDn() ) );
@@ -274,9 +274,9 @@ public class ClientServerReplicationIT
modReq.setName( provUser.getDn() );
modReq.add( "userPassword", "secret" );
- System.out.println( ">--------------------------------------- Modifying " + modReq );
+ //System.out.println( ">--------------------------------------- Modifying " + modReq );
providerSession.modify( modReq );
- System.out.println( ">--------------------------------------- Modified " );
+ //System.out.println( ">--------------------------------------- Modified " );
assertTrue( checkEntryReplicated( provUser.getDn() ) );
compareEntries( provUser.getDn() );
@@ -437,7 +437,7 @@ public class ClientServerReplicationIT
private Entry restartConsumer( Entry provUser ) throws Exception
{
- System.out.println( "------------------------------------- Stop consumer" );
+ //System.out.println( "------------------------------------- Stop consumer" );
// Now stop the consumer
consumerServer.stop();
@@ -458,7 +458,7 @@ public class ClientServerReplicationIT
Thread.sleep( 1000 );
// Restart the consumer
- System.out.println( "------------------------------------- Start consumer" );
+ //System.out.println( "------------------------------------- Start consumer" );
consumerServer.start();
assertTrue( checkEntryDeletion( consumerSession, deletedUserDn ) );
Modified: directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/StaleEventLogDetectionIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/StaleEventLogDetectionIT.java?rev=1486319&r1=1486318&r2=1486319&view=diff
==============================================================================
--- directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/StaleEventLogDetectionIT.java (original)
+++ directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/replication/StaleEventLogDetectionIT.java Sat May 25 11:45:03 2013
@@ -58,6 +58,7 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+
/**
* Tests the stale event log removal capability
*
@@ -74,11 +75,12 @@ public class StaleEventLogDetectionIT
private static AtomicInteger entryCount = new AtomicInteger();
private static final int INSERT_COUNT = 10;
-
+
private static final int TOTAL_COUNT = INSERT_COUNT + 1;
private static File cookiesDir;
-
+
+
@BeforeClass
public static void setUp() throws Exception
{
@@ -93,22 +95,22 @@ public class StaleEventLogDetectionIT
providerSession.add( entry );
}
-
+
cookiesDir = new File( FileUtils.getTempDirectory(), MockSyncReplConsumer.COOKIES_DIR_NAME );
}
-
+
@Before
@After
public void deleteCookies() throws IOException
{
- if( cookiesDir.exists() )
+ if ( cookiesDir.exists() )
{
FileUtils.cleanDirectory( cookiesDir );
}
}
-
+
@AfterClass
public static void tearDown() throws Exception
{
@@ -281,7 +283,7 @@ public class StaleEventLogDetectionIT
@Test
public void testDeleteStaleEventLog() throws Exception
{
- System.out.println( "\n---> Running testDeleteStaleEventLog" );
+ //System.out.println( "\n---> Running testDeleteStaleEventLog" );
ReplicationConsumer consumer = createConsumer();
@@ -290,27 +292,27 @@ public class StaleEventLogDetectionIT
consumer.stop();
Thread.sleep( 5 * 1000 ); // let the journal be created and put in the map
-
+
SyncReplRequestHandler syncreplHandler = ( SyncReplRequestHandler ) providerServer.getReplicationReqHandler();
-
+
ReplicaEventLog log = syncreplHandler.getReplicaLogMap().values().iterator().next();
log.setMaxIdlePeriod( 10 ); // in seconds
-
+
syncreplHandler.getLogJanitor().setSleepTime( 1000 ); // every second
syncreplHandler.getLogJanitor().interrupt();
-
+
File replDir = providerServer.getDirectoryService().getInstanceLayout().getReplDirectory();
File logFile = new File( replDir, log.getName() + ".db" );
-
+
// there should be only one log file
assertTrue( logFile.exists() );
-
+
// let it sleep for 10 seconds + 5 seconds (above)
Thread.sleep( 10 * 1000 );
-
+
// there should be only one log file
assertFalse( logFile.exists() );
-
- System.out.println( "\n<-- Done" );
+
+ //System.out.println( "\n<-- Done" );
}
}