Skip to content

Commit 34e14f7

Browse files
committed
optimised the parsing test
1 parent 078515c commit 34e14f7

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

x-pack/plugin/rank-rrf/src/test/java/org/elasticsearch/xpack/rank/linear/LinearRetrieverBuilderParsingTests.java

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,12 @@
3333
public class LinearRetrieverBuilderParsingTests extends AbstractXContentTestCase<LinearRetrieverBuilder> {
3434
private static List<NamedXContentRegistry.Entry> xContentRegistryEntries;
3535

36+
private static final ScoreNormalizer[] SCORE_NORMALIZERS = new ScoreNormalizer[] {
37+
null,
38+
MinMaxScoreNormalizer.INSTANCE,
39+
L2ScoreNormalizer.INSTANCE,
40+
IdentityScoreNormalizer.INSTANCE };
41+
3642
@BeforeClass
3743
public static void init() {
3844
xContentRegistryEntries = new SearchModule(Settings.EMPTY, emptyList()).getNamedXContents();
@@ -69,9 +75,7 @@ protected LinearRetrieverBuilder createTestInstance() {
6975
new CompoundRetrieverBuilder.RetrieverSource(TestRetrieverBuilder.createRandomTestRetrieverBuilder(), null)
7076
);
7177
weights[i] = randomFloat();
72-
normalizers[i] = randomFrom(
73-
new ScoreNormalizer[] { null, MinMaxScoreNormalizer.INSTANCE, L2ScoreNormalizer.INSTANCE, IdentityScoreNormalizer.INSTANCE }
74-
);
78+
normalizers[i] = randomFrom(SCORE_NORMALIZERS);
7579
}
7680

7781
return new LinearRetrieverBuilder(innerRetrievers, fields, query, normalizer, rankWindowSize, weights, normalizers);
@@ -112,12 +116,7 @@ protected NamedXContentRegistry xContentRegistry() {
112116
}
113117

114118
private static ScoreNormalizer randomScoreNormalizer() {
115-
int random = randomInt(2);
116-
return switch (random) {
117-
case 0 -> MinMaxScoreNormalizer.INSTANCE;
118-
case 1 -> L2ScoreNormalizer.INSTANCE;
119-
default -> IdentityScoreNormalizer.INSTANCE;
120-
};
119+
return randomFrom(SCORE_NORMALIZERS);
121120
}
122121

123122
public void testTopLevelNormalizer() throws IOException {

0 commit comments

Comments
 (0)