Skip to content

Commit d4ebb32

Browse files
Mal Millermmiller-max
Mal Miller
authored and
mmiller-max
committed
Tidy up imports
- Use "using" where possible - Remove unused imports - Remove unused test dep - Removed import of Types to make it clear its from Pkg
1 parent e4d33bb commit d4ebb32

File tree

13 files changed

+52
-46
lines changed

13 files changed

+52
-46
lines changed

‎Project.toml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "TestReports"
22
uuid = "dcd651b4-b50a-5b6b-8f22-87e9f253a252"
3-
version = "0.5.3"
3+
version = "0.5.4"
44

55
[deps]
66
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
@@ -14,10 +14,9 @@ EzXML = "1"
1414
julia = "1"
1515

1616
[extras]
17-
LibGit2 = "76f85450-5226-5b5a-8eaa-529ad045b433"
1817
ReferenceTests = "324d217c-45ce-50fc-942e-d289b448e8cf"
1918
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2019
UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
2120

2221
[targets]
23-
test = ["Test", "ReferenceTests", "UUIDs", "LibGit2"]
22+
test = ["ReferenceTests", "Test", "UUIDs"]

‎src/TestReports.jl

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,33 @@
11
module TestReports
22

3-
# package code goes here
4-
using Test
3+
using Dates
54
using EzXML
5+
using Pkg
6+
using Printf
7+
using Test
8+
9+
using Pkg: PackageSpec
10+
using Pkg.Types: Context, ensure_resolved, is_project_uuid
11+
using Pkg.Operations: manifest_info, manifest_resolve!, project_deps_resolve!,
12+
project_rel_path, project_resolve!
13+
14+
using Test: AbstractTestSet, DefaultTestSet, Result, Pass, Fail, Error, Broken,
15+
get_testset, get_testset_depth, scrub_backtrace
16+
17+
import Test: finish, record
618

7-
import Test: AbstractTestSet, DefaultTestSet, record, finish, get_testset_depth, get_testset
8-
import Test: Result, Fail, Broken, Pass, Error, scrub_backtrace
19+
# Version specific imports
20+
@static if VERSION >= v"1.4.0"
21+
using Pkg.Operations: gen_target_project
22+
else
23+
using Pkg.Operations: with_dependencies_loadable_at_toplevel
24+
end
25+
@static if VERSION >= v"1.2.0"
26+
using Pkg.Operations: sandbox, source_path, update_package_test!
27+
else
28+
using Pkg.Operations: find_installed
29+
using Pkg.Types: SHA1
30+
end
931

1032
export ReportingTestSet, any_problems, report, recordproperty
1133

