diff options
author | Nasser Grainawi <nasser.grainawi@linaro.org> | 2022-10-05 16:55:37 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-10-05 16:55:37 +0000 |
commit | dbd58a31ba96064cf78fda770ea96367a73d15f3 (patch) | |
tree | a450690a3aa18c1437508f79769285274e85292d | |
parent | b0b89a2278b7e696b185fa7295d3f78784f89fef (diff) | |
parent | 90c27374637d23d63b483b7d38464f2fda65b300 (diff) |
Merge "Don't depend on predicate order as they get sorted based on cost" into stable-3.4
-rw-r--r-- | javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java b/javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java index 4acedd17e7..4894eb3a2b 100644 --- a/javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java +++ b/javatests/com/google/gerrit/server/index/change/ChangeIndexRewriterTest.java @@ -97,7 +97,7 @@ public class ChangeIndexRewriterTest { Predicate<ChangeData> in = parse("foo:a file:b"); Predicate<ChangeData> out = rewrite(in); assertThat(AndChangeSource.class).isSameInstanceAs(out.getClass()); - assertThat(out.getChildren()).containsExactly(query(in.getChild(1)), in.getChild(0)).inOrder(); + assertThat(out.getChildren()).containsExactly(query(parse("file:b")), parse("foo:a")).inOrder(); } @Test @@ -126,9 +126,9 @@ public class ChangeIndexRewriterTest { .inOrder(); // Same at the assertions above, that were added for readability - assertThat(out.getChild(0)).isEqualTo(query(in.getChild(0))); + assertThat(out.getChild(0)).isEqualTo(query(parse("-status:abandoned"))); assertThat(indexedSubTree.getChildren()) - .containsExactly(query(in.getChild(1).getChild(1)), in.getChild(1).getChild(0)) + .containsExactly(query(parse("file:b")), parse("foo:a")) .inOrder(); } @@ -137,7 +137,9 @@ public class ChangeIndexRewriterTest { Predicate<ChangeData> in = parse("-foo:a (file:b OR file:c)"); Predicate<ChangeData> out = rewrite(in); assertThat(out.getClass()).isSameInstanceAs(AndChangeSource.class); - assertThat(out.getChildren()).containsExactly(query(in.getChild(1)), in.getChild(0)).inOrder(); + assertThat(out.getChildren()) + .containsExactly(query(parse("file:b OR file:c")), parse("-foo:a")) + .inOrder(); } @Test @@ -146,7 +148,8 @@ public class ChangeIndexRewriterTest { Predicate<ChangeData> out = rewrite(in); assertThat(out.getClass()).isSameInstanceAs(OrSource.class); assertThat(out.getChildren()) - .containsExactly(query(or(in.getChild(0), in.getChild(2))), in.getChild(1), in.getChild(3)) + .containsExactly( + query(or(parse("file:a"), parse("file:c"))), parse("foo:b"), parse("foo:d")) .inOrder(); } @@ -156,7 +159,7 @@ public class ChangeIndexRewriterTest { Predicate<ChangeData> out = rewrite(in); assertThat(AndChangeSource.class).isSameInstanceAs(out.getClass()); assertThat(out.getChildren()) - .containsExactly(query(and(in.getChild(0), in.getChild(2))), in.getChild(1)) + .containsExactly(query(and(parse("status:new"), parse("file:a"))), parse("bar:p")) .inOrder(); } @@ -166,7 +169,7 @@ public class ChangeIndexRewriterTest { Predicate<ChangeData> out = rewrite(in); assertThat(out.getClass()).isEqualTo(AndChangeSource.class); assertThat(out.getChildren()) - .containsExactly(query(and(in.getChild(0), in.getChild(2))), in.getChild(1)) + .containsExactly(query(and(parse("status:new"), parse("file:a"))), parse("bar:p")) .inOrder(); } @@ -176,7 +179,7 @@ public class ChangeIndexRewriterTest { Predicate<ChangeData> out = rewrite(in); assertThat(out.getClass()).isEqualTo(AndChangeSource.class); assertThat(out.getChildren()) - .containsExactly(query(and(in.getChild(0), in.getChild(2))), in.getChild(1)) + .containsExactly(query(and(parse("status:new OR file:a"), parse("file:b"))), parse("bar:p")) .inOrder(); } |