Skip to content

Commit

Permalink
fix broken tests after uuid refactor
Browse files Browse the repository at this point in the history
  • Loading branch information
@cheahjs
cheahjs committed Jan 31, 2024
1 parent 38ea59a commit e05384e
Show file tree
Hide file tree
Showing 2 changed files with 99 additions and 71 deletions.
28 changes: 28 additions & 0 deletions lib/archive.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,31 @@ def __init__(self, raw_bytes: bytes) -> None:
self.raw_bytes = raw_bytes
self.parsed_uuid = None

def from_str(s: str) -> "UUID":
b = uuid.UUID(s).bytes
return UUID(
bytes(
[
b[0x3],
b[0x2],
b[0x1],
b[0x0],
b[0x7],
b[0x6],
b[0x5],
b[0x4],
b[0xB],
b[0xA],
b[0x9],
b[0x8],
b[0xF],
b[0xE],
b[0xD],
b[0xC],
]
)
)

def __str__(self) -> str:
if not self.parsed_uuid:
b = self.raw_bytes
Expand All @@ -40,6 +65,9 @@ def __str__(self) -> str:
self.parsed_uuid = uuid.UUID(int=uuid_int)
return str(self.parsed_uuid)

def __eq__(self, __value: object) -> bool:
return str(self) == str(__value)


