From 308a280cd79e9dc239ade2d1885eb71e827247ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Kr=C3=A4mer?= <krmrwrk@gmail.com>
Date: Mon, 6 Feb 2017 18:57:17 +0100
Subject: [PATCH] Add unit test with extra elements

---
 .../cube-minimal-extra-elements-binary.ply    | Bin 0 -> 524 bytes
 .../TestFiles/cube-minimal-extra-elements.ply |  38 ++++++++++++++++++
 src/Unittests/unittests_read_write_PLY.cc     |  36 +++++++++++++++++
 3 files changed, 74 insertions(+)
 create mode 100644 src/Unittests/TestFiles/cube-minimal-extra-elements-binary.ply
 create mode 100644 src/Unittests/TestFiles/cube-minimal-extra-elements.ply

diff --git a/src/Unittests/TestFiles/cube-minimal-extra-elements-binary.ply b/src/Unittests/TestFiles/cube-minimal-extra-elements-binary.ply
new file mode 100644
index 0000000000000000000000000000000000000000..b92063d7576bdac26a14f094eaacaadfa90dd062
GIT binary patch
literal 524
zcmZurTMmLS5Uh%t^b~snBYqhFJPN6>NR#qNsRsP=W?s#XBA9BE$#i!fZDV?w*S1uS
zPP$UIPmFfXaKcrlRYmb;E7@?#m7^<L#~mGHW9!D>d&*7igI&1j!^Lgv;Oxv4?<RvD
zi{pRG-I&Z(%Cw(6Mz@YGX`w7l9f|hePPvu-`$@qnV=INYKfZ7b?%^DIKRWmu@C~yN
zGx5gUGq4!oNkksY0V~hIdH^)c$e;s0WT8XDc`?LKaRe8(a3LLq712)ztXQJs6+s6|
Iao#V<Cth1?-T(jq

literal 0
HcmV?d00001

diff --git a/src/Unittests/TestFiles/cube-minimal-extra-elements.ply b/src/Unittests/TestFiles/cube-minimal-extra-elements.ply
new file mode 100644
index 00000000..65eefe03
--- /dev/null
+++ b/src/Unittests/TestFiles/cube-minimal-extra-elements.ply
@@ -0,0 +1,38 @@
+ply
+format ascii 1.0
+element vertex 8
+property float32 x
+property float32 y
+property float32 z
+element edge 12
+property int32 vertex1
+property int32 vertex2
+element face 6
+property list uint8 int32 vertex_indices
+end_header
+-1 -1 -1 
+1 -1 -1 
+1 1 -1 
+-1 1 -1 
+-1 -1 1 
+1 -1 1 
+1 1 1 
+-1 1 1
+0 1
+1 2
+2 3
+3 0
+4 5
+5 6
+6 7
+7 4
+6 2
+1 5
+3 7
+4 0
+4 0 1 2 3 
+4 5 4 7 6 
+4 6 2 1 5 
+4 3 7 4 0 
+4 7 3 2 6 
+4 5 1 0 4 
diff --git a/src/Unittests/unittests_read_write_PLY.cc b/src/Unittests/unittests_read_write_PLY.cc
index 60a5ad47..e92a678e 100644
--- a/src/Unittests/unittests_read_write_PLY.cc
+++ b/src/Unittests/unittests_read_write_PLY.cc
@@ -691,5 +691,41 @@ TEST_F(OpenMeshReadWritePLY, WriteReadBinaryPLYWithCustomProps) {
 
     //remove(outFilename);
 
+}
+
+/*
+* Just load a ply with extra elements
+*/
+TEST_F(OpenMeshReadWritePLY, LoadSimplePLYWithExtraElements) {
+
+	mesh_.clear();
+
+	bool ok = OpenMesh::IO::read_mesh(mesh_, "cube-minimal-extra-elements.ply");
+
+	EXPECT_TRUE(ok) << "Unable to load cube-minimal-extra-elements.ply";
+
+	EXPECT_EQ(8u, mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
+	EXPECT_EQ(18u, mesh_.n_edges()) << "The number of loaded edges is not correct!";
+	EXPECT_EQ(12u, mesh_.n_faces()) << "The number of loaded faces is not correct!";
+
+}
+
+/*
+* Just load a binary ply with extra elements
+*/
+TEST_F(OpenMeshReadWritePLY, LoadSimpleBinaryPLYWithExtraElements) {
+
+	mesh_.clear();
+
+	OpenMesh::IO::Options options = OpenMesh::IO::Options::Binary;
+
+	bool ok = OpenMesh::IO::read_mesh(mesh_, "cube-minimal-extra-elements-binary.ply", options);
+
+	EXPECT_TRUE(ok) << "Unable to load cube-minimal-extra-elements-binary.ply";
+
+	EXPECT_EQ(8u, mesh_.n_vertices()) << "The number of loaded vertices is not correct!";
+	EXPECT_EQ(18u, mesh_.n_edges()) << "The number of loaded edges is not correct!";
+	EXPECT_EQ(12u, mesh_.n_faces()) << "The number of loaded faces is not correct!";
+
 }
 }