Parameterise more tests across DataLoader implementations #171
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
We parameterise: - `DataLoaderValueCacheTest` - `ScheduledDataLoaderRegistryTest` to provide increased coverage across all DataLoader implementations. Notably, `DataLoaderValueCacheTest` is _not_ parameterised across the Publisher DataLoaders (yet) as these do not appear to work when a `ValueCache` is provided (which is what prompted this pull request). It will be fixed in a future pull request, at which point we will restore coverage.
AlexandreCarlton
commented
Jan 1, 2025
| import java.util.stream.Stream; | ||
|
|
||
| public class TestDataLoaderFactories { | ||
| public static Stream<Arguments> get() { |
There was a problem hiding this comment.
Lifted this to a central location so it could be used across multiple tests.
AlexandreCarlton
commented
Jan 1, 2025
| public void test_by_default_we_have_no_value_caching() { | ||
| List<List<String>> loadCalls = new ArrayList<>(); | ||
| @ParameterizedTest | ||
| @MethodSource("org.dataloader.fixtures.parameterized.TestDataLoaderFactories#getWithoutPublisher") |
There was a problem hiding this comment.
As mentioned in the description, we use getWithoutPublisher rather than get as ValueCache does not appear to interact well with the Publisher DataLoaders. It is intended that this will be fixed eventually, in a separate PR (as this is already quite substantial).
AlexandreCarlton
commented
Jan 1, 2025
| @@ -61,43 +60,14 @@ public static <K, V> BatchLoader<K, V> keysAsValues(List<List<K>> loadCalls) { | |||
| }; | |||
| } | |||
|
|
|||
| public static <K, V> BatchLoader<K, V> keysAsValuesAsync(Duration delay) { | |||
There was a problem hiding this comment.
Figured I'd clean up the now unused methods - we should be using the TestDataLoaderFactory-provided DataLoaders anyway, if we feel the need to reach out for these older ones.
AlexandreCarlton
commented
Jan 1, 2025
| @@ -19,4 +22,17 @@ public interface TestDataLoaderFactory { | |||
| DataLoader<String, String> onlyReturnsNValues(int N, DataLoaderOptions options, ArrayList<Object> loadCalls); | |||
|
|
|||
| DataLoader<String, String> idLoaderReturnsTooMany(int howManyMore, DataLoaderOptions options, ArrayList<Object> loadCalls); | |||
|
|
|||
| // Convenience methods | |||
There was a problem hiding this comment.
Really, this was just to minimise the diff.
bbakerman
approved these changes
Jan 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
We parameterise:
DataLoaderValueCacheTestScheduledDataLoaderRegistryTestto provide increased coverage across all DataLoader implementations.
Notably,
DataLoaderValueCacheTestis not parameterised across the Publisher DataLoaders (yet) as these do not appear to work when aValueCacheis provided (which is what prompted this pull request). It will be fixed in a future pull request, at which point we will restore coverage.