Skip to content

Commit 34f8200

Browse files
committed
fix tests
1 parent fd85e7d commit 34f8200

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

src/meshes.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,8 +213,10 @@ end
213213
Calculate the signed volume of one tetrahedron. Be sure the orientation of your
214214
surface is right.
215215
"""
216-
function volume(triangle::Triangle)
217-
v1, v2, v3 = triangle
216+
volume(triangle::Triangle) = volume(triangle...)
217+
volume(ps::SVector{3, <: VecTypes}) = volume(ps...)
218+
219+
function volume(v1, v2, v3)
218220
sig = sign(orthogonal_vector(v1, v2, v3) v1)
219221
return sig * abs(v1 (v2 × v3)) / 6
220222
end

test/geometrytypes.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,10 +298,10 @@ end
298298

299299
ps = rand(Point2f, 10)
300300
f = GLTriangleFace(1, 2, 3)
301-
@test ps[f] == Triangle(ps[[1,2,3]]...)
301+
@test ps[f] == GeometryBasics.@SVector [ps[1], ps[2], ps[3]]
302302
data = [string(i) for i in 1:10]
303303
f = QuadFace(3, 4, 7, 8)
304-
@test data[f] == ("3", "4", "7", "8")
304+
@test data[f] == ["3", "4", "7", "8"]
305305

306306
@test GeometryBasics.cyclic_hash(f) != GeometryBasics.cyclic_hash(QuadFace(1,2,3,4))
307307
@test GeometryBasics.cyclic_hash(f) == GeometryBasics.cyclic_hash(QuadFace(3,4,7,8))

test/meshes.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ end
1111
f = [TriangleFace(1, 2, 3), QuadFace(1, 2, 3, 4)]
1212
p = Point2f[(0, 1), (1, 2), (3, 4), (4, 5)]
1313
m = Mesh(p, f)
14-
@test collect(m) == [Triangle(p[1], p[2], p[3]), GeometryBasics.Quadrilateral(p[1], p[2], p[3], p[4])]
14+
@test collect(m) == [GeometryBasics.SVector(p[1], p[2], p[3]), GeometryBasics.SVector(p[1], p[2], p[3], p[4])]
1515
end
1616

1717
@testset "Heterogenous faces" begin
1818
# https://github.com/JuliaGeometry/GeometryBasics.jl/issues/142
1919
f = [TriangleFace(1, 2, 3), QuadFace(1, 2, 3, 4)]
2020
p = Point2f[(0, 1), (1, 2), (3, 4), (4, 5)]
2121
m = Mesh(p, f)
22-
@test collect(m) == [Triangle(p[1], p[2], p[3]), GeometryBasics.Quadrilateral(p[1], p[2], p[3], p[4])]
22+
@test collect(m) == [GeometryBasics.SVector(p[1], p[2], p[3]), GeometryBasics.SVector(p[1], p[2], p[3], p[4])]
2323
end
2424

2525
@testset "Ambiguous NgonFace constructors" begin

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ end
136136
points = connect([1, 2, 3, 4, 5, 6, 7, 8], Point{2})
137137
f = connect([1, 2, 3, 4], SimplexFace{4})
138138
mesh = Mesh(points, f)
139-
@test collect(mesh) == [Tetrahedron(points...)]
139+
@test collect(mesh) == [GeometryBasics.SVector(points...)]
140140
@test faces(mesh) == [TetrahedronFace{Int64}(1,2,3,4)]
141141
@test decompose(LineFace{Int64}, mesh) == LineFace{Int64}[(1, 2), (1, 3), (1, 4), (2, 3), (2, 4), (3, 4)]
142142
@test decompose(GLTriangleFace, mesh) == GLTriangleFace[(2, 3, 4), (1, 3, 4), (1, 2, 4), (1, 2, 3)]

0 commit comments

Comments
 (0)