From c322abe9af27f6e4f97f2627e4bff422b24b7655 Mon Sep 17 00:00:00 2001
From: Noah Santschi-Cooney <noah@santschi-cooney.ch>
Date: Fri, 7 Aug 2020 15:01:57 +0100
Subject: [PATCH] Fixed tests

---
 server/src/test.rs                 | 28 +++++++++++++++++++++-------
 server/testdata/01/final.fsh.merge |  4 ++--
 server/testdata/02/final.fsh.merge | 12 ++++++------
 server/testdata/03/final.fsh.merge | 12 ++++++------
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/server/src/test.rs b/server/src/test.rs
index 69a9386..f1532af 100644
--- a/server/src/test.rs
+++ b/server/src/test.rs
@@ -427,10 +427,12 @@ fn test_generate_merge_list_01() {
         .collect::<Vec<&str>>()
         .join("");
 
-    let merge_file = tmp_path + "/shaders/final.fsh.merge";
-
-    let truth = String::from_utf8(fs::read::<String>(merge_file).unwrap()).unwrap();
+    let merge_file = tmp_path.clone() + "/shaders/final.fsh.merge";
 
+    let mut truth = String::from_utf8(fs::read::<String>(merge_file).unwrap()).unwrap();
+    truth = truth.replacen("!!", &(tmp_path.clone()+"/shaders/"+"common.glsl"), 1);
+    truth = truth.replace("!!", &(tmp_path+"/shaders/"+"final.fsh"));
+    
     assert_that!(total, eq(truth));
 
     server.endpoint.request_shutdown();
@@ -465,9 +467,15 @@ fn test_generate_merge_list_02() {
         .collect::<Vec<&str>>()
         .join("");
 
-    let merge_file = tmp_path + "/shaders/final.fsh.merge";
+    let merge_file = tmp_path.clone() + "/shaders/final.fsh.merge";
 
-    let truth = String::from_utf8(fs::read::<String>(merge_file).unwrap()).unwrap();
+    let mut truth = String::from_utf8(fs::read::<String>(merge_file).unwrap()).unwrap();
+    
+    for file in &["sample.glsl", "burger.glsl", "sample.glsl", "test.glsl", "sample.glsl"] {
+        let path = tmp_path.clone();
+        truth = truth.replacen("!!", &format!("{}/shaders/utils/{}", path, file), 1);
+    }
+    truth = truth.replacen("!!", &(tmp_path+"/shaders/final.fsh"), 1);
 
     assert_that!(total, eq(truth));
 
@@ -503,9 +511,15 @@ fn test_generate_merge_list_03() {
         .collect::<Vec<&str>>()
         .join("");
 
-    let merge_file = tmp_path + "/shaders/final.fsh.merge";
+    let merge_file = tmp_path.clone() + "/shaders/final.fsh.merge";
 
-    let truth = String::from_utf8(fs::read::<String>(merge_file).unwrap()).unwrap();
+    let mut truth = String::from_utf8(fs::read::<String>(merge_file).unwrap()).unwrap();
+    
+    for file in &["sample.glsl", "burger.glsl", "sample.glsl", "test.glsl", "sample.glsl"] {
+        let path = tmp_path.clone();
+        truth = truth.replacen("!!", &format!("{}/shaders/utils/{}", path, file), 1);
+    }
+    truth = truth.replacen("!!", &(tmp_path+"/shaders/final.fsh"), 1);
 
     assert_that!(total, eq(truth));
 
diff --git a/server/testdata/01/final.fsh.merge b/server/testdata/01/final.fsh.merge
index b0b8083..0e087d1 100644
--- a/server/testdata/01/final.fsh.merge
+++ b/server/testdata/01/final.fsh.merge
@@ -1,10 +1,10 @@
 #version 120
 
-#line 1
+#line 1 !!
 float test() {
 	return 0.5;
 }
-#line 4
+#line 4 !!
 
 void main() {
 	gl_FragColor[0] = vec4(0.0);
diff --git a/server/testdata/02/final.fsh.merge b/server/testdata/02/final.fsh.merge
index c3d0902..154e8df 100644
--- a/server/testdata/02/final.fsh.merge
+++ b/server/testdata/02/final.fsh.merge
@@ -1,26 +1,26 @@
 #version 120
 
-#line 1
+#line 1 !!
 int sample() {
 	return 5;
 }
 
-#line 1
+#line 1 !!
 void burger() {
 	// sample text
 }
-#line 6
+#line 6 !!
 
-#line 1
+#line 1 !!
 float test() {
 	return 3.0;
 }
-#line 8
+#line 8 !!
 
 int sample_more() {
 	return 5;
 }
-#line 4
+#line 4 !!
 
 void main() {
 	gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);
diff --git a/server/testdata/03/final.fsh.merge b/server/testdata/03/final.fsh.merge
index 978d259..2cf7cff 100644
--- a/server/testdata/03/final.fsh.merge
+++ b/server/testdata/03/final.fsh.merge
@@ -1,22 +1,22 @@
 #version 120
 
-#line 1
+#line 1 !!
 int sample() {
 	return 5;
 }
 
-#line 1
+#line 1 !!
 void burger() {
 	// sample text
 }
-#line 6
+#line 6 !!
 
-#line 1
+#line 1 !!
 float test() {
 	return 3.0;
 }
-#line 8
-#line 4
+#line 8 !!
+#line 4 !!
 
 void main() {
 	gl_FragColor = vec4(1.0, 1.0, 1.0, 1.0);