s1965 - reversed exception catching order (60bf4a9f) · Commits · OATS-CADC / ac

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

+5 −6

Original line number	Original line	Diff line number	Diff line
	@@ -137,19 +137,18 @@ public class AbstractLdapDAOTest
	{		{
	config = getLdapConfig();		config = getLdapConfig();
	}		}
	catch (RuntimeException e)		catch (NoSuchElementException e)
	{		{
	log.warn("Skipping integration test: no ~/.dbrc file");		log.warn("Skipping integration test: no entry in ~/.dbrc file");
	org.junit.Assume.assumeTrue(false);		org.junit.Assume.assumeTrue(false);
	return;		return;
	}		}
	catch (NoSuchElementException e)		catch (RuntimeException e)
	{		{
	log.warn("Skipping integration test: no entry in ~/.dbrc file");		log.warn("Skipping integration test: no ~/.dbrc file");
	org.junit.Assume.assumeTrue(false);		org.junit.Assume.assumeTrue(false);
	return;		return;
	}		}

	cadcDaoTest1_HttpPrincipal = new HttpPrincipal(cadcDaoTest1_CN);		cadcDaoTest1_HttpPrincipal = new HttpPrincipal(cadcDaoTest1_CN);
	cadcDaoTest2_HttpPrincipal = new HttpPrincipal(cadcDaoTest2_CN);		cadcDaoTest2_HttpPrincipal = new HttpPrincipal(cadcDaoTest2_CN);
	cadcDaoTest3_HttpPrincipal = new HttpPrincipal(cadcDaoTest3_CN);		cadcDaoTest3_HttpPrincipal = new HttpPrincipal(cadcDaoTest3_CN);
	@@ -239,7 +238,7 @@ public class AbstractLdapDAOTest
	return new LdapUserDAO(connections);		return new LdapUserDAO(connections);
	}		}

	static protected LdapConfig getLdapConfig()		static protected LdapConfig getLdapConfig() throws Exception
	{		{
	return LdapConfig.loadLdapConfig(CONFIG);		return LdapConfig.loadLdapConfig(CONFIG);
	}		}