Commit aa30020c authored by Brian Major's avatar Brian Major
Browse files

ac2 - fixed test config typo

parent 054eb78c

projects/cadcAccessControl-Server/test/LdapConfig.test.properties

+6 −6
Original line number Diff line number Diff line
@@ -20,12 +20,12 @@ readWrite.maxWait = 30000 
readWrite.createIfNeeded = false



# Unbound-Read-write connection pool

unbopundReadOnly.servers = proc5-03.cadc.dao.nrc.ca

unbopundReadOnly.poolInitSize = 1

unbopundReadOnly.poolMaxSize = 1

unbopundReadOnly.poolPolicy = roundRobin

unbopundReadOnly.maxWait = 30000

unbopundReadOnly.createIfNeeded = false

unboundReadOnly.servers = proc5-03.cadc.dao.nrc.ca

unboundReadOnly.poolInitSize = 1

unboundReadOnly.poolMaxSize = 1

unboundReadOnly.poolPolicy = roundRobin

unboundReadOnly.maxWait = 30000

unboundReadOnly.createIfNeeded = false



# server configuration -- applies to all servers

dbrcHost = devLdap

projects/cadcAccessControl-Server/test/src/ca/nrc/cadc/ac/server/ldap/LdapConnectionsTest.java

+0 −46
Original line number Diff line number Diff line
@@ -145,50 +145,4 @@ public class LdapConnectionsTest 
        }

    }



//    @Test

//    public void testManualConfig()

//    {

//        try

//        {

//            LDAPConnection readConn = new LDAPConnection();

//            LDAPConnection writeConn = new LDAPConnection();

//            LdapConnectionPool pool = EasyMock.createMock(LdapConnectionPool.class);

//

//            EasyMock.expect(pool.getConnection()).andReturn(readConn).once();

//            EasyMock.expect(pool.getReadWriteConnection()).andReturn(writeConn).once();

//            EasyMock.expect(pool.getCurrentConfig()).andReturn(null).once();

//

//            pool.releaseReadOnlyConnection(readConn);

//            EasyMock.expectLastCall().once();

//

//            pool.releaseReadWriteConnection(writeConn);

//            EasyMock.expectLastCall().once();

//

//            EasyMock.replay(pool);

//

//            LdapConnections connections = new LdapConnections(pool);

//

//            // multiple calls to get connections should only go to the pool once

//            connections.getReadOnlyConnection();

//            connections.getReadOnlyConnection();

//            connections.getReadOnlyConnection();

//

//            connections.getReadWriteConnection();

//            connections.getReadWriteConnection();

//            connections.getReadWriteConnection();

//

//            connections.getCurrentConfig();

//

//            connections.releaseConnections();

//

//            EasyMock.verify(pool);

//

//        }

//        catch (Exception e)

//        {

//            log.error("Unexpected exception", e);

//            Assert.fail("Unexpected exception");

//        }

//    }



}