Updated line endings to be in line with UNIX style

tests/database/__init__.py

@@ -1,3 +1,3 @@
-# Ensure test environment is set before using
-# Runs the database creation scripts
-import scripts.create_database
+# Ensure test environment is set before using
+# Runs the database creation scripts
+import scripts.create_database

tests/database/test_products.py

@@ -1,70 +1,70 @@
-import pytest
-import sqlite3
-from datetime import datetime
-from controllers.database.product import ProductController
-from models.products.product import Product
-
-product = Product(
-    "product",
-    "image.png",
-    "description",
-    10.00,
-    1,
-    1,
-    datetime.now(),
-    1
-)
-
-# Tests a new product can be created
-
-
-def test_create_product():
-    db = ProductController()
-    db.create(product)
-
-# Tests the database maintains integrity when we try
-# and add a product with the same details
-
-
-@pytest.mark.skip
-def test_duplicate_product():
-    db = ProductController()
-    with pytest.raises(sqlite3.IntegrityError):
-        db.create(product)
-
-# Tests that products can be refined by category
-
-
-def test_search_category():
-    db = ProductController()
-
-    # Check each category for correct amount of test products
-    assert len(db.read_all("Car Parts")) == 9 + 1  # Added in previous test
-    assert len(db.read_all("Books")) == 9
-    assert db.read_all("Phones") is None
-
-
-# Tests that products can be refined by search term
-def test_search_term():
-    db = ProductController()
-
-    # Check each search term for correct amount of test products
-    assert len(db.read_all(search_term="test")) == 33
-    assert len(db.read_all("Car Parts", "test")) == 9
-    assert len(db.read_all(search_term="product")) == 1
-    assert db.read_all(search_term="not_test") is None
-
-# Test we the same product details get returned from the database
-
-
-def test_read_product():
-    db = ProductController()
-
-    # Test the same product is returned
-    new_product = db.read("product")
-    assert isinstance(new_product, list)
-    assert isinstance(new_product[0], Product)
-
-    # Update the ID on the item as database assigns new id
-    product.id = new_product[0].id
-    assert new_product[0].__dict__ == product.__dict__
+import pytest
+import sqlite3
+from datetime import datetime
+from controllers.database.product import ProductController
+from models.products.product import Product
+
+product = Product(
+    "product",
+    "image.png",
+    "description",
+    10.00,
+    1,
+    1,
+    datetime.now(),
+    1
+)
+
+# Tests a new product can be created
+
+
+def test_create_product():
+    db = ProductController()
+    db.create(product)
+
+# Tests the database maintains integrity when we try
+# and add a product with the same details
+
+
+@pytest.mark.skip
+def test_duplicate_product():
+    db = ProductController()
+    with pytest.raises(sqlite3.IntegrityError):
+        db.create(product)
+
+# Tests that products can be refined by category
+
+
+def test_search_category():
+    db = ProductController()
+
+    # Check each category for correct amount of test products
+    assert len(db.read_all("Car Parts")) == 9 + 1  # Added in previous test
+    assert len(db.read_all("Books")) == 9
+    assert db.read_all("Phones") is None
+
+
+# Tests that products can be refined by search term
+def test_search_term():
+    db = ProductController()
+
+    # Check each search term for correct amount of test products
+    assert len(db.read_all(search_term="test")) == 33
+    assert len(db.read_all("Car Parts", "test")) == 9
+    assert len(db.read_all(search_term="product")) == 1
+    assert db.read_all(search_term="not_test") is None
+
+# Test we the same product details get returned from the database
+
+
+def test_read_product():
+    db = ProductController()
+
+    # Test the same product is returned
+    new_product = db.read("product")
+    assert isinstance(new_product, list)
+    assert isinstance(new_product[0], Product)
+
+    # Update the ID on the item as database assigns new id
+    product.id = new_product[0].id
+    assert new_product[0].__dict__ == product.__dict__

tests/database/test_users.py

@@ -1,74 +1,74 @@
-import pytest
-import sqlite3
-from controllers.database.user import UserController
-from models.users.customer import Customer
-from models.users.seller import Seller
-
-customer = Customer(
-    "testcustomer",
-    "Password1",
-    "firstname",
-    "lastname",
-    "test@test",
-    "123456789"
-)
-
-seller = Seller(
-    "testseller",
-    "Password1",
-    "firstname",
-    "lastname",
-    "seller@seller",
-    "987654321"
-)
-
-# Tests a new user can be created
-
-
-def test_create_user():
-    db = UserController()
-    db.create(customer)
-
-# Tests the database maintains integrity when we try
-# and add a user with the same details
-
-
-def test_duplicate_user():
-    db = UserController()
-    with pytest.raises(sqlite3.IntegrityError):
-        db.create(customer)
-
-# Test we the same user details get returned from the database
-
-
-def test_read_user():
-    db = UserController()
-
-    # Test the same user is returned
-    user = db.read(customer.username)
-    assert isinstance(user, Customer)
-
-    # Update the ID on the item as database assigns new id
-    customer.id = user.id
-    assert user.__dict__ == customer.__dict__
-
-
-# Tests a new seller can be created
-def test_create_seller():
-    db = UserController()
-    db.create(seller)
-
-# Test that the same seller details get returned from the database
-
-
-def test_read_seller():
-    db = UserController()
-
-    # Test the same user is returned
-    user = db.read(seller.username)
-    assert isinstance(user, Seller)
-
-    # Update the ID on the item as database assigns new id
-    seller.id = user.id
-    user.store = ""
-    assert user.__dict__ == seller.__dict__
+import pytest
+import sqlite3
+from controllers.database.user import UserController
+from models.users.customer import Customer
+from models.users.seller import Seller
+
+customer = Customer(
+    "testcustomer",
+    "Password1",
+    "firstname",
+    "lastname",
+    "test@test",
+    "123456789"
+)
+
+seller = Seller(
+    "testseller",
+    "Password1",
+    "firstname",
+    "lastname",
+    "seller@seller",
+    "987654321"
+)
+
+# Tests a new user can be created
+
+
+def test_create_user():
+    db = UserController()
+    db.create(customer)
+
+# Tests the database maintains integrity when we try
+# and add a user with the same details
+
+
+def test_duplicate_user():
+    db = UserController()
+    with pytest.raises(sqlite3.IntegrityError):
+        db.create(customer)
+
+# Test we the same user details get returned from the database
+
+
+def test_read_user():
+    db = UserController()
+
+    # Test the same user is returned
+    user = db.read(customer.username)
+    assert isinstance(user, Customer)
+
+    # Update the ID on the item as database assigns new id
+    customer.id = user.id
+    assert user.__dict__ == customer.__dict__
+
+
+# Tests a new seller can be created
+def test_create_seller():
+    db = UserController()
+    db.create(seller)
+
+# Test that the same seller details get returned from the database
+
+
+def test_read_seller():
+    db = UserController()
+
+    # Test the same user is returned
+    user = db.read(seller.username)
+    assert isinstance(user, Seller)
+
+    # Update the ID on the item as database assigns new id
+    seller.id = user.id
+    user.store = ""
+    assert user.__dict__ == seller.__dict__