From 9f9d854b996db2719c269471491e1cda7a69c7b1 Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 10 May 2017 15:33:34 +0000 Subject: [PATCH] CCM NG/ccm-cms: Fixed some more test failures git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4722 8810af33-2d31-482b-a856-94f89814c4df --- .../librecms/contentsection/AssetManager.java | 2 +- .../contentsection/AssetManagerTest.java | 1 - .../ContentTypeRepositoryTest.java | 4 +- .../after-copy-to-same-folder.xml | 40 +++++++++---------- .../after-move-to-other-contentsection.xml | 2 +- .../after-move-to-other-folder.xml | 2 +- .../categorization/CategoryManager.java | 14 ++----- 7 files changed, 28 insertions(+), 37 deletions(-) diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/AssetManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/AssetManager.java index c7c5fdb03..6a4a9ab67 100644 --- a/ccm-cms/src/main/java/org/librecms/contentsection/AssetManager.java +++ b/ccm-cms/src/main/java/org/librecms/contentsection/AssetManager.java @@ -362,7 +362,7 @@ public class AssetManager { index)); } - assetRepo.save(asset); + assetRepo.save(copy); categoryManager.addObjectToCategory(copy, targetFolder, diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java index 6a1957ab2..4cd876730 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/AssetManagerTest.java @@ -470,7 +470,6 @@ public class AssetManagerTest { final Folder targetFolder = folderRepo.findById(-420L).get(); assetManager.copy(asset, targetFolder); - assetManager.copy(asset, targetFolder); } /** diff --git a/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java b/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java index 876178d08..8ffa467c1 100644 --- a/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java +++ b/ccm-cms/src/test/java/org/librecms/contentsection/ContentTypeRepositoryTest.java @@ -417,7 +417,7 @@ public class ContentTypeRepositoryTest { "META-INF/persistence.xml") .addAsWebInfResource("test-web.xml", "web.xml") .addAsResource("configs/shiro.ini", "shiro.ini") - .addAsWebInfResource("META-INF/beans.xml", "WEB-INF/beans.xml"); + .addAsWebInfResource("META-INF/beans.xml", "beans.xml"); } /** @@ -651,8 +651,6 @@ public class ContentTypeRepositoryTest { .execute(() -> contentTypeRepo.delete(newsType.get())); } -// ToDo, does not work at the moment because including AuthorizationInterceptor -// pulls in to many other dependencies, more exactly most of Bebop... /** * Verifies that an unused content type can be deleted. */ diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-copy-to-same-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-copy-to-same-folder.xml index 8771e2044..e162ada99 100644 --- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-copy-to-same-folder.xml +++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-copy-to-same-folder.xml @@ -76,9 +76,9 @@ - + uuid="00000000-0000-0000-0000-000000000001" />--> - + display_name="catalog.pdf_copy2" />--> - + @@ -321,8 +321,8 @@ rev="0" /> - + - + locale="en" />--> - + data_size="0"/>--> - + data_size="0" />--> - + @@ -464,8 +464,8 @@ rev="0" /> - + - + locale="en" />--> - + type="folder" />--> diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-move-to-other-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-move-to-other-folder.xml index a586f6190..5cec60487 100644 --- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-move-to-other-folder.xml +++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/AssetManagerTest/after-move-to-other-folder.xml @@ -514,7 +514,7 @@ diff --git a/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java b/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java index 516e4518b..d6733e21f 100644 --- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java +++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java @@ -127,12 +127,6 @@ public class CategoryManager { Objects.requireNonNull(category, "Can't add an object to category 'null'."); - final CcmObject addedObject = ccmObjectRepo - .findObjectById(object.getObjectId()) - .orElseThrow(() -> new IllegalArgumentException(String.format( - "No CcmObject with ID %d in the database. " - + "Where did that ID come from?", - object.getObjectId()))); final Category assignedCategory = categoryRepo .findById(category.getObjectId()) .orElseThrow(() -> new IllegalArgumentException(String.format( @@ -141,17 +135,17 @@ public class CategoryManager { category.getObjectId()))); final Categorization categorization = new Categorization(); - categorization.setCategorizedObject(addedObject); + categorization.setCategorizedObject(object); categorization.setCategory(assignedCategory); - - final long categoryCount = countAssignedCategories(addedObject); + + final long categoryCount = countAssignedCategories(object); categorization.setCategoryOrder(categoryCount + 1); final long objectCount = countObjects(assignedCategory); categorization.setObjectOrder(objectCount + 1); categorization.setType(type); categorization.setIndex(false); - addedObject.addCategory(categorization); + object.addCategory(categorization); assignedCategory.addObject(categorization); // Saving a category requires the manage_category privilege which