Commit 8d2419fd authored by Brian Major's avatar Brian Major
Browse files

s1965 - corrected 'no ldap config' exception catching

parent 307c3edf

cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java

+2 −3
Original line number Original line Diff line number Diff line
@@ -83,7 +83,6 @@ import javax.security.auth.Subject; 
import javax.security.auth.x500.X500Principal;

import javax.security.auth.x500.X500Principal;

import java.lang.reflect.Field;

import java.lang.reflect.Field;

import java.util.UUID;

import java.util.UUID;

import java.io.FileNotFoundException;

import java.util.NoSuchElementException;

import java.util.NoSuchElementException;





/**

/**
@@ -138,7 +137,7 @@ public class AbstractLdapDAOTest 
        {

        {

            config = getLdapConfig();

            config = getLdapConfig();

        }

        }

        catch (FileNotFoundException e)

        catch (RuntimeException e)

        {

        {

            log.warn("Skipping integration test: no ~/.dbrc file");

            log.warn("Skipping integration test: no ~/.dbrc file");

            org.junit.Assume.assumeTrue(false);

            org.junit.Assume.assumeTrue(false);
@@ -240,7 +239,7 @@ public class AbstractLdapDAOTest 
        return new LdapUserDAO(connections);

        return new LdapUserDAO(connections);

    }

    }





    static protected LdapConfig getLdapConfig() throws Exception

    static protected LdapConfig getLdapConfig()

    {

    {

        return LdapConfig.loadLdapConfig(CONFIG);

        return LdapConfig.loadLdapConfig(CONFIG);

    }

    }