From 3ad973621fd8f0e14361ab01edb56c26318b843b Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Mon, 4 Aug 2008 12:06:19 +0000 Subject: [PATCH] Change file modified date on returned content from web script of type 'ContentStream', fix for SLNG- 894, change relating to SLNG-989, assertNotNull added to JS unit test API git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@10223 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../org/alfresco/repo/jscript/ScriptNode.java | 11 ++++++++++- .../alfresco/repo/jscript/ScriptTestUtils.java | 17 +++++++++++++++++ .../repo/tagging/script/test_taggingService.js | 1 + 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/source/java/org/alfresco/repo/jscript/ScriptNode.java b/source/java/org/alfresco/repo/jscript/ScriptNode.java index 967f6e542e..d820ffad56 100644 --- a/source/java/org/alfresco/repo/jscript/ScriptNode.java +++ b/source/java/org/alfresco/repo/jscript/ScriptNode.java @@ -2165,8 +2165,17 @@ public class ScriptNode implements Serializable, Scopeable */ public String[] getTags() { + String[] result = null; List tags = this.services.getTaggingService().getTags(this.nodeRef); - return (String[])tags.toArray(new String[tags.size()]); + if (tags.isEmpty() == true) + { + result = new String[0]; + } + else + { + result = (String[])tags.toArray(new String[tags.size()]); + } + return result; } /** diff --git a/source/java/org/alfresco/repo/jscript/ScriptTestUtils.java b/source/java/org/alfresco/repo/jscript/ScriptTestUtils.java index 606030523a..ff0b3f03c5 100644 --- a/source/java/org/alfresco/repo/jscript/ScriptTestUtils.java +++ b/source/java/org/alfresco/repo/jscript/ScriptTestUtils.java @@ -49,6 +49,23 @@ public class ScriptTestUtils extends BaseScopableProcessorExtension } } + public void assertNotEquals(Object expected, Object value) + { + assertNotEquals(expected, value, null); + } + + public void assertNotEquals(Object expected, Object value, String message) + { + if (expected.equals(value) == true) + { + if (message == null) + { + message = "Expected value '" + expected + "' should not match recieved value '" + value + "'"; + } + throw new AlfrescoRuntimeException(message); + } + } + public void assertNotNull(Object value) { assertNotNull(value, null); diff --git a/source/java/org/alfresco/repo/tagging/script/test_taggingService.js b/source/java/org/alfresco/repo/tagging/script/test_taggingService.js index 1e8dc44c7a..f9c4bef5e7 100644 --- a/source/java/org/alfresco/repo/tagging/script/test_taggingService.js +++ b/source/java/org/alfresco/repo/tagging/script/test_taggingService.js @@ -14,6 +14,7 @@ function testAddRemoveTag() { var tags = document.tags; test.assertNotNull(tags); + test.assertNotEquals(undefined, tags); test.assertEquals(0, tags.length); document.properties.title = "A change is as good as a rest!";