‎src/recordproperty.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
import Test: get_testset
2-
31
"""
42
recordproperty(name::String, value)
53

‎src/runner.jl

Lines changed: 6 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,3 @@
1-
using Pkg
2-
import Pkg: PackageSpec, Types
3-
import Pkg.Types: Context, EnvCache, ensure_resolved, is_project_uuid
4-
import Pkg.Operations: project_resolve!, project_deps_resolve!, manifest_resolve!, manifest_info, project_rel_path
5-
6-
# Version specific imports
7-
@static if VERSION >= v"1.4.0"
8-
import Pkg.Operations: gen_target_project
9-
else
10-
import Pkg.Operations: with_dependencies_loadable_at_toplevel
11-
end
12-
@static if VERSION >= v"1.2.0"
13-
import Pkg.Operations: update_package_test!, source_path, sandbox
14-
else
15-
import Pkg.Operations: find_installed
16-
import Pkg.Types: SHA1
17-
end
18-
191
"Exit code for runner when tests fail"
202
const TESTS_FAILED = 3
213

@@ -170,7 +152,7 @@ function gen_command(runner_code, julia_args, coverage)
170152
end
171153

172154
"""
173-
isinstalled!(ctx::Union{Context, EnvCache}, pkgspec::Types.PackageSpec)
155+
isinstalled!(ctx::Context, pkgspec::Pkg.Types.PackageSpec)
174156
175157
Checks if the package is installed by using `ensure_resolved` from `Pkg/src/Types.jl`.
176158
This function fails if the package is not installed, but here we wrap it in a
@@ -180,7 +162,7 @@ For Julia versions V1.4 and later, the first arguments of the Pkg functions used
180162
is of type `Pkg.Types.Context`. For earlier versions, they are of type
181163
`Pkg.Types.EnvCache`.
182164
"""
183-
function isinstalled!(ctx::Context, pkgspec::Types.PackageSpec)
165+
function isinstalled!(ctx::Context, pkgspec::Pkg.Types.PackageSpec)
184166
@static if VERSION >= v"1.4.0"
185167
var = ctx
186168
else
@@ -198,12 +180,12 @@ function isinstalled!(ctx::Context, pkgspec::Types.PackageSpec)
198180
end
199181

200182
"""
201-
gettestfilepath(ctx::Context, pkgspec::Types.PackageSpec)
183+
gettestfilepath(ctx::Context, pkgspec::Pkg.Types.PackageSpec)
202184
203185
Gets the testfile path of the package. Code for each Julia version mirrors that found
204186
in `Pkg/src/Operations.jl`.
205187
"""
206-
function gettestfilepath(ctx::Context, pkgspec::Types.PackageSpec)
188+
function gettestfilepath(ctx::Context, pkgspec::Pkg.Types.PackageSpec)
207189
@static if VERSION >= v"1.4.0"
208190
if is_project_uuid(ctx, pkgspec.uuid)
209191
pkgspec.path = dirname(ctx.env.project_file)
@@ -235,7 +217,7 @@ function gettestfilepath(ctx::Context, pkgspec::Types.PackageSpec)
235217
elseif entry.path !== nothing
236218
pkgfilepath = project_rel_path(ctx, entry.path)
237219
elseif pkgspec.uuid in keys(ctx.stdlibs)
238-
pkgfilepath = Types.stdlib_path(pkgspec.name)
220+
pkgfilepath = Pkg.Types.stdlib_path(pkgspec.name)
239221
else
240222
throw(PkgTestError("Could not find either `git-tree-sha1` or `path` for package $(pkgspec.name)"))
241223
end
@@ -252,7 +234,7 @@ function gettestfilepath(ctx::Context, pkgspec::Types.PackageSpec)
252234
elseif haskey(info, "path")
253235
pkgfilepath = project_rel_path(ctx, info["path"])
254236
elseif pkgspec.uuid in keys(ctx.stdlibs)
255-
pkgfilepath = Types.stdlib_path(pkgspec.name)
237+
pkgfilepath = Pkg.Types.stdlib_path(pkgspec.name)
256238
else
257239
throw(PkgTestError("Could not find either `git-tree-sha1` or `path` for package $(pkgspec.name)"))
258240
end

‎src/testsets.jl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
using Dates
2-
import Test: Result
3-
41
####################
52
# Type Definitions #
63
####################

‎src/to_xml.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
using Printf
2-
31
# Format is defined by
42
# https://www.ibm.com/support/knowledgecenter/en/SSQ2R2_14.2.0/com.ibm.rsar.analysis.codereview.cobol.doc/topics/cac_useresults_junit.html
53
# http://help.catchsoftware.com/display/ET/JUnit+Format

‎test/recordproperty.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using EzXML
22
using Test
3-
import Test: DefaultTestSet, AbstractTestSet, finish, record, get_testset_depth, get_testset, Error
3+
using Test: DefaultTestSet, AbstractTestSet, Error, get_testset, get_testset_depth
44
using ReferenceTests
55
using TestReports
66

‎test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using TestReports
21
using Test
2+
using TestReports
33

44
# Include utils
55
include("utils.jl")

‎test/test_packages/CustomTestSet/test/runtests.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using Test
2-
import Test: AbstractTestSet, record, finish, get_testset_depth, get_testset
2+
using Test: AbstractTestSet, get_testset_depth, get_testset
3+
4+
import Test: finish, record
35

46
mutable struct MyTestSet <: AbstractTestSet
57
description::String

‎test/test_packages/NoDescriptionCustomTestSet/test/runtests.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using Test
2-
import Test: AbstractTestSet, record, finish, get_testset_depth, get_testset
2+
using Test: AbstractTestSet, get_testset_depth, get_testset
3+
4+
import Test: finish, record
35

46
mutable struct NoDescriptionTestSet <: AbstractTestSet
57
results::Vector

‎test/test_packages/NoResultsCustomTestSet/test/runtests.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
using Test
2-
import Test: AbstractTestSet, record, finish, get_testset_depth, get_testset
2+
using Test: AbstractTestSet, get_testset_depth, get_testset
3+
4+
import Test: finish, record
35

46
mutable struct NoResultsTestSet <: AbstractTestSet
57
description::String

‎test/testsets.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using Dates
22
using Test
3-
import Test: AbstractTestSet, Result, Pass, Fail, Broken, Error
3+
using Test: AbstractTestSet, Result, Pass, Fail, Broken, Error
44
using TestReports
55

66
@testset "handle_top_level_results!" begin

‎test/utils.jl

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
1-
using Dates, Pkg, Test, LibGit2
2-
import Test: finish, record, AbstractTestSet, get_testset_depth, get_testset, Result
1+
using Dates
2+
using Pkg
3+
using Test
4+
using Test: AbstractTestSet, Result, get_testset, get_testset_depth
5+
6+
import Test: finish, record
37

48
# Strip the filenames from the string, so that the reference strings work on different computers
59
strip_filepaths(str) = replace(str, r" at .*\d+$"m => "")

0 commit comments

Comments
 (0)