Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OATS-CADC
ac
Commits
60bf4a9f
Commit
60bf4a9f
authored
Aug 25, 2016
by
Brian Major
Browse files
s1965 - reversed exception catching order
parent
8d2419fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
cadc-access-control-server/src/test/java/ca/nrc/cadc/ac/server/ldap/AbstractLdapDAOTest.java
View file @
60bf4a9f
...
...
@@ -137,19 +137,18 @@ public class AbstractLdapDAOTest
{
config
=
getLdapConfig
();
}
catch
(
Runtime
Exception
e
)
catch
(
NoSuchElement
Exception
e
)
{
log
.
warn
(
"Skipping integration test: no ~/.dbrc file"
);
log
.
warn
(
"Skipping integration test: no
entry in
~/.dbrc file"
);
org
.
junit
.
Assume
.
assumeTrue
(
false
);
return
;
}
catch
(
NoSuchElement
Exception
e
)
catch
(
Runtime
Exception
e
)
{
log
.
warn
(
"Skipping integration test: no
entry in
~/.dbrc file"
);
log
.
warn
(
"Skipping integration test: no ~/.dbrc file"
);
org
.
junit
.
Assume
.
assumeTrue
(
false
);
return
;
}
cadcDaoTest1_HttpPrincipal
=
new
HttpPrincipal
(
cadcDaoTest1_CN
);
cadcDaoTest2_HttpPrincipal
=
new
HttpPrincipal
(
cadcDaoTest2_CN
);
cadcDaoTest3_HttpPrincipal
=
new
HttpPrincipal
(
cadcDaoTest3_CN
);
...
...
@@ -239,7 +238,7 @@ public class AbstractLdapDAOTest
return
new
LdapUserDAO
(
connections
);
}
static
protected
LdapConfig
getLdapConfig
()
static
protected
LdapConfig
getLdapConfig
()
throws
Exception
{
return
LdapConfig
.
loadLdapConfig
(
CONFIG
);
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment