From 679fe536fec36b02cf09dba0f85427ef95bfbaac Mon Sep 17 00:00:00 2001
From: Tuna Aksoy <tuna.aksoy@alfresco.com>
Date: Fri, 28 Jun 2013 15:09:26 +0000
Subject: [PATCH] RM-752 (RM Dependency upgrade to 4.2): Fixed failing tests

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@51863 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../alfresco/repo/web/scripts/dictionary/RmClassesGet.java    | 1 +
 .../test/webscript/RmClassesRestApiTest.java                  | 4 ++--
 .../test/webscript/RmPropertiesRestApiTest.java               | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java b/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java
index 5a53b3909a..6628221c73 100644
--- a/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java
+++ b/rm-server/source/java/org/alfresco/repo/web/scripts/dictionary/RmClassesGet.java
@@ -200,6 +200,7 @@ public class RmClassesGet extends DictionaryWebServiceBase implements RecordsMan
         model.put(MODEL_PROP_KEY_CLASS_DEFS, classDefinitions);
         model.put(MODEL_PROP_KEY_PROPERTY_DETAILS, propdef.values());
         model.put(MODEL_PROP_KEY_ASSOCIATION_DETAILS, assocdef.values());
+        model.put(MODEL_PROP_KEY_MESSAGE_LOOKUP, dictionaryservice);
 
         return model;
     }
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmClassesRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmClassesRestApiTest.java
index 3775b24a0d..042a5d4c83 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmClassesRestApiTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmClassesRestApiTest.java
@@ -56,7 +56,7 @@ public class RmClassesRestApiTest extends BaseRMWebScriptTestCase
      * @throws IOException
      * @throws JSONException
      */
-    public void disableTestRmGetAspectDefinitions() throws IOException, JSONException
+    public void testRmGetAspectDefinitions() throws IOException, JSONException
     {
         // Format url and send request
         String url = String.format(RM_ASPECTS_URL, "aspect", SITE_ID);
@@ -140,7 +140,7 @@ public class RmClassesRestApiTest extends BaseRMWebScriptTestCase
             "bpm:assignees",
             "cm:likesRatingSchemeRollups",
             "wcmwf:submission",
-            "gd:googleEditable"
+            "sys:localized"
         });
     }
 }
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmPropertiesRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmPropertiesRestApiTest.java
index 2d2d9092e8..edb466a14a 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmPropertiesRestApiTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/webscript/RmPropertiesRestApiTest.java
@@ -56,7 +56,7 @@ public class RmPropertiesRestApiTest extends BaseRMWebScriptTestCase
      * @throws IOException
      * @throws JSONException
      */
-    public void disableTestRmGetTypeDefinitions() throws IOException, JSONException
+    public void testRmGetTypeDefinitions() throws IOException, JSONException
     {
         // Format url and send request
         String url = String.format(RM_TYPES_URL, "type", SITE_ID);