[Bf-blender-cvs] [acdfde35986] soc-2021-adaptive-cloth: adaptive_cloth: test: mesh: read(), fails, need to find fix

[ishbosamiya]

Commit: acdfde359868ea715d6ea011b5bc8194e9fc93b7
Author: ishbosamiya
Date:   Thu Jun 24 10:30:00 2021 +0530
Branches: soc-2021-adaptive-cloth
https://developer.blender.org/rBacdfde359868ea715d6ea011b5bc8194e9fc93b7

adaptive_cloth: test: mesh: read(), fails, need to find fix

===================================================================

M	source/blender/blenkernel/tests/BKE_cloth_remesh_test.cc

===================================================================

diff --git a/source/blender/blenkernel/tests/BKE_cloth_remesh_test.cc b/source/blender/blenkernel/tests/BKE_cloth_remesh_test.cc
index 5e188b36ebb..3a2e4175964 100644
--- a/source/blender/blenkernel/tests/BKE_cloth_remesh_test.cc
+++ b/source/blender/blenkernel/tests/BKE_cloth_remesh_test.cc
@@ -8,51 +8,52 @@ namespace blender::bke::tests {
 
 using namespace internal;
 
-TEST(cloth_remesh, MeshReader)
+static const char *cube_pos_uv_normal =
+    "# Blender v3.0.0 Alpha OBJ File: ''\n"
+    "# www.blender.org\n"
+    "mtllib untitled.mtl\n"
+    "o Cube\n"
+    "v 1.000000 1.000000 -1.000000\n"
+    "v 1.000000 -1.000000 -1.000000\n"
+    "v 1.000000 1.000000 1.000000\n"
+    "v 1.000000 -1.000000 1.000000\n"
+    "v -1.000000 1.000000 -1.000000\n"
+    "v -1.000000 -1.000000 -1.000000\n"
+    "v -1.000000 1.000000 1.000000\n"
+    "v -1.000000 -1.000000 1.000000\n"
+    "vt 0.625000 0.500000\n"
+    "vt 0.875000 0.500000\n"
+    "vt 0.875000 0.750000\n"
+    "vt 0.625000 0.750000\n"
+    "vt 0.375000 0.750000\n"
+    "vt 0.625000 1.000000\n"
+    "vt 0.375000 1.000000\n"
+    "vt 0.375000 0.000000\n"
+    "vt 0.625000 0.000000\n"
+    "vt 0.625000 0.250000\n"
+    "vt 0.375000 0.250000\n"
+    "vt 0.125000 0.500000\n"
+    "vt 0.375000 0.500000\n"
+    "vt 0.125000 0.750000\n"
+    "vn 0.0000 1.0000 0.0000\n"
+    "vn 0.0000 0.0000 1.0000\n"
+    "vn -1.0000 0.0000 0.0000\n"
+    "vn 0.0000 -1.0000 0.0000\n"
+    "vn 1.0000 0.0000 0.0000\n"
+    "vn 0.0000 0.0000 -1.0000\n"
+    "usemtl Material\n"
+    "s off\n"
+    "f 1/1/1 5/2/1 7/3/1 3/4/1\n"
+    "f 4/5/2 3/4/2 7/6/2 8/7/2\n"
+    "f 8/8/3 7/9/3 5/10/3 6/11/3\n"
+    "f 6/12/4 2/13/4 4/5/4 8/14/4\n"
+    "f 2/13/5 1/1/5 3/4/5 4/5/5\n"
+    "f 6/11/6 5/10/6 1/1/6 2/13/6\n";
+
+TEST(cloth_remesh, MeshReader_ReadObj)
 {
   MeshReader reader;
-  std::string file =
-      "# Blender v3.0.0 Alpha OBJ File: ''\n"
-      "# www.blender.org\n"
-      "mtllib untitled.mtl\n"
-      "o Cube\n"
-      "v 1.000000 1.000000 -1.000000\n"
-      "v 1.000000 -1.000000 -1.000000\n"
-      "v 1.000000 1.000000 1.000000\n"
-      "v 1.000000 -1.000000 1.000000\n"
-      "v -1.000000 1.000000 -1.000000\n"
-      "v -1.000000 -1.000000 -1.000000\n"
-      "v -1.000000 1.000000 1.000000\n"
-      "v -1.000000 -1.000000 1.000000\n"
-      "vt 0.625000 0.500000\n"
-      "vt 0.875000 0.500000\n"
-      "vt 0.875000 0.750000\n"
-      "vt 0.625000 0.750000\n"
-      "vt 0.375000 0.750000\n"
-      "vt 0.625000 1.000000\n"
-      "vt 0.375000 1.000000\n"
-      "vt 0.375000 0.000000\n"
-      "vt 0.625000 0.000000\n"
-      "vt 0.625000 0.250000\n"
-      "vt 0.375000 0.250000\n"
-      "vt 0.125000 0.500000\n"
-      "vt 0.375000 0.500000\n"
-      "vt 0.125000 0.750000\n"
-      "vn 0.0000 1.0000 0.0000\n"
-      "vn 0.0000 0.0000 1.0000\n"
-      "vn -1.0000 0.0000 0.0000\n"
-      "vn 0.0000 -1.0000 0.0000\n"
-      "vn 1.0000 0.0000 0.0000\n"
-      "vn 0.0000 0.0000 -1.0000\n"
-      "usemtl Material\n"
-      "s off\n"
-      "f 1/1/1 5/2/1 7/3/1 3/4/1\n"
-      "f 4/5/2 3/4/2 7/6/2 8/7/2\n"
-      "f 8/8/3 7/9/3 5/10/3 6/11/3\n"
-      "f 6/12/4 2/13/4 4/5/4 8/14/4\n"
-      "f 2/13/5 1/1/5 3/4/5 4/5/5\n"
-      "f 6/11/6 5/10/6 1/1/6 2/13/6\n";
-  std::istringstream stream(file);
+  std::istringstream stream(cube_pos_uv_normal);
   auto res = reader.read(std::move(stream), MeshReader::FILETYPE_OBJ);
 
   EXPECT_TRUE(res);
@@ -70,4 +71,24 @@ TEST(cloth_remesh, MeshReader)
   EXPECT_EQ(line_indices.size(), 0);
 }
 
+TEST(cloth_remesh, Mesh_Read)
+{
+  MeshReader reader;
+  std::istringstream stream(cube_pos_uv_normal);
+  reader.read(std::move(stream), MeshReader::FILETYPE_OBJ);
+
+  Mesh<bool, bool, bool, bool> mesh;
+  mesh.read(reader);
+
+  const auto nodes = mesh.get_nodes();
+  const auto verts = mesh.get_verts();
+  const auto edges = mesh.get_edges();
+  const auto faces = mesh.get_faces();
+
+  EXPECT_EQ(nodes.size(), 8);
+  EXPECT_EQ(verts.size(), 14);
+  EXPECT_EQ(edges.size(), 12);
+  EXPECT_EQ(faces.size(), 6);
+}
+
 } /* namespace blender::bke::tests */