def instance_id_reader(reader: "FArchiveReader") -> dict[str, UUID]:
return {
Expand Down
142 changes: 71 additions & 71 deletions tests/test_gvas.py
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import base64
import json
import unittest
from uuid import UUID
import uuid

from parameterized import parameterized

from lib.archive import FArchiveReader, FArchiveWriter
from lib.archive import UUID, FArchiveReader, FArchiveWriter
from lib.gvas import GvasFile, GvasHeader
from lib.json_tools import CustomEncoder
from lib.palsav import decompress_sav_to_gvas
Expand All @@ -31,75 +31,75 @@ def test_header(self):
"engine_version_branch": "++UE5+Release-5.1",
"custom_version_format": 3,
"custom_versions": [
(UUID("40d2fba7-4b48-4ce5-b038-5a75884e499e"), 7),
(UUID("fcf57afa-5076-4283-b9a9-e658ffa02d32"), 76),
(UUID("0925477b-763d-4001-9d91-d6730b75b411"), 1),
(UUID("4288211b-4548-16c6-1a76-67b2507a2a00"), 1),
(UUID("1ab9cecc-0000-6913-0000-4875203d51fb"), 100),
(UUID("4cef9221-470e-d43a-7e60-3d8c16995726"), 1),
(UUID("e2717c7e-52f5-44d3-950c-5340b315035e"), 7),
(UUID("11310aed-2e55-4d61-af67-9aa3c5a1082c"), 17),
(UUID("a7820cfb-20a7-4359-8c54-2c149623cf50"), 21),
(UUID("f6dfbb78-bb50-a0e4-4018-b84d60cbaf23"), 2),
(UUID("24bb7af3-5646-4f83-1f2f-2dc249ad96ff"), 5),
(UUID("76a52329-0923-45b5-98ae-d841cf2f6ad8"), 5),
(UUID("5fbc6907-55c8-40ae-8e67-f1845efff13f"), 1),
(UUID("82e77c4e-3323-43a5-b46b-13c597310df3"), 0),
(UUID("0ffcf66c-1190-4899-b160-9cf84a46475e"), 1),
(UUID("9c54d522-a826-4fbe-9421-074661b482d0"), 44),
(UUID("b0d832e4-1f89-4f0d-accf-7eb736fd4aa2"), 10),
(UUID("e1c64328-a22c-4d53-a36c-8e866417bd8c"), 0),
(UUID("375ec13c-06e4-48fb-b500-84f0262a717e"), 4),
(UUID("e4b068ed-f494-42e9-a231-da0b2e46bb41"), 40),
(UUID("cffc743f-43b0-4480-9391-14df171d2073"), 37),
(UUID("b02b49b5-bb20-44e9-a304-32b752e40360"), 3),
(UUID("a4e4105c-59a1-49b5-a7c5-40c4547edfee"), 0),
(UUID("39c831c9-5ae6-47dc-9a44-9c173e1c8e7c"), 0),
(UUID("78f01b33-ebea-4f98-b9b4-84eaccb95aa2"), 20),
(UUID("6631380f-2d4d-43e0-8009-cf276956a95a"), 0),
(UUID("12f88b9f-8875-4afc-a67c-d90c383abd29"), 45),
(UUID("7b5ae74c-d270-4c10-a958-57980b212a5a"), 13),
(UUID("d7296918-1dd6-4bdd-9de2-64a83cc13884"), 3),
(UUID("c2a15278-bfe7-4afe-6c17-90ff531df755"), 1),
(UUID("6eaca3d4-40ec-4cc1-b786-8bed09428fc5"), 3),
(UUID("29e575dd-e0a3-4627-9d10-d276232cdcea"), 17),
(UUID("af43a65d-7fd3-4947-9873-3e8ed9c1bb05"), 15),
(UUID("6b266cec-1ec7-4b8f-a30b-e4d90942fc07"), 1),
(UUID("0df73d61-a23f-47ea-b727-89e90c41499a"), 1),
(UUID("601d1886-ac64-4f84-aa16-d3de0deac7d6"), 80),
(UUID("5b4c06b7-2463-4af8-805b-bf70cdf5d0dd"), 10),
(UUID("e7086368-6b23-4c58-8439-1b7016265e91"), 4),
(UUID("9dffbcd6-494f-0158-e221-12823c92a888"), 10),
(UUID("f2aed0ac-9afe-416f-8664-aa7ffa26d6fc"), 1),
(UUID("174f1f0b-b4c6-45a5-b13f-2ee8d0fb917d"), 10),
(UUID("35f94a83-e258-406c-a318-09f59610247c"), 41),
(UUID("b68fc16e-8b1b-42e2-b453-215c058844fe"), 1),
(UUID("b2e18506-4273-cfc2-a54e-f4bb758bba07"), 1),
(UUID("64f58936-fd1b-42ba-ba96-7289d5d0fa4e"), 1),
(UUID("697dd581-e64f-41ab-aa4a-51ecbeb7b628"), 88),
(UUID("d89b5e42-24bd-4d46-8412-aca8df641779"), 41),
(UUID("59da5d52-1232-4948-b878-597870b8e98b"), 8),
(UUID("26075a32-730f-4708-88e9-8c32f1599d05"), 0),
(UUID("6f0ed827-a609-4895-9c91-998d90180ea4"), 2),
(UUID("30d58be3-95ea-4282-a6e3-b159d8ebb06a"), 1),
(UUID("717f9ee7-e9b0-493a-88b3-91321b388107"), 16),
(UUID("430c4d19-7154-4970-8769-9b69df90b0e5"), 15),
(UUID("aafe32bd-5395-4c14-b66a-5e251032d1dd"), 1),
(UUID("23afe18e-4ce1-4e58-8d61-c252b953beb7"), 11),
(UUID("a462b7ea-f499-4e3a-99c1-ec1f8224e1b2"), 4),
(UUID("2eb5fdbd-01ac-4d10-8136-f38f3393a5da"), 5),
(UUID("509d354f-f6e6-492f-a749-85b2073c631c"), 0),
(UUID("b6e31b1c-d29f-11ec-857e-9f856f9970e2"), 1),
(UUID("4a56eb40-10f5-11dc-92d3-347eb2c96ae7"), 2),
(UUID("d78a4a00-e858-4697-baa8-19b5487d46b4"), 18),
(UUID("5579f886-933a-4c1f-83ba-087b6361b92f"), 2),
(UUID("612fbe52-da53-400b-910d-4f919fb1857c"), 1),
(UUID("a4237a36-caea-41c9-8fa2-18f858681bf3"), 5),
(UUID("804e3f75-7088-4b49-a4d6-8c063c7eb6dc"), 5),
(UUID("1ed048f4-2f2e-4c68-89d0-53a4f18f102d"), 1),
(UUID("fb680af2-59ef-4ba3-baa8-19b573c8443d"), 2),
(UUID("9950b70e-b41a-4e17-bbcc-fa0d57817fd6"), 1),
(UUID("ab965196-45d8-08fc-b7d7-228d78ad569e"), 1),
(UUID.from_str("40d2fba7-4b48-4ce5-b038-5a75884e499e"), 7),
(UUID.from_str("fcf57afa-5076-4283-b9a9-e658ffa02d32"), 76),
(UUID.from_str("0925477b-763d-4001-9d91-d6730b75b411"), 1),
(UUID.from_str("4288211b-4548-16c6-1a76-67b2507a2a00"), 1),
(UUID.from_str("1ab9cecc-0000-6913-0000-4875203d51fb"), 100),
(UUID.from_str("4cef9221-470e-d43a-7e60-3d8c16995726"), 1),
(UUID.from_str("e2717c7e-52f5-44d3-950c-5340b315035e"), 7),
(UUID.from_str("11310aed-2e55-4d61-af67-9aa3c5a1082c"), 17),
(UUID.from_str("a7820cfb-20a7-4359-8c54-2c149623cf50"), 21),
(UUID.from_str("f6dfbb78-bb50-a0e4-4018-b84d60cbaf23"), 2),
(UUID.from_str("24bb7af3-5646-4f83-1f2f-2dc249ad96ff"), 5),
(UUID.from_str("76a52329-0923-45b5-98ae-d841cf2f6ad8"), 5),
(UUID.from_str("5fbc6907-55c8-40ae-8e67-f1845efff13f"), 1),
(UUID.from_str("82e77c4e-3323-43a5-b46b-13c597310df3"), 0),
(UUID.from_str("0ffcf66c-1190-4899-b160-9cf84a46475e"), 1),
(UUID.from_str("9c54d522-a826-4fbe-9421-074661b482d0"), 44),
(UUID.from_str("b0d832e4-1f89-4f0d-accf-7eb736fd4aa2"), 10),
(UUID.from_str("e1c64328-a22c-4d53-a36c-8e866417bd8c"), 0),
(UUID.from_str("375ec13c-06e4-48fb-b500-84f0262a717e"), 4),
(UUID.from_str("e4b068ed-f494-42e9-a231-da0b2e46bb41"), 40),
(UUID.from_str("cffc743f-43b0-4480-9391-14df171d2073"), 37),
(UUID.from_str("b02b49b5-bb20-44e9-a304-32b752e40360"), 3),
(UUID.from_str("a4e4105c-59a1-49b5-a7c5-40c4547edfee"), 0),
(UUID.from_str("39c831c9-5ae6-47dc-9a44-9c173e1c8e7c"), 0),
(UUID.from_str("78f01b33-ebea-4f98-b9b4-84eaccb95aa2"), 20),
(UUID.from_str("6631380f-2d4d-43e0-8009-cf276956a95a"), 0),
(UUID.from_str("12f88b9f-8875-4afc-a67c-d90c383abd29"), 45),
(UUID.from_str("7b5ae74c-d270-4c10-a958-57980b212a5a"), 13),
(UUID.from_str("d7296918-1dd6-4bdd-9de2-64a83cc13884"), 3),
(UUID.from_str("c2a15278-bfe7-4afe-6c17-90ff531df755"), 1),
(UUID.from_str("6eaca3d4-40ec-4cc1-b786-8bed09428fc5"), 3),
(UUID.from_str("29e575dd-e0a3-4627-9d10-d276232cdcea"), 17),
(UUID.from_str("af43a65d-7fd3-4947-9873-3e8ed9c1bb05"), 15),
(UUID.from_str("6b266cec-1ec7-4b8f-a30b-e4d90942fc07"), 1),
(UUID.from_str("0df73d61-a23f-47ea-b727-89e90c41499a"), 1),
(UUID.from_str("601d1886-ac64-4f84-aa16-d3de0deac7d6"), 80),
(UUID.from_str("5b4c06b7-2463-4af8-805b-bf70cdf5d0dd"), 10),
(UUID.from_str("e7086368-6b23-4c58-8439-1b7016265e91"), 4),
(UUID.from_str("9dffbcd6-494f-0158-e221-12823c92a888"), 10),
(UUID.from_str("f2aed0ac-9afe-416f-8664-aa7ffa26d6fc"), 1),
(UUID.from_str("174f1f0b-b4c6-45a5-b13f-2ee8d0fb917d"), 10),
(UUID.from_str("35f94a83-e258-406c-a318-09f59610247c"), 41),
(UUID.from_str("b68fc16e-8b1b-42e2-b453-215c058844fe"), 1),
(UUID.from_str("b2e18506-4273-cfc2-a54e-f4bb758bba07"), 1),
(UUID.from_str("64f58936-fd1b-42ba-ba96-7289d5d0fa4e"), 1),
(UUID.from_str("697dd581-e64f-41ab-aa4a-51ecbeb7b628"), 88),
(UUID.from_str("d89b5e42-24bd-4d46-8412-aca8df641779"), 41),
(UUID.from_str("59da5d52-1232-4948-b878-597870b8e98b"), 8),
(UUID.from_str("26075a32-730f-4708-88e9-8c32f1599d05"), 0),
(UUID.from_str("6f0ed827-a609-4895-9c91-998d90180ea4"), 2),
(UUID.from_str("30d58be3-95ea-4282-a6e3-b159d8ebb06a"), 1),
(UUID.from_str("717f9ee7-e9b0-493a-88b3-91321b388107"), 16),
(UUID.from_str("430c4d19-7154-4970-8769-9b69df90b0e5"), 15),
(UUID.from_str("aafe32bd-5395-4c14-b66a-5e251032d1dd"), 1),
(UUID.from_str("23afe18e-4ce1-4e58-8d61-c252b953beb7"), 11),
(UUID.from_str("a462b7ea-f499-4e3a-99c1-ec1f8224e1b2"), 4),
(UUID.from_str("2eb5fdbd-01ac-4d10-8136-f38f3393a5da"), 5),
(UUID.from_str("509d354f-f6e6-492f-a749-85b2073c631c"), 0),
(UUID.from_str("b6e31b1c-d29f-11ec-857e-9f856f9970e2"), 1),
(UUID.from_str("4a56eb40-10f5-11dc-92d3-347eb2c96ae7"), 2),
(UUID.from_str("d78a4a00-e858-4697-baa8-19b5487d46b4"), 18),
(UUID.from_str("5579f886-933a-4c1f-83ba-087b6361b92f"), 2),
(UUID.from_str("612fbe52-da53-400b-910d-4f919fb1857c"), 1),
(UUID.from_str("a4237a36-caea-41c9-8fa2-18f858681bf3"), 5),
(UUID.from_str("804e3f75-7088-4b49-a4d6-8c063c7eb6dc"), 5),
(UUID.from_str("1ed048f4-2f2e-4c68-89d0-53a4f18f102d"), 1),
(UUID.from_str("fb680af2-59ef-4ba3-baa8-19b573c8443d"), 2),
(UUID.from_str("9950b70e-b41a-4e17-bbcc-fa0d57817fd6"), 1),
(UUID.from_str("ab965196-45d8-08fc-b7d7-228d78ad569e"), 1),
],
"save_game_class_name": "/Script/Pal.PalWorldSaveGame",
}
Expand Down

0 comments on commit e05384e

Please sign in to comment.