inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V4.1-BUG-FIX to HEAD

Browse Source 
43905: Fixed ALF-16166 "Breadcrumb not refreshing after Move action is used."
   43909: Merged V3.4-BUF-GIX (3.4.12) to V4.1-BUG-FIX (4.1.3)
      43908: Minor changes to TransformerDebug to make output more readable when there are exceptions.
   43912: Fix for ALF-16578. Now guesses the mimetype correctly - (actually uses the existing type).
   43915: Merged BRANCHES/DEV/BELARUS/V4.1-BUG-FIX-2012_11_12 to BRANCHES/DEV/V4.1-BUG-FIX:
      43853: ALF-15984: "Concurrent Editing" problem with Edit Online functionality with Office 2010
   43916: Fixed ALF-16906: MySQL: Add support for persisting special numeric property values
    - Double and Float special values ("NaN", "-Infinity" and "Infinity") are persisted
      in alf_node_properties in their string form.
    - Checks included to ensure that conversions to and from Double and Float are covered correctly
   43926: ALF-16909: Discussion topics are sorted in ascending order (oldest first and newest last) when selecting 'All topics'
   - Fixed unit test to expect newest first, as re-introduced into 3.4.12
   43927: ALF-12711: Fixed 'test mode' behaviour of MailActionExecuter
   43928: Merged V4.1 to V4.1-BUG-FIX
      43906: ALF-15993: Installation folder is not empty after uninstall
      - Added webquickstart log removal
      43917: ALF-16886: SubscriptionServiceActivitiesTest and SiteServiceTest failing on Oracle
      - Fix by Dmitry
      43920: ALF-16753: RU: Incorrect date format in Alfresco Explorer 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@43929 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-11-24 12:05:57 +00:00
parent cf42b48aff
commit 69e3329b2e
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
source/java/org/alfresco/repo/web/scripts/discussion/DiscussionRestApiTest.java
View File

