From d6922c17ec340d9c46d573242263bb19fdfa02f5 Mon Sep 17 00:00:00 2001
From: Boris Baldassari <boris.baldassari@eclipse-foundation.org>
Date: Wed, 6 Mar 2024 16:35:27 +0100
Subject: [PATCH] Update tests for file.py.

---
 scripts/03_server/src/myserver/file.py        |   2 +-
 .../tests/resources/www/images/chaton.jpg     | Bin 0 -> 4655 bytes
 .../{index_simple.html => www/index.html}     |   0
 .../resources/www/index_text.txt}             |   0
 scripts/03_server/tests/test_file.py          |  64 +++++++++++++++---
 5 files changed, 55 insertions(+), 11 deletions(-)
 create mode 100644 scripts/03_server/tests/resources/www/images/chaton.jpg
 rename scripts/03_server/tests/resources/{index_simple.html => www/index.html} (100%)
 rename scripts/03_server/{resources/www/index.html => tests/resources/www/index_text.txt} (100%)

diff --git a/scripts/03_server/src/myserver/file.py b/scripts/03_server/src/myserver/file.py
index 8256eb5..ae7eba5 100644
--- a/scripts/03_server/src/myserver/file.py
+++ b/scripts/03_server/src/myserver/file.py
@@ -76,7 +76,7 @@ def resolve_path(res:str, root: str):
 
         if res[-1] == "/":
             res += "index.html"
-        if res[0] == "/":
+        while res[0] == "/":
             res = res[1:]
 
         res_path = path.join(root, res)
diff --git a/scripts/03_server/tests/resources/www/images/chaton.jpg b/scripts/03_server/tests/resources/www/images/chaton.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..c6985c59d4eb9b248639dce42140a52aecf97d03
GIT binary patch
literal 4655
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
H)zp6gf7qvN

literal 0
HcmV?d00001

diff --git a/scripts/03_server/tests/resources/index_simple.html b/scripts/03_server/tests/resources/www/index.html
similarity index 100%
rename from scripts/03_server/tests/resources/index_simple.html
rename to scripts/03_server/tests/resources/www/index.html
diff --git a/scripts/03_server/resources/www/index.html b/scripts/03_server/tests/resources/www/index_text.txt
similarity index 100%
rename from scripts/03_server/resources/www/index.html
rename to scripts/03_server/tests/resources/www/index_text.txt
diff --git a/scripts/03_server/tests/test_file.py b/scripts/03_server/tests/test_file.py
index 44d8fa1..381f74d 100644
--- a/scripts/03_server/tests/test_file.py
+++ b/scripts/03_server/tests/test_file.py
@@ -14,7 +14,7 @@ Script to test the myserver module.
 
 import pytest
 import sys
-from os.path import dirname
+from os.path import dirname, join
 
 from myserver.file import resolve_location, resolve_path, get_resource
 
@@ -29,22 +29,66 @@ def _find_root():
 
 def test_resolve_path():
     """
-    Tests the resolve_path() function.
+    Tests the resolve_path() function with some normal use cases.
     """
     tests_path = _find_root()
-    print('Tests path:', tests_path)
-    full_path = resolve_path(res='/index_simple.html', root=tests_path)
-    print(full_path)
-    assert full_path.endswith('/index_simple.html')
-    full_path = resolve_path(res='/index_simple.html', root=tests_path)
-    assert 1 == 2
+    res_path = join(tests_path, 'resources', 'www')
 
+    # Normal resource.
+    full_path = resolve_path(res='/index.html', root=res_path)
+    print(full_path)
+    assert full_path.endswith('resources/www/index.html')
+
+    # Let's try with a folder in resource, with an image.
+    full_path = resolve_path(res='/images/chaton.jpg', root=res_path)
+    print(full_path)
+    assert full_path.endswith('resources/www/images/chaton.jpg')
+
+
+def test_resolve_path_weirdos():
+    """
+    Tests the resolve_path() function with some abnormal use cases.
+    """
+    tests_path = _find_root()
+    res_path = join(tests_path, 'resources', 'www')
+
+    # //index.html should be the same as /index.html.
+    full_path = resolve_path(res='//index.html', root=res_path)
+    print(full_path)
+    assert full_path.endswith('resources/www/index.html')
+
+    # / should return /index.html path
+    full_path = resolve_path(res='/', root=res_path)
+    print(full_path)
+    assert full_path.endswith('resources/www/index.html')
+
+    # Non-existing resources should return the empty string ''.
+    full_path = resolve_path(res='/index.dontexist', root=res_path)
+    print(full_path)
+    assert full_path == ''
+
+    
 def test_get_resource():
     """
-    Tests the get_resource() function by capturing stdout.
+    Tests the get_resource() function by checking the content of the returned file.
     """
-    out = get_resource(res_path='tests/resources/index_simple.html')
+    tests_path = _find_root()
+    res_path = join(tests_path, 'resources', 'www', 'index.html')
+    out = get_resource(res_path=res_path)
     print(out)
     assert out[0] == b' <!DOCTYPE html>\n<html>\n<body>\n\n<h1>My First Heading</h1>\n<p>My first paragraph. See https://www.w3schools.com/html/html_basic.asp</p>\n\n</body>\n</html> '
 
+def test_get_resource_image():
+    """
+    Tests the get_resource() function by checking the content of an image.
+
+    For an image, check we get the magic numbers for a JPEG.
+    See https://gist.github.com/leommoore/f9e57ba2aa4bf197ebc5 for a complete list.
+    """
+    tests_path = _find_root()
+    res_path = join(tests_path, 'resources', 'www', 'images', 'chaton.jpg')
+    out = get_resource(res_path=res_path)
+    print(out[0][:4])
+    assert out[0][:4] == b'\xff\xd8\xff\xe0'
+