Skip to content

Commit 231f5d9

Browse files
dpursehouseGerrit Code Review @ Eclipse.org
authored andcommitted
Merge changes Id3994e2d,I5e2a2868,I255af794
* changes: LongObjectIdTest: Add back self comparison test Format BUILD files with buildifier Bazel: Add missing dependency in org.eclipse.jgit.http.test
2 parents 2d76df2 + f79911e commit 231f5d9

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

lib/BUILD

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,9 @@ java_library(
115115
testonly = 1,
116116
visibility = ["//visibility:public"],
117117
exports = [
118-
"@junit//jar",
119-
"@hamcrest_core//jar",
120-
"@hamcrest_library//jar",
118+
"@hamcrest_core//jar",
119+
"@hamcrest_library//jar",
120+
"@junit//jar",
121121
],
122122
)
123123

org.eclipse.jgit.http.test/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ java_library(
3434
srcs = glob(["src/**/*.java"]),
3535
deps = [
3636
"//lib:junit",
37+
"//lib:servlet-api",
3738
"//org.eclipse.jgit.http.server:jgit-servlet",
3839
"//org.eclipse.jgit:jgit",
3940
"//org.eclipse.jgit.junit.http:junit-http",

org.eclipse.jgit.lfs.test/tst/org/eclipse/jgit/lfs/lib/LongObjectIdTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,8 @@ public void testCompareTo() {
291291
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef");
292292
assertEquals(0, id1.compareTo(LongObjectId.fromString(
293293
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef")));
294+
AnyLongObjectId self = id1;
295+
assertEquals(0, id1.compareTo(self));
294296

295297
assertEquals(-1, id1.compareTo(LongObjectId.fromString(
296298
"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef")));

org.eclipse.jgit.test/BUILD

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ DATA = [
3333

3434
tests(glob(
3535
["tst/**/*.java"],
36-
exclude = HELPERS + DATA
36+
exclude = HELPERS + DATA,
3737
))
3838

3939
java_library(
@@ -54,8 +54,8 @@ java_import(
5454
)
5555

5656
genrule2(
57-
name = 'tst_rsrc_jar',
58-
cmd = 'o=$$PWD/$@ && tar cf - $(SRCS) | tar -C $$TMP --strip-components=2 -xf - && cd $$TMP && zip -qr $$o .',
59-
srcs = glob(['tst-rsrc/**']),
60-
outs = ['tst_rsrc.jar',],
57+
name = "tst_rsrc_jar",
58+
srcs = glob(["tst-rsrc/**"]),
59+
outs = ["tst_rsrc.jar"],
60+
cmd = "o=$$PWD/$@ && tar cf - $(SRCS) | tar -C $$TMP --strip-components=2 -xf - && cd $$TMP && zip -qr $$o .",
6161
)

0 commit comments

Comments
 (0)