@@ -1018,21 +1018,21 @@ public class DiscussionRestApiTest extends BaseWebScriptTest
assertEquals(2, result.getInt("total")); assertEquals(2, result.getInt("total"));
assertEquals(2, result.getInt("itemCount")); assertEquals(2, result.getInt("itemCount"));
assertEquals(2, result.getJSONArray("items").length()); assertEquals(2, result.getJSONArray("items").length());
assertEquals("SiteTitle1", result.getJSONArray("items").getJSONObject(0).getString("title")); assertEquals("SiteTitle1", result.getJSONArray("items").getJSONObject(1).getString("title"));
assertEquals("SiteTitle2", result.getJSONArray("items").getJSONObject(1).getString("title")); assertEquals("SiteTitle2", result.getJSONArray("items").getJSONObject(0).getString("title"));
assertEquals(2, result.getJSONArray("items").getJSONObject(0).getInt("replyCount")); assertEquals(2, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
assertEquals(3, result.getJSONArray("items").getJSONObject(1).getInt("replyCount")); assertEquals(3, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
result = getPosts(FORUM_NODE, null, Status.STATUS_OK); result = getPosts(FORUM_NODE, null, Status.STATUS_OK);
assertEquals(3, result.getInt("total")); assertEquals(3, result.getInt("total"));
assertEquals(3, result.getInt("itemCount")); assertEquals(3, result.getInt("itemCount"));
assertEquals(3, result.getJSONArray("items").length()); assertEquals(3, result.getJSONArray("items").length());
assertEquals("NodeTitle1", result.getJSONArray("items").getJSONObject(0).getString("title")); assertEquals("NodeTitle1", result.getJSONArray("items").getJSONObject(2).getString("title"));
assertEquals("NodeTitle2", result.getJSONArray("items").getJSONObject(1).getString("title")); assertEquals("NodeTitle2", result.getJSONArray("items").getJSONObject(1).getString("title"));
assertEquals("NodeTitle3", result.getJSONArray("items").getJSONObject(2).getString("title")); assertEquals("NodeTitle3", result.getJSONArray("items").getJSONObject(0).getString("title"));
assertEquals(1, result.getJSONArray("items").getJSONObject(0).getInt("replyCount")); assertEquals(1, result.getJSONArray("items").getJSONObject(2).getInt("replyCount"));
assertEquals(0, result.getJSONArray("items").getJSONObject(1).getInt("replyCount")); assertEquals(0, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
assertEquals(0, result.getJSONArray("items").getJSONObject(2).getInt("replyCount")); assertEquals(0, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
// Check for "mine" // Check for "mine"
@@ -1111,21 +1111,21 @@ public class DiscussionRestApiTest extends BaseWebScriptTest
assertEquals(2, result.getInt("total")); assertEquals(2, result.getInt("total"));
assertEquals(2, result.getInt("itemCount")); assertEquals(2, result.getInt("itemCount"));
assertEquals(2, result.getJSONArray("items").length()); assertEquals(2, result.getJSONArray("items").length());
assertEquals("SiteTitle1", result.getJSONArray("items").getJSONObject(0).getString("title")); assertEquals("SiteTitle1", result.getJSONArray("items").getJSONObject(1).getString("title"));
assertEquals("SiteTitle2", result.getJSONArray("items").getJSONObject(1).getString("title")); assertEquals("SiteTitle2", result.getJSONArray("items").getJSONObject(0).getString("title"));
assertEquals(2, result.getJSONArray("items").getJSONObject(0).getInt("replyCount")); assertEquals(2, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
assertEquals(3, result.getJSONArray("items").getJSONObject(1).getInt("replyCount")); assertEquals(3, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
result = getPosts(FORUM_NODE, null, Status.STATUS_OK); result = getPosts(FORUM_NODE, null, Status.STATUS_OK);
assertEquals(3, result.getInt("total")); assertEquals(3, result.getInt("total"));
assertEquals(3, result.getInt("itemCount")); assertEquals(3, result.getInt("itemCount"));
assertEquals(3, result.getJSONArray("items").length()); assertEquals(3, result.getJSONArray("items").length());
assertEquals("NodeTitle2", result.getJSONArray("items").getJSONObject(0).getString("title")); assertEquals("NodeTitle2", result.getJSONArray("items").getJSONObject(2).getString("title"));
assertEquals("NodeTitle3", result.getJSONArray("items").getJSONObject(1).getString("title")); assertEquals("NodeTitle3", result.getJSONArray("items").getJSONObject(1).getString("title"));
assertEquals("NodeTitle1", result.getJSONArray("items").getJSONObject(2).getString("title")); assertEquals("NodeTitle1", result.getJSONArray("items").getJSONObject(0).getString("title"));
assertEquals(0, result.getJSONArray("items").getJSONObject(0).getInt("replyCount")); assertEquals(0, result.getJSONArray("items").getJSONObject(2).getInt("replyCount"));
assertEquals(0, result.getJSONArray("items").getJSONObject(1).getInt("replyCount")); assertEquals(0, result.getJSONArray("items").getJSONObject(1).getInt("replyCount"));
assertEquals(1, result.getJSONArray("items").getJSONObject(2).getInt("replyCount")); assertEquals(1, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
// Re-check recent, old ones vanish // Re-check recent, old ones vanish
@@ -1194,15 +1194,15 @@ public class DiscussionRestApiTest extends BaseWebScriptTest
assertEquals(2, result.getInt("total")); assertEquals(2, result.getInt("total"));
assertEquals(1, result.getInt("itemCount")); assertEquals(1, result.getInt("itemCount"));
assertEquals(1, result.getJSONArray("items").length()); assertEquals(1, result.getJSONArray("items").length());
assertEquals("SiteTitle1", result.getJSONArray("items").getJSONObject(0).getString("title")); assertEquals("SiteTitle2", result.getJSONArray("items").getJSONObject(0).getString("title"));
assertEquals(2, result.getJSONArray("items").getJSONObject(0).getInt("replyCount")); assertEquals(3, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
result = getPosts(FORUM_NODE, "limit", Status.STATUS_OK); result = getPosts(FORUM_NODE, "limit", Status.STATUS_OK);
assertEquals(3, result.getInt("total")); assertEquals(3, result.getInt("total"));
assertEquals(1, result.getInt("itemCount")); assertEquals(1, result.getInt("itemCount"));
assertEquals(1, result.getJSONArray("items").length()); assertEquals(1, result.getJSONArray("items").length());
assertEquals("NodeTitle2", result.getJSONArray("items").getJSONObject(0).getString("title")); assertEquals("NodeTitle1", result.getJSONArray("items").getJSONObject(0).getString("title"));
assertEquals(0, result.getJSONArray("items").getJSONObject(0).getInt("replyCount")); assertEquals(1, result.getJSONArray("items").getJSONObject(0).getInt("replyCount"));
} }
} }