From 868f91bed41caad8453139318b00d4cc70cf39fe Mon Sep 17 00:00:00 2001
From: Roy Wetherall <roy.wetherall@alfresco.com>
Date: Mon, 2 Jul 2012 07:14:45 +0000
Subject: [PATCH] RM-189: Search Results page: "Special Types" information
 isn't displayed

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/BRANCHES/V2.0@38604 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 rm-server/build.gradle                        |  1 +
 .../script/slingshot/RMSearchGet.java         |  6 ++--
 ...RecordsManagementAdminServiceImplTest.java | 29 ++++---------------
 3 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/rm-server/build.gradle b/rm-server/build.gradle
index 79c05cf9c9..8a5520e1f1 100644
--- a/rm-server/build.gradle
+++ b/rm-server/build.gradle
@@ -53,6 +53,7 @@ test {
   include '**/CustomEMailMappingServiceServiceImplTest.class'
   include '**/DispositionServiceImplTest.class'
   include '**/RecordsManagementActionServiceImplTest.class'
+  include '**/RecordsManagementAdminServiceImplTest.class'
   
   testLogging.showStandardStreams = true
 
diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java
index ef5a3face2..a1d9ba4459 100644
--- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java
+++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/script/slingshot/RMSearchGet.java
@@ -28,7 +28,6 @@ import java.util.Map;
 
 import org.alfresco.error.AlfrescoRuntimeException;
 import org.alfresco.model.ContentModel;
-import org.alfresco.module.org_alfresco_module_rm.model.RecordsManagementModel;
 import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchParameters;
 import org.alfresco.module.org_alfresco_module_rm.search.RecordsManagementSearchService;
 import org.alfresco.module.org_alfresco_module_rm.search.SavedSearchDetailsCompatibility;
@@ -319,9 +318,8 @@ public class RMSearchGet extends DeclarativeWebScript
             for (Map.Entry<QName, Serializable> entry : nodeProperties.entrySet())
             {
                 QName qName = entry.getKey().getPrefixedQName(namespaceService);
-                if (RecordsManagementModel.RM_URI.equals(qName.getNamespaceURI()) == true ||
-                    RecordsManagementModel.RM_CUSTOM_URI.equals(qName.getNamespaceURI()) == true)
-                {
+                if (NamespaceService.SYSTEM_MODEL_1_0_URI.equals(qName.getNamespaceURI()) == false)
+                {   
                     String prefixName = qName.getPrefixString().replace(":", "_");
                     Serializable value = entry.getValue();
                     if (value instanceof NodeRef)
diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java
index 0e9d25458b..eb03a63656 100644
--- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java
+++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/service/RecordsManagementAdminServiceImplTest.java
@@ -50,12 +50,10 @@ import org.alfresco.service.cmr.dictionary.PropertyDefinition;
 import org.alfresco.service.cmr.repository.AssociationRef;
 import org.alfresco.service.cmr.repository.ChildAssociationRef;
 import org.alfresco.service.cmr.repository.NodeRef;
-import org.alfresco.service.namespace.InvalidQNameException;
 import org.alfresco.service.namespace.NamespaceService;
 import org.alfresco.service.namespace.QName;
 import org.alfresco.service.namespace.RegexQNamePattern;
 import org.alfresco.util.Pair;
-import org.antlr.grammar.v3.ANTLRv3Parser.throwsSpec_return;
 import org.springframework.util.CollectionUtils;
 
 /**
@@ -331,7 +329,8 @@ public class RecordsManagementAdminServiceImplTest extends    BaseRMTestCase
     	// Failure: Add a property with the same name twice
     	doTestInTransaction(new FailureTest
         (
-        	"Can not create a property with the same id twice"
+        	"Can not create a property with the same id twice",
+        	CustomMetadataException.class
         )
         {
             @Override
@@ -350,7 +349,8 @@ public class RecordsManagementAdminServiceImplTest extends    BaseRMTestCase
     	// Failure: Try and add a property to a type that isn't customisable
     	doTestInTransaction(new FailureTest
         (
-        	"Can not add a custom property to a type that isn't registered as customisable"
+        	"Can not add a custom property to a type that isn't registered as customisable",
+            CustomMetadataException.class
         )
         {
             @Override
@@ -364,26 +364,7 @@ public class RecordsManagementAdminServiceImplTest extends    BaseRMTestCase
             			"Title", 
             			"Description");
             }
-        }); 
-    	
-    	// Failure: Add a property with the label twice (but no id specified) 
-//    	doTestInTransaction(new FailureTest
-//        (
-//        	"Can not create a property with the same label twice if no id is specified."
-//        )
-//        {
-//            @Override
-//            public void run()
-//            {
-//            	adminService.addCustomPropertyDefinition(
-//            			null, 
-//            			ASPECT_RECORD, 
-//            			"Label1", 
-//            			DataTypeDefinition.TEXT, 
-//            			"Title", 
-//            			"Description");
-//            }
-//        }); 
+        });     	
     }
     
     /**