Fix FooterLine.matches(FooterKey) on same length keys
If two keys are the same length, but don't share the same sequence of characters, we were incorrectly claiming they still matched due to a bug in the for loop condition. I used the wrong variable and the loop never executed, resulting in equality anytime the two keys being compared were the same length. Use the proper local variable to loop through the arrays, and add a JUnit test to verify equality works as expected. Change-Id: I4a02400e65a9b2e0da925b05a2cc4b579e1dd33a Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
parent
d011a377cb
commit
dd63f5cfc1
|
@ -306,6 +306,26 @@ public void testFilterFootersIgnoreCase() {
|
||||||
assertEquals("Main Tain Er <mte@example.com>", footers.get(1));
|
assertEquals("Main Tain Er <mte@example.com>", footers.get(1));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void testMatchesBugId() {
|
||||||
|
final RevCommit commit = parse("this is a commit subject for test\n"
|
||||||
|
+ "\n" // paragraph break, now footers appear in final block
|
||||||
|
+ "Simple-Bug-Id: 42\n");
|
||||||
|
final List<FooterLine> footers = commit.getFooterLines();
|
||||||
|
|
||||||
|
assertNotNull(footers);
|
||||||
|
assertEquals(1, footers.size());
|
||||||
|
|
||||||
|
final FooterLine line = footers.get(0);
|
||||||
|
assertNotNull(line);
|
||||||
|
assertEquals("Simple-Bug-Id", line.getKey());
|
||||||
|
assertEquals("42", line.getValue());
|
||||||
|
|
||||||
|
final FooterKey bugid = new FooterKey("Simple-Bug-Id");
|
||||||
|
assertTrue("matches Simple-Bug-Id", line.matches(bugid));
|
||||||
|
assertFalse("not Signed-off-by", line.matches(FooterKey.SIGNED_OFF_BY));
|
||||||
|
assertFalse("not CC", line.matches(FooterKey.CC));
|
||||||
|
}
|
||||||
|
|
||||||
private RevCommit parse(final String msg) {
|
private RevCommit parse(final String msg) {
|
||||||
final StringBuilder buf = new StringBuilder();
|
final StringBuilder buf = new StringBuilder();
|
||||||
buf.append("tree " + ObjectId.zeroId().name() + "\n");
|
buf.append("tree " + ObjectId.zeroId().name() + "\n");
|
||||||
|
|
|
@ -90,7 +90,7 @@ public boolean matches(final FooterKey key) {
|
||||||
int bPtr = keyStart;
|
int bPtr = keyStart;
|
||||||
if (keyEnd - bPtr != len)
|
if (keyEnd - bPtr != len)
|
||||||
return false;
|
return false;
|
||||||
for (int kPtr = 0; bPtr < len;) {
|
for (int kPtr = 0; kPtr < len;) {
|
||||||
byte b = buffer[bPtr++];
|
byte b = buffer[bPtr++];
|
||||||
if ('A' <= b && b <= 'Z')
|
if ('A' <= b && b <= 'Z')
|
||||||
b += 'a' - 'A';
|
b += 'a' - 'A';
|
||||||
|
|
Loading…
Reference in New Issue