Skip to content

Commit 6f2ed71

Browse files
kmp5VTkmp5VT
authored
Fixing the issues in the tests (#7)
1 parent 8e4092e commit 6f2ed71

3 files changed

Lines changed: 81 additions & 75 deletions

File tree

‎test/Project.toml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,7 @@ LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
66
NDTensors = "23ae76d9-e61a-49c4-8f12-3f1a16adf9cf"
77
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
88
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
9+
TypeParameterAccessors = "7e5a90cf-f82e-492e-a09b-e3e26432c138"
10+
11+
[sources]
12+
TypeParameterAccessors = {url = "https://github.com/ITensor/TypeParameterAccessors.jl"}

‎test/test_basics.jl‎

Lines changed: 0 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -249,79 +249,4 @@ using .NDTensorsTestUtils: devices_list
249249
end
250250
end
251251

252-
## TODO: These are broken, fix them. Also, split off into a
253-
## seperate test file, and maybe make a package extension?
254-
## using FillArrays: Fill, Zeros
255-
## using UnallocatedArrays: UnallocatedFill, UnallocatedZeros
256-
## using TypeParameterAccessors:
257-
## Position, default_type_parameter, nparameters, set_type_parameter, type_parameter
258-
## using Test: @test, @testset
259-
##
260-
## @testset "SetParameters" begin
261-
## @testset "Testing $typ" for typ in (:Fill, :Zeros)
262-
## t1 = default_type_parameter(typ, Position{1}())
263-
## t2 = default_type_parameter(typ, Position{2}())
264-
## t3 = default_type_parameter(typ, Position{3}())
265-
## t4 = Any
266-
## ft1 = typ{t1}
267-
## ft2 = typ{t1,t2}
268-
## ft3 = typ{t1,t2,t3}
269-
##
270-
## ## check 1 parameter specified
271-
## ftn1 = set_type_parameter(ft1, Position{1}(), t4)
272-
## ftn2 = set_type_parameter(ft1, Position{2}(), t4)
273-
## ftn3 = set_type_parameter(ft1, Position{3}(), t4)
274-
## @test ftn1 == typ{t4}
275-
## @test ftn2 == typ{t1,t4}
276-
## @test ftn3 == typ{t1,<:Any,t4}
277-
##
278-
## ## check 2 parameters specified
279-
## ftn1 = set_type_parameter(ft2, Position{1}(), t4)
280-
## ftn2 = set_type_parameter(ft2, Position{2}(), t4)
281-
## ftn3 = set_type_parameter(ft2, Position{3}(), t4)
282-
## @test ftn1 == typ{t4,t2}
283-
## @test ftn2 == typ{t1,t4}
284-
## @test ftn3 == typ{t1,t2,t4}
285-
##
286-
## ## check 3 parameters specified
287-
## ftn1 = set_type_parameter(ft3, Position{1}(), t4)
288-
## ftn2 = set_type_parameter(ft3, Position{2}(), t4)
289-
## ftn3 = set_type_parameter(ft3, Position{3}(), t4)
290-
## @test ftn1 == typ{t4,t2,t3}
291-
## @test ftn2 == typ{t1,t4,t3}
292-
## @test ftn3 == typ{t1,t2,t4}
293-
##
294-
## @test type_parameter(ft3, Position{1}()) == t1
295-
## @test type_parameter(ft3, Position{2}()) == t2
296-
## @test type_parameter(ft3, Position{3}()) == t3
297-
##
298-
## @test nparameters(ft3) == 3
299-
## end
300-
##
301-
## @testset "Testing $typ" for typ in (:UnallocatedFill, :UnallocatedZeros)
302-
## t1 = default_type_parameter(typ, Position{1}())
303-
## t2 = default_type_parameter(typ, Position{2}())
304-
## t3 = default_type_parameter(typ, Position{3}())
305-
## t4 = default_type_parameter(typ, Position{4}())
306-
## t5 = Any
307-
## ft = typ{t1,t2,t3,t4}
308-
##
309-
## ## check 4 parameters specified
310-
## ftn1 = set_type_parameter(ft, Position{1}(), t5)
311-
## ftn2 = set_type_parameter(ft, Position{2}(), t5)
312-
## ftn3 = set_type_parameter(ft, Position{3}(), t5)
313-
## ftn4 = set_type_parameter(ft, Position{4}(), t5)
314-
## @test ftn1 == typ{t5,t2,t3,t4}
315-
## @test ftn2 == typ{t1,t5,t3,t4}
316-
## @test ftn3 == typ{t1,t2,t5,t4}
317-
## @test ftn4 == typ{t1,t2,t3,t5}
318-
##
319-
## @test type_parameter(ft, Position{1}()) == t1
320-
## @test type_parameter(ft, Position{2}()) == t2
321-
## @test type_parameter(ft, Position{3}()) == t3
322-
## @test type_parameter(ft, Position{4}()) == t4
323-
##
324-
## @test nparameters(ft) == 4
325-
## end
326-
## end
327252
end

‎test/test_defaults.jl‎

Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
2+
## TODO: These are broken, fix them. Also, split off into a
3+
## seperate test file, and maybe make a package extension?
4+
@eval module $(gensym())
5+
using FillArrays: Fill, Zeros
6+
using UnallocatedArrays: UnallocatedFill, UnallocatedZeros
7+
using TypeParameterAccessors:
8+
Position, default_type_parameter, nparameters, set_type_parameter, type_parameter
9+
using Test: @test, @testset
10+
11+
#@testset "SetParameters" begin
12+
@testset "Testing $typ" for typ in (Fill, Zeros)
13+
t1 = default_type_parameter(typ, Position{1}())
14+
t2 = default_type_parameter(typ, Position{2}())
15+
t3 = default_type_parameter(typ, Position{3}())
16+
t4 = Any
17+
ft1 = typ{t1}
18+
ft2 = typ{t1,t2}
19+
ft3 = typ{t1,t2,t3}
20+
21+
## check 1 parameter specified
22+
ftn1 = set_type_parameter(ft1, Position{1}(), t4)
23+
ftn2 = set_type_parameter(ft1, Position{2}(), t4)
24+
ftn3 = set_type_parameter(ft1, Position{3}(), t4)
25+
@test ftn1 == typ{t4}
26+
@test ftn2 == typ{t1,t4}
27+
@test ftn3 == typ{t1,<:Any,t4}
28+
29+
## check 2 parameters specified
30+
ftn1 = set_type_parameter(ft2, Position{1}(), t4)
31+
ftn2 = set_type_parameter(ft2, Position{2}(), t4)
32+
ftn3 = set_type_parameter(ft2, Position{3}(), t4)
33+
@test ftn1 == typ{t4,t2}
34+
@test ftn2 == typ{t1,t4}
35+
@test ftn3 == typ{t1,t2,t4}
36+
37+
## check 3 parameters specified
38+
ftn1 = set_type_parameter(ft3, Position{1}(), t4)
39+
ftn2 = set_type_parameter(ft3, Position{2}(), t4)
40+
ftn3 = set_type_parameter(ft3, Position{3}(), t4)
41+
@test ftn1 == typ{t4,t2,t3}
42+
@test ftn2 == typ{t1,t4,t3}
43+
@test ftn3 == typ{t1,t2,t4}
44+
45+
@test type_parameter(ft3, Position{1}()) == t1
46+
@test type_parameter(ft3, Position{2}()) == t2
47+
@test type_parameter(ft3, Position{3}()) == t3
48+
49+
@test nparameters(ft3) == 3
50+
end
51+
52+
@testset "Testing $typ" for typ in (UnallocatedFill, UnallocatedZeros)
53+
t1 = default_type_parameter(typ, Position{1}())
54+
t2 = default_type_parameter(typ, Position{2}())
55+
t3 = default_type_parameter(typ, Position{3}())
56+
t4 = default_type_parameter(typ, Position{4}())
57+
t5 = Any
58+
ft = typ{t1,t2,t3,t4}
59+
60+
## check 4 parameters specified
61+
ftn1 = set_type_parameter(ft, Position{1}(), t5)
62+
ftn2 = set_type_parameter(ft, Position{2}(), t5)
63+
ftn3 = set_type_parameter(ft, Position{3}(), t5)
64+
ftn4 = set_type_parameter(ft, Position{4}(), t5)
65+
@test ftn1 == typ{t5,t2,t3,t4}
66+
@test ftn2 == typ{t1,t5,t3,t4}
67+
@test ftn3 == typ{t1,t2,t5,t4}
68+
@test ftn4 == typ{t1,t2,t3,t5}
69+
70+
@test type_parameter(ft, Position{1}()) == t1
71+
@test type_parameter(ft, Position{2}()) == t2
72+
@test type_parameter(ft, Position{3}()) == t3
73+
@test type_parameter(ft, Position{4}()) == t4
74+
75+
@test nparameters(ft) == 4
76+
end
77+
end

0 commit comments

Comments
 (0)