From 8dc4e64160deae26407a45289f16f99d082d1e58 Mon Sep 17 00:00:00 2001
From: 3bhady <mohamed_abdelhady96@hotmail.com>
Date: Wed, 3 Apr 2019 05:02:36 +0200
Subject: [PATCH] Testing 3mf reading file with umlauts in it's path

---
 src/CMakeLists.txt                      |   2 ++
 src/test/inputs/test_3mf/Geräte/box.3mf | Bin 0 -> 1416 bytes
 src/test/libslic3r/test_3mf.cpp         |  20 ++++++++++++++++++++
 xs/t/models/Geräte/box.3mf              | Bin 0 -> 1416 bytes
 4 files changed, 22 insertions(+)
 create mode 100755 src/test/inputs/test_3mf/Geräte/box.3mf
 create mode 100644 src/test/libslic3r/test_3mf.cpp
 create mode 100755 xs/t/models/Geräte/box.3mf

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 69dea5efb..6bab94664 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -154,6 +154,7 @@ set(SLIC3R_INCLUDES
 )
 set(LIBSLIC3R_INCLUDES
     ${LIBDIR}/libslic3r
+    ${LIBDIR}/libslic3r/IO
 )
 
 
@@ -313,6 +314,7 @@ set(SLIC3R_TEST_SOURCES
     ${TESTDIR}/libslic3r/test_skirt_brim.cpp
     ${TESTDIR}/libslic3r/test_test_data.cpp
     ${TESTDIR}/libslic3r/test_trianglemesh.cpp
+    ${TESTDIR}/libslic3r/test_3mf.cpp
 )
 
 
