diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-02-14 11:11:33 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-02-14 11:17:04 +0100 |
commit | bfcd156d488df1d8ce82bd575cf637328a214693 (patch) | |
tree | 003f6a48328f258dea9debf4758256d7f781c276 /container-search/src/test/java/com/yahoo/search/federation/sourceref | |
parent | 267cc7f36883721d9c61634cb87dbee76b0c3e3d (diff) |
- Add a resolver for virtual sources.
- Move sourceref tests out of separate test package.
Diffstat (limited to 'container-search/src/test/java/com/yahoo/search/federation/sourceref')
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/federation/sourceref/SearchChainResolverTestCase.java (renamed from container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SearchChainResolverTestCase.java) | 10 | ||||
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/federation/sourceref/SourceRefResolverTestCase.java (renamed from container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SourceRefResolverTestCase.java) | 12 | ||||
-rw-r--r-- | container-search/src/test/java/com/yahoo/search/federation/sourceref/VirtualSourceResolverTestCase.java | 29 |
3 files changed, 38 insertions, 13 deletions
diff --git a/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SearchChainResolverTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/sourceref/SearchChainResolverTestCase.java index d575be603c1..d9046075f38 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SearchChainResolverTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/sourceref/SearchChainResolverTestCase.java @@ -1,14 +1,10 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.search.federation.sourceref.test; +package com.yahoo.search.federation.sourceref; import com.yahoo.component.ComponentId; import com.yahoo.component.ComponentSpecification; import com.yahoo.processing.request.properties.PropertyMap; import com.yahoo.processing.request.Properties; -import com.yahoo.search.federation.sourceref.SearchChainInvocationSpec; -import com.yahoo.search.federation.sourceref.SearchChainResolver; -import com.yahoo.search.federation.sourceref.Target; -import com.yahoo.search.federation.sourceref.UnresolvedSearchChainException; import com.yahoo.search.searchchain.model.federation.FederationOptions; import org.junit.jupiter.api.Test; @@ -16,7 +12,9 @@ import java.util.Collections; import java.util.Iterator; import java.util.SortedSet; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; /** * @author Tony Vaagenes diff --git a/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SourceRefResolverTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/sourceref/SourceRefResolverTestCase.java index 1b3baebac6f..9badd4a1ab6 100644 --- a/container-search/src/test/java/com/yahoo/search/federation/sourceref/test/SourceRefResolverTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/federation/sourceref/SourceRefResolverTestCase.java @@ -1,14 +1,10 @@ // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -package com.yahoo.search.federation.sourceref.test; +package com.yahoo.search.federation.sourceref; import com.yahoo.component.ComponentId; import com.yahoo.component.ComponentSpecification; import com.yahoo.prelude.IndexFacts; import com.yahoo.prelude.IndexModel; -import com.yahoo.search.federation.sourceref.SearchChainInvocationSpec; -import com.yahoo.search.federation.sourceref.SearchChainResolver; -import com.yahoo.search.federation.sourceref.SourceRefResolver; -import com.yahoo.search.federation.sourceref.UnresolvedSearchChainException; import com.yahoo.search.searchchain.model.federation.FederationOptions; import org.junit.jupiter.api.Test; @@ -18,8 +14,10 @@ import java.util.List; import java.util.Set; import java.util.TreeMap; -import static com.yahoo.search.federation.sourceref.test.SearchChainResolverTestCase.emptySourceToProviderMap; -import static org.junit.jupiter.api.Assertions.*; +import static com.yahoo.search.federation.sourceref.SearchChainResolverTestCase.emptySourceToProviderMap; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; /** * Test for SourceRefResolver. diff --git a/container-search/src/test/java/com/yahoo/search/federation/sourceref/VirtualSourceResolverTestCase.java b/container-search/src/test/java/com/yahoo/search/federation/sourceref/VirtualSourceResolverTestCase.java new file mode 100644 index 00000000000..bf6605a43b2 --- /dev/null +++ b/container-search/src/test/java/com/yahoo/search/federation/sourceref/VirtualSourceResolverTestCase.java @@ -0,0 +1,29 @@ +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +package com.yahoo.search.federation.sourceref; + +import org.junit.jupiter.api.Test; + +import java.util.Set; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; + +/** + * Test of VirtualSourceResolver + * + * @author baldersheim + */ +public class VirtualSourceResolverTestCase { + @Test + void testThatOriginalIsReturnedIfNoMapping() { + var input = Set.of("a","b", "b.c"); + assertSame(input, VirtualSourceResolver.of().resolve(input)); + assertSame(input, VirtualSourceResolver.of(Set.of("x.a","x.b")).resolve(input)); + } + @Test + void testResolution() { + var input = Set.of("a","b", "b.c"); + assertEquals(Set.of("a.x", "a.y", "b.c", "b.x"), + VirtualSourceResolver.of(Set.of("a.x","a.y", "b.x")).resolve(input)); + } +} |