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

- new aspect cm:contentupdated used for forum/blog to mark updated posts

Browse Source 
- aspect blg:released is used to mark a internally published post
- added missing I18N file for blog rss
- some ui enhancements, e.g. blog drafts won't show add comment box anymore

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9881 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Michael Ru
2008-07-15 17:33:33 +00:00
parent 1632956b4a
commit 8d931598ce
12 changed files with 157 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/repo/web/scripts/blog/BlogServiceTest.java
View File

@@ -327,9 +327,6 @@ public class BlogServiceTest extends BaseWebScriptTest
String name = item.getString("name");
assertEquals(false, item.getBoolean("isUpdated"));
// wait for 5 sec
Thread.sleep(5000);
item = updatePost(name, "new title", "new content", null, false, 200);
assertEquals(true, item.getBoolean("isUpdated"));
assertEquals("new title", item.getString("title"));

67
source/java/org/alfresco/repo/web/scripts/discussion/DiscussionServiceTest.java
View File

@@ -160,13 +160,13 @@ public class DiscussionServiceTest extends BaseWebScriptTest
return item;
}
private JSONObject updatePost(String name, String title, String content, boolean isDraft, int expectedStatus)
private JSONObject updatePost(String nodeRef, String title, String content, int expectedStatus)
throws Exception
{
JSONObject post = new JSONObject();
post.put("title", title);
post.put("content", content);
MockHttpServletResponse response = putRequest(URL_FORUM_POST + name, expectedStatus, post.toString(), "application/json");
MockHttpServletResponse response = putRequest(getPostUrl(nodeRef), expectedStatus, post.toString(), "application/json");
if (expectedStatus != 200)
{
@@ -219,24 +219,6 @@ public class DiscussionServiceTest extends BaseWebScriptTest
return result.getJSONObject("item");
}
private JSONObject updateComment(String nodeRef, String title, String content, int expectedStatus)
throws Exception
{
JSONObject comment = new JSONObject();
comment.put("title", title);
comment.put("content", content);
MockHttpServletResponse response = putRequest(getPostUrl(nodeRef), expectedStatus, comment.toString(), "application/json");
if (expectedStatus != 200)
{
return null;
}
//logger.debug("Comment updated: " + response.getContentAsString());
JSONObject result = new JSONObject(response.getContentAsString());
return result.getJSONObject("item");
}
// Tests
@@ -254,6 +236,30 @@ public class DiscussionServiceTest extends BaseWebScriptTest
getPost(item.getString("name"), 200);
}
public void testUpdateForumPost() throws Exception
{
String title = "test";
String content = "test";
JSONObject item = createPost(title, content, 200);
// check that the values
assertEquals(title, item.get("title"));
assertEquals(content, item.get("content"));
assertEquals(false, item.getBoolean("isUpdated"));
// fetch the post
getPost(item.getString("name"), 200);
String title2 = "test";
String content2 = "test";
item = updatePost(item.getString("nodeRef"), title2, content2, 200);
// check that the values
assertEquals(title2, item.get("title"));
assertEquals(content2, item.get("content"));
assertEquals(true, item.getBoolean("isUpdated"));
}
public void testGetAll() throws Exception
{
String url = URL_FORUM_POSTS;
@@ -308,6 +314,27 @@ public class DiscussionServiceTest extends BaseWebScriptTest
assertEquals(1, item.getInt("replyCount"));
}
public void testUpdateReply() throws Exception
{
// create a root post
JSONObject item = createPost("test", "test", 200);
String postName = item.getString("name");
String postNodeRef = item.getString("nodeRef");
// add a reply
JSONObject reply = createReply(postNodeRef, "test", "test", 200);
String replyNodeRef = reply.getString("nodeRef");
assertEquals("test", reply.getString("title"));
assertEquals("test", reply.getString("content"));
assertEquals(false, reply.getBoolean("isUpdated"));
// now update it
JSONObject reply2 = updatePost(reply.getString("nodeRef"), "test2", "test2", 200);
assertEquals("test2", reply2.getString("title"));
assertEquals("test2", reply2.getString("content"));
assertEquals(true, reply2.getBoolean("isUpdated"));
}
/*
public void testDeleteReplyPost() throws Exception
{