diff --git a/Core/test/unit/src/org/sleuthkit/autopsy/discovery/search/DomainSearchArtifactsCacheTest.java b/Core/test/unit/src/org/sleuthkit/autopsy/discovery/search/DomainSearchArtifactsCacheTest.java index 6b8d189d5d..4057b45174 100755 --- a/Core/test/unit/src/org/sleuthkit/autopsy/discovery/search/DomainSearchArtifactsCacheTest.java +++ b/Core/test/unit/src/org/sleuthkit/autopsy/discovery/search/DomainSearchArtifactsCacheTest.java @@ -32,28 +32,28 @@ import org.sleuthkit.datamodel.SleuthkitCase; import org.sleuthkit.datamodel.TskCoreException; public class DomainSearchArtifactsCacheTest { - + private static final ARTIFACT_TYPE WEB_ARTIFACT_TYPE = ARTIFACT_TYPE.TSK_WEB_BOOKMARK; private static final BlackboardAttribute.Type TSK_DOMAIN = new BlackboardAttribute.Type(ATTRIBUTE_TYPE.TSK_DOMAIN); private static final BlackboardAttribute.Type TSK_URL = new BlackboardAttribute.Type(ATTRIBUTE_TYPE.TSK_URL); - + @Test(expected = IllegalArgumentException.class) public void get_NonWebArtifactType_ShouldThrow() throws DiscoveryException { DomainSearchArtifactsRequest request = new DomainSearchArtifactsRequest(null, "google.com", ARTIFACT_TYPE.TSK_CALLLOG); DomainSearchArtifactsCache cache = new DomainSearchArtifactsCache(); cache.get(request); } - + /* * This test is important for ensuring artifact loading can * be cancelled, which is necessary for a responsive UI. */ @Test - public void get_ThreadInterrupted_ShouldThrow() throws TskCoreException { + public void get_ThreadInterrupted_ShouldThrow() throws TskCoreException { SleuthkitCase mockCase = mock(SleuthkitCase.class); BlackboardArtifact mockArtifact = mock(BlackboardArtifact.class); when(mockCase.getBlackboardArtifacts(WEB_ARTIFACT_TYPE)).thenReturn(Lists.newArrayList(mockArtifact)); - + DomainSearchArtifactsRequest request = new DomainSearchArtifactsRequest(mockCase, "facebook.com", WEB_ARTIFACT_TYPE); DomainSearchArtifactsCache cache = new DomainSearchArtifactsCache(); Thread.currentThread().interrupt(); @@ -68,121 +68,79 @@ public class DomainSearchArtifactsCacheTest { Assert.assertEquals(InterruptedException.class, ex.getCause().getClass()); } } - + @Test public void get_MatchingDomain_ShouldHaveSizeOne() throws TskCoreException, DiscoveryException { SleuthkitCase mockCase = mock(SleuthkitCase.class); BlackboardArtifact mockArtifact = mock(BlackboardArtifact.class); when(mockArtifact.getAttribute(TSK_DOMAIN)).thenReturn(mockDomainAttribute("google.com")); when(mockCase.getBlackboardArtifacts(WEB_ARTIFACT_TYPE)).thenReturn(Lists.newArrayList(mockArtifact)); - + DomainSearchArtifactsRequest request = new DomainSearchArtifactsRequest(mockCase, "google.com", WEB_ARTIFACT_TYPE); DomainSearchArtifactsCache cache = new DomainSearchArtifactsCache(); List artifacts = cache.get(request); Assert.assertEquals(1, artifacts.size()); Assert.assertEquals(mockArtifact, artifacts.get(0)); } - + @Test - public void get_MatchingUrl_ShouldHaveSizeOne() throws TskCoreException, DiscoveryException { - SleuthkitCase mockCase = mock(SleuthkitCase.class); - BlackboardArtifact mockArtifact = mock(BlackboardArtifact.class); - when(mockArtifact.getAttribute(TSK_URL)).thenReturn(mockURLAttribute("https://www.abc.com/search")); - when(mockCase.getBlackboardArtifacts(WEB_ARTIFACT_TYPE)).thenReturn(Lists.newArrayList(mockArtifact)); - - DomainSearchArtifactsRequest request = new DomainSearchArtifactsRequest(mockCase, "abc.com", WEB_ARTIFACT_TYPE); - DomainSearchArtifactsCache cache = new DomainSearchArtifactsCache(); - List artifacts = cache.get(request); - Assert.assertEquals(1, artifacts.size()); - Assert.assertEquals(mockArtifact, artifacts.get(0)); - } - - @Test - public void get_MismatchedDomainName_ShouldBeEmpty() throws TskCoreException, DiscoveryException { + public void get_MismatchedDomainName_ShouldBeEmpty() throws TskCoreException, DiscoveryException { SleuthkitCase mockCase = mock(SleuthkitCase.class); BlackboardArtifact mockArtifact = mock(BlackboardArtifact.class); when(mockArtifact.getAttribute(TSK_DOMAIN)).thenReturn(mockDomainAttribute("google.com")); when(mockCase.getBlackboardArtifacts(WEB_ARTIFACT_TYPE)).thenReturn(Lists.newArrayList(mockArtifact)); - + DomainSearchArtifactsRequest request = new DomainSearchArtifactsRequest(mockCase, "facebook.com", WEB_ARTIFACT_TYPE); DomainSearchArtifactsCache cache = new DomainSearchArtifactsCache(); List artifacts = cache.get(request); Assert.assertEquals(0, artifacts.size()); } - + @Test public void get_MismatchedUrl_ShouldBeEmpty() throws DiscoveryException, TskCoreException { SleuthkitCase mockCase = mock(SleuthkitCase.class); BlackboardArtifact mockArtifact = mock(BlackboardArtifact.class); when(mockArtifact.getAttribute(TSK_URL)).thenReturn(mockURLAttribute("https://www.dce1.com/search")); when(mockCase.getBlackboardArtifacts(WEB_ARTIFACT_TYPE)).thenReturn(Lists.newArrayList(mockArtifact)); - + DomainSearchArtifactsRequest request = new DomainSearchArtifactsRequest(mockCase, "dce.com", WEB_ARTIFACT_TYPE); DomainSearchArtifactsCache cache = new DomainSearchArtifactsCache(); List artifacts = cache.get(request); Assert.assertEquals(0, artifacts.size()); } - + @Test public void get_CaseInsensitiveDomainAttribute_ShouldHaveSizeOne() throws TskCoreException, DiscoveryException { SleuthkitCase mockCase = mock(SleuthkitCase.class); BlackboardArtifact mockArtifact = mock(BlackboardArtifact.class); when(mockArtifact.getAttribute(TSK_DOMAIN)).thenReturn(mockDomainAttribute("xYZ.coM")); when(mockCase.getBlackboardArtifacts(WEB_ARTIFACT_TYPE)).thenReturn(Lists.newArrayList(mockArtifact)); - + DomainSearchArtifactsRequest request = new DomainSearchArtifactsRequest(mockCase, "xyz.com", WEB_ARTIFACT_TYPE); DomainSearchArtifactsCache cache = new DomainSearchArtifactsCache(); List artifacts = cache.get(request); Assert.assertEquals(1, artifacts.size()); Assert.assertEquals(mockArtifact, artifacts.get(0)); } - + @Test public void get_CaseInsensitiveRequestDomain_ShouldHaveSizeOne() throws TskCoreException, DiscoveryException { SleuthkitCase mockCase = mock(SleuthkitCase.class); BlackboardArtifact mockArtifact = mock(BlackboardArtifact.class); when(mockArtifact.getAttribute(TSK_DOMAIN)).thenReturn(mockDomainAttribute("google.com")); when(mockCase.getBlackboardArtifacts(WEB_ARTIFACT_TYPE)).thenReturn(Lists.newArrayList(mockArtifact)); - + DomainSearchArtifactsRequest request = new DomainSearchArtifactsRequest(mockCase, "GooGle.coM", WEB_ARTIFACT_TYPE); DomainSearchArtifactsCache cache = new DomainSearchArtifactsCache(); List artifacts = cache.get(request); Assert.assertEquals(1, artifacts.size()); Assert.assertEquals(mockArtifact, artifacts.get(0)); } - - @Test - public void get_CaseInsensitiveUrlAttribute_ShouldHaveSizeOne() throws TskCoreException, DiscoveryException { - SleuthkitCase mockCase = mock(SleuthkitCase.class); - BlackboardArtifact mockArtifact = mock(BlackboardArtifact.class); - when(mockArtifact.getAttribute(TSK_URL)).thenReturn(mockURLAttribute("https://www.JfK.coM/search")); - when(mockCase.getBlackboardArtifacts(WEB_ARTIFACT_TYPE)).thenReturn(Lists.newArrayList(mockArtifact)); - - DomainSearchArtifactsRequest request = new DomainSearchArtifactsRequest(mockCase, "jfk.com", WEB_ARTIFACT_TYPE); - DomainSearchArtifactsCache cache = new DomainSearchArtifactsCache(); - List artifacts = cache.get(request); - Assert.assertEquals(1, artifacts.size()); - Assert.assertEquals(mockArtifact, artifacts.get(0)); - } - - @Test - public void get_CaseInsensitiveRequestUrl_ShouldHaveSizeOne() throws TskCoreException, DiscoveryException { - SleuthkitCase mockCase = mock(SleuthkitCase.class); - BlackboardArtifact mockArtifact = mock(BlackboardArtifact.class); - when(mockArtifact.getAttribute(TSK_URL)).thenReturn(mockURLAttribute("https://www.hop.com/search")); - when(mockCase.getBlackboardArtifacts(WEB_ARTIFACT_TYPE)).thenReturn(Lists.newArrayList(mockArtifact)); - - DomainSearchArtifactsRequest request = new DomainSearchArtifactsRequest(mockCase, "HoP.cOm", WEB_ARTIFACT_TYPE); - DomainSearchArtifactsCache cache = new DomainSearchArtifactsCache(); - List artifacts = cache.get(request); - Assert.assertEquals(1, artifacts.size()); - Assert.assertEquals(mockArtifact, artifacts.get(0)); - } - + private BlackboardAttribute mockDomainAttribute(String value) { return new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_DOMAIN, "", value); } - + private BlackboardAttribute mockURLAttribute(String value) { return new BlackboardAttribute(ATTRIBUTE_TYPE.TSK_URL, "", value); }