Skip to content
This repository was archived by the owner on Nov 22, 2023. It is now read-only.

Commit 10f7ba4

Browse files
committed
rearrange test to fix merge conflicts
1 parent dd572d4 commit 10f7ba4

File tree

1 file changed

+9
-11
lines changed

1 file changed

+9
-11
lines changed

test/meshes.jl

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,16 @@ end
4040
#@fact readall(io) --> s #Win32 and Win64 have different ordering it seems.
4141
end
4242

43+
@testset "construction" begin
44+
VT = vertextype(GLNormalMesh)
45+
FT = facetype(GLNormalMesh)
46+
vs = [VT(0., 0, 0), VT(1., 0, 0), VT(0., 1, 0)]
47+
fs = [FT(1, 2, 3)]
4348

49+
# test for https://github.com/JuliaGeometry/GeometryTypes.jl/issues/92
50+
m = HomogenousMesh(vs, fs)
51+
@test HomogenousMesh(m) == m
52+
end
4453

4554
@testset "Primitives" begin
4655
# issue #16
@@ -156,17 +165,6 @@ end
156165
@test all(isapprox.(ns, expect))
157166
end
158167

159-
@testset "construction" begin
160-
VT = vertextype(GLNormalMesh)
161-
FT = facetype(GLNormalMesh)
162-
vs = [VT(0., 0, 0), VT(1., 0, 0), VT(0., 1, 0)]
163-
fs = [FT(1, 2, 3)]
164-
165-
# test for https://github.com/JuliaGeometry/GeometryTypes.jl/issues/92
166-
m = HomogenousMesh(vs, fs)
167-
@test HomogenousMesh(m) == m
168-
end
169-
170168
end
171169

172170

0 commit comments

Comments
 (0)