From 61bddab5202fc3077655391ad5d458dc4c7756f6 Mon Sep 17 00:00:00 2001 From: Jeremy Nguyen Xuan Date: Fri, 9 Dec 2016 15:49:07 -0800 Subject: [PATCH] fixed unit tests --- .../services/resources/MatchResourceTest.java | 57 ++++++++++++---------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/owlsim-services/src/test/java/org/monarchinitiative/owlsim/services/resources/MatchResourceTest.java b/owlsim-services/src/test/java/org/monarchinitiative/owlsim/services/resources/MatchResourceTest.java index ccc363f..cf61e66 100644 --- a/owlsim-services/src/test/java/org/monarchinitiative/owlsim/services/resources/MatchResourceTest.java +++ b/owlsim-services/src/test/java/org/monarchinitiative/owlsim/services/resources/MatchResourceTest.java @@ -17,31 +17,36 @@ public class MatchResourceTest { - MatchResource match; - - @Before - public void setup() { - match = new MatchResource(); - ProfileMatcher matcher = mock(ProfileMatcher.class); - NegationAwareProfileMatcher negatedMatcher = mock(NegationAwareProfileMatcher.class); - match.matchers = new HashMap<>(); - match.matchers.put("foo", matcher); - match.matchers.put("notfoo", negatedMatcher); - } - - @Test(expected=UnknownMatcherException.class) - public void testUnkownMatcher() throws UnknownFilterException, IncoherentStateException { - match.getMatches("unknown", Collections.emptySet(), Collections.emptySet(), null, null); - } - - @Test(expected=NonNegatedMatcherException.class) - public void testNegatedIdsWithNonNegatedMatcher() throws UnknownFilterException, IncoherentStateException { - match.getMatches("foo", Collections.emptySet(), newHashSet("not me"), null, null); - } - - @Test - public void testNegatedIdsWithNegatedMatcher() throws UnknownFilterException, IncoherentStateException { - match.getMatches("notfoo", Collections.emptySet(), newHashSet("not me"), null, null); - } + MatchResource match; + + @Before + public void setup() { + match = new MatchResource(); + ProfileMatcher matcher = mock(ProfileMatcher.class); + NegationAwareProfileMatcher negatedMatcher = mock(NegationAwareProfileMatcher.class); + match.matchers = new HashMap<>(); + match.matchers.put("foo", matcher); + match.matchers.put("notfoo", negatedMatcher); + } + + @Test(expected = UnknownMatcherException.class) + public void testUnkownMatcher() throws UnknownFilterException, IncoherentStateException { + match.getMatches("unknown", Collections.emptySet(), Collections.emptySet(), + Collections.emptySet(), null, null); + } + + @Test(expected = NonNegatedMatcherException.class) + public void testNegatedIdsWithNonNegatedMatcher() + throws UnknownFilterException, IncoherentStateException { + match.getMatches("foo", Collections.emptySet(), + newHashSet("not me"), Collections.emptySet(), null, null); + } + + @Test + public void testNegatedIdsWithNegatedMatcher() + throws UnknownFilterException, IncoherentStateException { + match.getMatches("notfoo", Collections.emptySet(), Collections.emptySet(), + newHashSet("not me"), null, null); + } }