CCM NG: Fixed some errors in ccm-core. All tests now run again.

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4242 8810af33-2d31-482b-a856-94f89814c4df
2016-08-31 18:34:21 +00:00 · 2016-08-31 18:34:21 +00:00 · 5ed394bee2
parent b6ede27c36
commit 5ed394bee2
8 changed files with 44 additions and 32 deletions
--- a/ccm-core/src/main/java/org/libreccm/categorization/Category.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/Category.java
@ -80,19 +80,22 @@ import javax.xml.bind.annotation.XmlRootElement;
    @NamedEntityGraph(
        name = "Category.withSubCategoriesAndObjects",
        attributeNodes = {
-            @NamedAttributeNode(value = "subCategories",
-                                subgraph = "subCategories"),
-            @NamedAttributeNode(value = "objects")
-        },
-        subgraphs = {
-            @NamedSubgraph(
-                name = "subCategories",
-                attributeNodes = {
-                    @NamedAttributeNode("subCategories"),
-                    @NamedAttributeNode("objects")
-                }
-            )
+            @NamedAttributeNode(value = "subCategories"
+                //,
+            //                    subgraph = "subCategories"
+            ),
+            //@NamedAttributeNode(value = "objects")
        }
+//        ,
+//        subgraphs = {
+//            @NamedSubgraph(
+//                name = "subCategories",
+//                attributeNodes = {
+//                    @NamedAttributeNode("subCategories"),
+//                    @NamedAttributeNode("objects")
+//                }
+//            )
+//        }
    )
 })
@DefaultEntityGraph("Category.withSubCategoriesAndObjects")
--- a/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java
+++ b/ccm-core/src/main/java/org/libreccm/categorization/CategoryManager.java
@ -141,6 +141,7 @@ public class CategoryManager {
        categorization.setCategoryOrder(object.getCategories().size() + 1);
        categorization.setObjectOrder(category.getObjects().size() + 1);
        categorization.setType(type);
+        categorization.setIndex(false);

        object.addCategory(categorization);
        category.addObject(categorization);
--- a/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-add-obj-to-category.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/categorization/CategoryManagerTest/after-add-obj-to-category.yml
@ -65,10 +65,10 @@ ccm_core.categorizations:
      object_id: -3300
      category_order: 1
      object_order: 1
-      category_index: false
+      category_index: true
    - categorization_id: -10200
      object_id: -3200
      category_id: -2100
      category_order: 1
      object_order: 2
-      category_index: true
+      category_index: false
--- a/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-changed.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-changed.yml
@ -1,31 +1,31 @@
 ccm_core.settings:
    - setting_id: -3100
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: price
      dtype: BigDecimalSetting
      setting_value_big_decimal: 109.99
    - setting_id: -3200
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: enabled
      dtype: BooleanSetting
      setting_value_boolean: true
    - setting_id: -3300
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: minTemperature
      dtype: DoubleSetting
      setting_value_double: 23.5
    - setting_id: -3400
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: itemsPerPage
      dtype: LongSetting
      setting_value_long: 30
    - setting_id: -3500
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: helpUrl
      dtype: StringSetting
      setting_value_string: http://www.example.org
    - setting_id: -3600
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: languages
      dtype: EnumSetting

--- a/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-new.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/after-save-new.yml
@ -1,31 +1,31 @@
 ccm_core.settings:
    - setting_id: -3100
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: price
      dtype: BigDecimalSetting
      setting_value_big_decimal: 98.99
    - setting_id: -3200
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: enabled
      dtype: BooleanSetting
      setting_value_boolean: true
    - setting_id: -3300
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: minTemperature
      dtype: DoubleSetting
      setting_value_double: 23.5
    - setting_id: -3400
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: itemsPerPage
      dtype: LongSetting
      setting_value_long: 20
    - setting_id: -3500
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: helpUrl
      dtype: StringSetting
      setting_value_string: http://www.example.org
    - setting_id: -3600
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: languages
      dtype: EnumSetting
    - setting_id: -4000
--- a/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/data.yml
+++ b/ccm-core/src/test/resources/datasets/org/libreccm/configuration/ConfigurationManagerTest/data.yml
@ -1,31 +1,31 @@
 ccm_core.settings:
    - setting_id: -3100
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: price
      dtype: BigDecimalSetting
      setting_value_big_decimal: 98.99
    - setting_id: -3200
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: enabled
      dtype: BooleanSetting
      setting_value_boolean: true
    - setting_id: -3300
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: minTemperature
      dtype: DoubleSetting
      setting_value_double: 23.5
    - setting_id: -3400
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: itemsPerPage
      dtype: LongSetting
      setting_value_long: 20
    - setting_id: -3500
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: helpUrl
      dtype: StringSetting
      setting_value_string: http://www.example.org
    - setting_id: -3600
-      configuration_class: org.libreccm.configuration.ExampleConfiguration
+      configuration_class: org.libreccm.configuration.TestExampleConfiguration
      name: languages
      dtype: EnumSetting

--- a/ccm-core/src/test/resources/scripts/h2-cleanup.sql
+++ b/ccm-core/src/test/resources/scripts/h2-cleanup.sql
@ -34,4 +34,8 @@ DELETE FROM ccm_core.parties;

 DELETE FROM ccm_core.ccm_roles;

+DELETE FROM ccm_core.ccm_objects_aud;
+
+DELETE FROM ccm_core.ccm_revisions;
+
 ALTER SEQUENCE hibernate_sequence RESTART WITH 1;
--- a/ccm-core/src/test/resources/scripts/pgsql-cleanup.sql
+++ b/ccm-core/src/test/resources/scripts/pgsql-cleanup.sql
@ -34,4 +34,8 @@ DELETE FROM ccm_core.parties;

 DELETE FROM ccm_core.ccm_roles;

+DELETE FROM ccm_core.ccm_objects_aud;
+
+DELETE FROM ccm_core.ccm_revisions;
+
 ALTER SEQUENCE hibernate_sequence RESTART;