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
This commit is contained in:
commit
231f5d9baf
|
@ -115,9 +115,9 @@ java_library(
|
||||||
testonly = 1,
|
testonly = 1,
|
||||||
visibility = ["//visibility:public"],
|
visibility = ["//visibility:public"],
|
||||||
exports = [
|
exports = [
|
||||||
"@junit//jar",
|
"@hamcrest_core//jar",
|
||||||
"@hamcrest_core//jar",
|
"@hamcrest_library//jar",
|
||||||
"@hamcrest_library//jar",
|
"@junit//jar",
|
||||||
],
|
],
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -34,6 +34,7 @@ java_library(
|
||||||
srcs = glob(["src/**/*.java"]),
|
srcs = glob(["src/**/*.java"]),
|
||||||
deps = [
|
deps = [
|
||||||
"//lib:junit",
|
"//lib:junit",
|
||||||
|
"//lib:servlet-api",
|
||||||
"//org.eclipse.jgit.http.server:jgit-servlet",
|
"//org.eclipse.jgit.http.server:jgit-servlet",
|
||||||
"//org.eclipse.jgit:jgit",
|
"//org.eclipse.jgit:jgit",
|
||||||
"//org.eclipse.jgit.junit.http:junit-http",
|
"//org.eclipse.jgit.junit.http:junit-http",
|
||||||
|
|
|
@ -291,6 +291,8 @@ public void testCompareTo() {
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef");
|
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef");
|
||||||
assertEquals(0, id1.compareTo(LongObjectId.fromString(
|
assertEquals(0, id1.compareTo(LongObjectId.fromString(
|
||||||
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef")));
|
"0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef")));
|
||||||
|
AnyLongObjectId self = id1;
|
||||||
|
assertEquals(0, id1.compareTo(self));
|
||||||
|
|
||||||
assertEquals(-1, id1.compareTo(LongObjectId.fromString(
|
assertEquals(-1, id1.compareTo(LongObjectId.fromString(
|
||||||
"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef")));
|
"1123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef")));
|
||||||
|
|
|
@ -33,7 +33,7 @@ DATA = [
|
||||||
|
|
||||||
tests(glob(
|
tests(glob(
|
||||||
["tst/**/*.java"],
|
["tst/**/*.java"],
|
||||||
exclude = HELPERS + DATA
|
exclude = HELPERS + DATA,
|
||||||
))
|
))
|
||||||
|
|
||||||
java_library(
|
java_library(
|
||||||
|
@ -54,8 +54,8 @@ java_import(
|
||||||
)
|
)
|
||||||
|
|
||||||
genrule2(
|
genrule2(
|
||||||
name = 'tst_rsrc_jar',
|
name = "tst_rsrc_jar",
|
||||||
cmd = 'o=$$PWD/$@ && tar cf - $(SRCS) | tar -C $$TMP --strip-components=2 -xf - && cd $$TMP && zip -qr $$o .',
|
srcs = glob(["tst-rsrc/**"]),
|
||||||
srcs = glob(['tst-rsrc/**']),
|
outs = ["tst_rsrc.jar"],
|
||||||
outs = ['tst_rsrc.jar',],
|
cmd = "o=$$PWD/$@ && tar cf - $(SRCS) | tar -C $$TMP --strip-components=2 -xf - && cd $$TMP && zip -qr $$o .",
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue