Fix RefDirectoryTest.testGetRefs_LooseSorting_Bug_348834
Since the first attempt to read a ref is not expected to trigger a RefsChangedEvent, update the test to ensure 'lastNotifiedModCnt' is not 0 before we start the actual work. The test has been passing luckily because createBareRepository in setUp() happens to bump 'lastNotifiedModCnt'. Change-Id: Ibd981f677920e8c3b965aa742fe669c42b8c1c93 Signed-off-by: Kaushik Lingarkar <quic_kaushikl@quicinc.com>
This commit is contained in:
parent
47f2f3613c
commit
d7400517bf
|
@ -555,10 +555,6 @@ public void testGetRefs_LooseSortedCorrectly() throws IOException {
|
||||||
@Test
|
@Test
|
||||||
public void testGetRefs_LooseSorting_Bug_348834() throws IOException {
|
public void testGetRefs_LooseSorting_Bug_348834() throws IOException {
|
||||||
Map<String, Ref> refs;
|
Map<String, Ref> refs;
|
||||||
|
|
||||||
writeLooseRef("refs/heads/my/a+b", A);
|
|
||||||
writeLooseRef("refs/heads/my/a/b/c", B);
|
|
||||||
|
|
||||||
final int[] count = new int[1];
|
final int[] count = new int[1];
|
||||||
|
|
||||||
ListenerHandle listener = Repository.getGlobalListenerList()
|
ListenerHandle listener = Repository.getGlobalListenerList()
|
||||||
|
@ -566,14 +562,27 @@ public void testGetRefs_LooseSorting_Bug_348834() throws IOException {
|
||||||
count[0]++;
|
count[0]++;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// RefsChangedEvent on the first attempt to read a ref is not expected
|
||||||
|
// to be triggered (See Iea3a5035b0a1410b80b09cf53387b22b78b18018), so
|
||||||
|
// create an update and fire pending events to ensure subsequent events
|
||||||
|
// are fired.
|
||||||
|
writeLooseRef("refs/heads/test", A);
|
||||||
refs = refdir.getRefs(RefDatabase.ALL);
|
refs = refdir.getRefs(RefDatabase.ALL);
|
||||||
|
count[0] = 0;
|
||||||
|
int origSize = refs.size();
|
||||||
|
|
||||||
|
writeLooseRef("refs/heads/my/a+b", A);
|
||||||
|
writeLooseRef("refs/heads/my/a/b/c", B);
|
||||||
|
|
||||||
refs = refdir.getRefs(RefDatabase.ALL);
|
refs = refdir.getRefs(RefDatabase.ALL);
|
||||||
listener.remove();
|
assertEquals(1, count[0]);
|
||||||
assertEquals(1, count[0]); // Bug 348834 multiple RefsChangedEvents
|
assertEquals(2, refs.size() - origSize);
|
||||||
assertEquals(2, refs.size());
|
|
||||||
assertEquals(A, refs.get("refs/heads/my/a+b").getObjectId());
|
assertEquals(A, refs.get("refs/heads/my/a+b").getObjectId());
|
||||||
assertEquals(B, refs.get("refs/heads/my/a/b/c").getObjectId());
|
assertEquals(B, refs.get("refs/heads/my/a/b/c").getObjectId());
|
||||||
|
|
||||||
|
refs = refdir.getRefs(RefDatabase.ALL);
|
||||||
|
assertEquals(1, count[0]); // Bug 348834 multiple RefsChangedEvents
|
||||||
|
listener.remove();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
Loading…
Reference in New Issue