Add further tests

Signed-off-by: DL6ER <[email protected]>

Author: DL6ER

app/labeldesigner/label.py

@@ -417,8 +417,7 @@ def _draw_text(self, img = None, bboxes = [], text_offset = (0, 0)):
                 anchor = "rt"
             # else: error
             else:
-                logger.error(f"Unsupported alignment: {align}")
-                return
+                raise ValueError(f"Unsupported alignment: {align}")
 
             if do_draw and 'font_inverted' in line and line['font_inverted']:
                 # Draw a filled rectangle

app/labeldesigner/routes.py

@@ -126,6 +126,8 @@ def print_label():
         printer = create_printer_from_request(request)
         label = create_label_from_request(request)
         print_count = int(request.values.get('print_count', 1))
+        if print_count < 1:
+            raise ValueError("print_count must be greater than 0")
         cut_once = int(request.values.get('cut_once', 0)) == 1
     except Exception as e:
         return_dict['message'] = str(e)

tests/demo_image.jpg tests/_demo_image.jpgtests/demo_image.jpg renamed to tests/_demo_image.jpg

@@ -143,7 +143,7 @@ def test_generate_preview_inverted(client):
     assert response.content_type in ['image/png']
 
     # Check image
-    verify_image(response.data, 'tests/inverted.png')
+    verify_image(response.data, 'tests/inverted_text.png')
 
 
 def test_generate_preview_rotated(client):
@@ -198,7 +198,7 @@ def test_generate_ean13(client):
     assert response.content_type in ['image/png']
 
     # Check image
-    verify_image(response.data, 'tests/ean13.png')
+    verify_image(response.data, 'tests/barcode_ean13.png')
 
 
 def test_invalid_ean13(client):
@@ -256,7 +256,7 @@ def test_generate_qr(client):
     verify_image(response.data, 'tests/qr.png')
 
 
-def image_test(client, image_path: str = "tests/demo_image.jpg", rotated: bool = False, fit: bool = False, text: bool = False, image_mode: str = "grayscale"):
+def image_test(client, image_path: str = "tests/_demo_image.jpg", rotated: bool = False, fit: bool = False, text: bool = False, image_mode: str = "grayscale"):
     data = EXAMPLE_FORMDATA.copy()
     my_file = FileStorage(
         stream=open(image_path, "rb"),
@@ -506,6 +506,7 @@ def test_corrupted_image_upload(client):
     assert 'message' in data
     assert data['message'] == 'Truncated File Read'
 
+
 def test_empty_label(client):
     data = EXAMPLE_FORMDATA.copy()
     data['text'] = json.dumps([])
@@ -597,10 +598,6 @@ def test_file_size_limits(client):
     assert response.status_code == 413
 
 
-# Even more edge-case and robustness tests
-import time
-from flask import Response
-
 def test_extra_fields_ignored(client):
     data = EXAMPLE_FORMDATA.copy()
     data['text'] = json.dumps([
@@ -685,6 +682,97 @@ def test_missing_optional_fields(client):
     # Check image
     verify_image(response.data, 'tests/missing_optional_fields.png')
 
+
+# Further advanced test cases
+import unicodedata
+
+def test_invalid_json_structure(client):
+    data = EXAMPLE_FORMDATA.copy()
+    # JSON string, but not a list
+    data['text'] = json.dumps({'foo': 'bar'})
+    response = client.post('/labeldesigner/api/preview', data=data)
+    assert response.status_code == 400
+
+
+@pytest.mark.parametrize('size', [0, -1, -100])
+def test_negative_zero_font_size(client, size):
+    data = EXAMPLE_FORMDATA.copy()
+    data['text'] = json.dumps([
+        {'font_family': 'DejaVu Sans', 'font_style': 'Regular', 'text': 'Bad size', 'font_size': str(size), 'align': 'center'}
+    ])
+    response = client.post('/labeldesigner/api/preview', data=data)
+    assert response.status_code == 400
+
+
+@pytest.mark.parametrize('size', [0, -1, -100])
+def test_negative_zero_label_size(client, size):
+    data = EXAMPLE_FORMDATA.copy()
+    data['label_size'] = size
+    data['text'] = json.dumps([
+        {'font_family': 'DejaVu Sans', 'font_style': 'Regular', 'text': 'Bad label', 'font_size': '12', 'align': 'center'}
+    ])
+    response = client.post('/labeldesigner/api/preview', data=data)
+    assert response.status_code == 400
+
+
+def test_invalid_alignment(client):
+    data = EXAMPLE_FORMDATA.copy()
+    data['text'] = json.dumps([
+        {'font_family': 'DejaVu Sans', 'font_style': 'Regular', 'text': 'Bad align', 'font_size': '12', 'align': 'diagonal'}
+    ])
+    response = client.post('/labeldesigner/api/preview', data=data)
+    assert response.status_code == 400
+
+
+def test_non_string_text_value(client):
+    data = EXAMPLE_FORMDATA.copy()
+    data['text'] = json.dumps([
+        {'font_family': 'DejaVu Sans', 'font_style': 'Regular', 'text': 12345, 'font_size': '12', 'align': 'center'}
+    ])
+    response = client.post('/labeldesigner/api/preview', data=data)
+    assert response.status_code == 400
+
+
+def test_conflicting_fields(client):
+    data = EXAMPLE_FORMDATA.copy()
+    data['print_type'] = 'qrcode_text'
+    data['barcode_type'] = 'QR'
+    data['image'] = FileStorage(stream=io.BytesIO(b'img'), filename='img.jpg', content_type='image/jpeg')
+    data['image_mode'] = 'grayscale'
+    data['text'] = json.dumps([
+        {'font_family': 'DejaVu Sans', 'font_style': 'Regular', 'text': 'Conflict', 'font_size': '12', 'align': 'center'}
+    ])
+    response = client.post('/labeldesigner/api/preview', data=data)
+    assert response.status_code == 400
+
+
+def test_unicode_normalization(client):
+    data = EXAMPLE_FORMDATA.copy()
+    s1 = 'Café'
+    s2 = unicodedata.normalize('NFD', s1)
+    data['text'] = json.dumps([
+        {'font_family': 'DejaVu Sans', 'font_style': 'Regular', 'text': s1, 'font_size': '24', 'align': 'center'},
+        {'font_family': 'DejaVu Sans', 'font_style': 'Regular', 'text': s2, 'font_size': '24', 'align': 'center'}
+    ])
+    response = client.post('/labeldesigner/api/preview', data=data)
+    assert response.status_code == 200
+    assert response.content_type in ['image/png']
+
+    # Check image
+    verify_image(response.data, 'tests/unicode_normalization.png')
+
+
+def test_head_request(client):
+    response = client.head('/labeldesigner/api/preview')
+    assert response.status_code == 405
+
+
+def test_malformed_multipart(client):
+    # Simulate a malformed multipart by sending a bad content-type
+    data = '--bad-boundary\r\nContent-Disposition: form-data; name="text"\r\n\r\nfoo\r\n--bad-boundary--\r\n'
+    response = client.post('/labeldesigner/api/preview', data=data, headers={'Content-Type': 'multipart/form-data; boundary=bad-boundary'})
+    assert response.status_code == 400
+
 # We cannot test the print functionality without a physical printer
 # def test_print_label(client):
 #    data = {