Skip to content

Commit

Permalink
java,runfiles: merge classes
Browse files Browse the repository at this point in the history
This commit prepares simplifying the Java runfiles
library, which itself prepares mergint the
manifest-based and directory-based logic so that
the Runfiles class could handle both at the same
time.

This commit only moves classes around:
- moves the ManifestBased and DirectoryBased
  classes into Runfiles, as nested classes
- adds a createManifestBasedForTesting and
  createDirectoryBasedForTesting method to create
  the classes for testing
- moves the ManifestBasedTest and
  DirectoryBasedTest into RunfilesTest

Otherwise this commit has no functional change.

Change-Id: I56b582c1a95793b0a871748697673b53a780f0fb
PiperOrigin-RevId: 194227675
  • Loading branch information
laszlocsomor authored and Copybara-Service committed Apr 25, 2018
1 parent 204dfe1 commit 9b3eb97
Show file tree
Hide file tree
Showing 8 changed files with 171 additions and 274 deletions.
14 changes: 0 additions & 14 deletions src/tools/runfiles/java/com/google/devtools/build/runfiles/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ filegroup(
filegroup(
name = "java-srcs",
srcs = [
"DirectoryBased.java",
"ManifestBased.java",
"Runfiles.java",
"Util.java",
],
Expand All @@ -40,18 +38,6 @@ java_test(
deps = [":test_deps"],
)

java_test(
name = "DirectoryBasedTest",
srcs = ["DirectoryBasedTest.java"],
deps = [":test_deps"],
)

java_test(
name = "ManifestBasedTest",
srcs = ["ManifestBasedTest.java"],
deps = [":test_deps"],
)

java_test(
name = "UtilTest",
srcs = ["UtilTest.java"],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@ package(default_visibility = ["//visibility:private"])
filegroup(
name = "java-srcs",
srcs = [
"DirectoryBased.java",
"ManifestBased.java",
"Runfiles.java",
"Util.java",
],
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit 9b3eb97

Please sign in to comment.