Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion c2pa-native-version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
c2pa-v0.73.2
c2pa-v0.74.0
21 changes: 13 additions & 8 deletions tests/test_unit_tests.py
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def load_test_settings_json():

class TestC2paSdk(unittest.TestCase):
def test_sdk_version(self):
self.assertIn("0.73.2", sdk_version())
self.assertIn("0.74.0", sdk_version())


class TestReader(unittest.TestCase):
Expand Down Expand Up @@ -2384,12 +2384,13 @@ def test_builder_sign_with_ingredients_edit_intent(self):
builder.close()

def test_builder_sign_with_setting_no_thumbnail_and_ingredient(self):
builder = Builder.from_json(self.manifestDefinition)
assert builder._builder is not None

# The following removes the manifest's thumbnail
# Settings should be loaded before the builder is created
load_settings('{"builder": { "thumbnail": {"enabled": false}}}')

builder = Builder.from_json(self.manifestDefinition)
assert builder._builder is not None

# Test adding ingredient
ingredient_json = '{ "title": "Test Ingredient" }'
with open(self.testPath3, 'rb') as f:
Expand Down Expand Up @@ -2431,12 +2432,12 @@ def test_builder_sign_with_setting_no_thumbnail_and_ingredient(self):
load_settings('{"builder": { "thumbnail": {"enabled": true}}}')

def test_builder_sign_with_settingdict_no_thumbnail_and_ingredient(self):
builder = Builder.from_json(self.manifestDefinition)
assert builder._builder is not None

# The following removes the manifest's thumbnail - using dict instead of string
load_settings({"builder": {"thumbnail": {"enabled": False}}})

builder = Builder.from_json(self.manifestDefinition)
assert builder._builder is not None

# Test adding ingredient
ingredient_json = '{ "title": "Test Ingredient" }'
with open(self.testPath3, 'rb') as f:
Expand Down Expand Up @@ -2709,8 +2710,11 @@ def test_builder_set_remote_url(self):

def test_builder_set_remote_url_no_embed(self):
"""Test setting the remote url of a builder with no embed flag."""
builder = Builder.from_json(self.manifestDefinition)

# Settings need to be loaded before the builder is created
load_settings(r'{"verify": { "remote_manifest_fetch": false} }')

builder = Builder.from_json(self.manifestDefinition)
builder.set_no_embed()
builder.set_remote_url("http://this_does_not_exist/foo.jpg")

Expand Down Expand Up @@ -4394,6 +4398,7 @@ def test_read_ingredient_file_who_has_no_manifest(self):
temp_data_dir = os.path.join(self.data_dir, "temp_data")
os.makedirs(temp_data_dir, exist_ok=True)

# Load settings first, before they need to be used
load_settings('{"builder": { "thumbnail": {"enabled": false}}}')

ingredient_json_with_dir = read_ingredient_file(self.testPath2, temp_data_dir)
Expand Down
Loading