diff --git a/src/test/inputs/test_3mf/Geräte/box.3mf b/src/test/inputs/test_3mf/Geräte/box.3mf
new file mode 100755
index 0000000000000000000000000000000000000000..3b5a8350d40fb2c878e274dddee47ec00e2201da
GIT binary patch
literal 1416
zcmWIWW@Zs#0D;oZ-)>+AlwbzZ#xD8+Pz4+eO+W>|+rytGF)}dxWMN<sfG99d$<0qm
z&CvssQ?GdE9WoGLxKO+F-oa1%EDD8I1TgK6Tkw?Opk&u-3%6~}3zo0{s1o$@c#H2M
zN!$O&<`>ll=~^~z3@R7(P3Kg-z<Kw?yS<BMZ=b$AeOH{V-4rkL3zPOuUbo0=+uD!^
z2Lc|=*1!F$X<_xPJ#8-O+Pli%ZAdxOWxL|mxhW!U(R+)H7mA*i3N8P;PHdfdor2mH
z#$%JWBycXTGjZ}_4*Txbz`M}@#ang`_ms!!o}Je63l=2?-B6HVEt6lQ`0aI3(VNFw
z-0DTER>Z%ttg$~l{qOTj){6Ue-?zNj#F^|ry@sjx)TF<G4=zc*Jnw9+Qor=1;aA(h
zq9^;}|DQfow~50~P`zWb#W_Loj^~9o?t2{O94~CLaE&=q*l6KC$0tf*fBLzjOD+{2
zk$mJTqc3n?u(&_}eS*=-lAob-H_u=G;&-QH@!`;84Da{x>mU4jIv}t5rrF{td?Jpv
zHX=D0rbhQaKfM@H%ZP{%M__y`n*RCGAz(b%1LH&(NJl&8=ar=9mBfcs7Ni!(>Q&_C
zv`&c4I&2`&vR>)i)*D698cT1SbFTNBAeS)lx_w9#XQu3>+vRhoh&d_rZ#K4;_t|aD
zmd`ikw9wAx-@6!{-#psz;mX11{}xxZ#om9nUs!Z;pq}g*rI$x<Jxb$>cr~Nrs$?>s
zhSuj4;a&Q3PS}~8om@JxHA3sA)q?!{8Aq;mSK7b&*>m;@_l)bs1<9oinm>;&T#?Uj
z6BDp1-f8Xp<vuf~hrBakI2PyHVliR=L5}}>`<)%)+)Fm4&0Q3<SM-nIo6L#-*kNAA
zOrvZ-FUJ?9<`g3(Q&6zn_#U3K0Vu}|3>I#<8a<H8)c(_4z!d6QuX^U5U$&#mtTN@M
z=#}yUmtHc@X7|+k^}X-Wp+{*6a^LUl4E=1dc}H-^<jq1|I_!>NyYn_Rw`5n}db4ol
zYVNaIA6;eC<ypORrWh=H!ru|tpAvFrj{51@_gEJTZBKMq|HYTL<+jcJ#2={#W@$!=
zvUv$@ut~ZpdHv#?TCI*^^~SA#B7T4QlAf(58&gtyYKw9H+D+c;OQM+E6P_<Rvgg6i
z>20O0t4+Rg2Y53w*)!nEqAEbofdD8kf&ehXaxo}?nT!k)4Eqn(bk&`>z=%#G48@kM
zVTOXtQ3PV3p(vRg*@o8s`_l>8fSFKXHZ%ZD-w2E&EXfwx5{85Q{vb;}y?}TJMkBm|
zEos0k0fo&HCRjp2HWxiu=Fftdk1&^m0W&$l%mq3A1l(M3;zBkY=4f<F0=!v4$(Df?
O2rmNtz7SN<G5`SQjt+kS

literal 0
HcmV?d00001

diff --git a/src/test/libslic3r/test_3mf.cpp b/src/test/libslic3r/test_3mf.cpp
new file mode 100644
index 000000000..09384d790
--- /dev/null
+++ b/src/test/libslic3r/test_3mf.cpp
@@ -0,0 +1,20 @@
+#include <catch.hpp>
+#include <test_options.hpp>
+#include <string>
+#include "Model.hpp"
+#include "TMF.hpp"
+
+
+using namespace Slic3r;
+
+SCENARIO("Reading 3mf file") {
+    GIVEN("umlauts in the path of the file") {
+         auto model {new Slic3r::Model()};
+        WHEN("3mf model is read") {
+            auto ret = Slic3r::IO::TMF::read(std::string(testfile_dir) +"test_3mf/Geräte/box.3mf",model);
+            THEN("read should not return 0") {
+                REQUIRE(ret == 1);
+            }
+        }
+    }
+}
diff --git a/xs/t/models/Geräte/box.3mf b/xs/t/models/Geräte/box.3mf
new file mode 100755
index 0000000000000000000000000000000000000000..3b5a8350d40fb2c878e274dddee47ec00e2201da
GIT binary patch
literal 1416
zcmWIWW@Zs#0D;oZ-)>+AlwbzZ#xD8+Pz4+eO+W>|+rytGF)}dxWMN<sfG99d$<0qm
z&CvssQ?GdE9WoGLxKO+F-oa1%EDD8I1TgK6Tkw?Opk&u-3%6~}3zo0{s1o$@c#H2M
zN!$O&<`>ll=~^~z3@R7(P3Kg-z<Kw?yS<BMZ=b$AeOH{V-4rkL3zPOuUbo0=+uD!^
z2Lc|=*1!F$X<_xPJ#8-O+Pli%ZAdxOWxL|mxhW!U(R+)H7mA*i3N8P;PHdfdor2mH
z#$%JWBycXTGjZ}_4*Txbz`M}@#ang`_ms!!o}Je63l=2?-B6HVEt6lQ`0aI3(VNFw
z-0DTER>Z%ttg$~l{qOTj){6Ue-?zNj#F^|ry@sjx)TF<G4=zc*Jnw9+Qor=1;aA(h
zq9^;}|DQfow~50~P`zWb#W_Loj^~9o?t2{O94~CLaE&=q*l6KC$0tf*fBLzjOD+{2
zk$mJTqc3n?u(&_}eS*=-lAob-H_u=G;&-QH@!`;84Da{x>mU4jIv}t5rrF{td?Jpv
zHX=D0rbhQaKfM@H%ZP{%M__y`n*RCGAz(b%1LH&(NJl&8=ar=9mBfcs7Ni!(>Q&_C
zv`&c4I&2`&vR>)i)*D698cT1SbFTNBAeS)lx_w9#XQu3>+vRhoh&d_rZ#K4;_t|aD
zmd`ikw9wAx-@6!{-#psz;mX11{}xxZ#om9nUs!Z;pq}g*rI$x<Jxb$>cr~Nrs$?>s
zhSuj4;a&Q3PS}~8om@JxHA3sA)q?!{8Aq;mSK7b&*>m;@_l)bs1<9oinm>;&T#?Uj
z6BDp1-f8Xp<vuf~hrBakI2PyHVliR=L5}}>`<)%)+)Fm4&0Q3<SM-nIo6L#-*kNAA
zOrvZ-FUJ?9<`g3(Q&6zn_#U3K0Vu}|3>I#<8a<H8)c(_4z!d6QuX^U5U$&#mtTN@M
z=#}yUmtHc@X7|+k^}X-Wp+{*6a^LUl4E=1dc}H-^<jq1|I_!>NyYn_Rw`5n}db4ol
zYVNaIA6;eC<ypORrWh=H!ru|tpAvFrj{51@_gEJTZBKMq|HYTL<+jcJ#2={#W@$!=
zvUv$@ut~ZpdHv#?TCI*^^~SA#B7T4QlAf(58&gtyYKw9H+D+c;OQM+E6P_<Rvgg6i
z>20O0t4+Rg2Y53w*)!nEqAEbofdD8kf&ehXaxo}?nT!k)4Eqn(bk&`>z=%#G48@kM
zVTOXtQ3PV3p(vRg*@o8s`_l>8fSFKXHZ%ZD-w2E&EXfwx5{85Q{vb;}y?}TJMkBm|
zEos0k0fo&HCRjp2HWxiu=Fftdk1&^m0W&$l%mq3A1l(M3;zBkY=4f<F0=!v4$(Df?
O2rmNtz7SN<G5`SQjt+kS

literal 0
HcmV?d00001