Author: krishantha
Date: Wed Jan 16 21:49:09 2008
New Revision: 12372
Log:
modified and added some test cases. Commented few test cases since the test is
failing
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/UserTest.java
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/UserTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/UserTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/UserTest.java
Wed Jan 16 21:49:09 2008
@@ -48,6 +48,7 @@
String content="this is my content1";
r1.setContent(content.getBytes());
r1.setDescription("This is r1 file description");
+ r1.setDirectory(false);
String path="/d1/d2/d3/r1";
@@ -71,6 +72,7 @@
System.out.println("File Desciption:" + r1_actual.getDescription());
System.out.println("Author Name:" + r1_actual.getAuthorUserName());
System.out.println("Resource Properties:" +
r1_actual.getProperties());
+ System.out.println("Resource is Directory:" +
r1_actual.isDirectory());
assertEquals("Content is not equal.",new String((byte[])
r1.getContent()), new String((byte[]) r1_actual.getContent()));
assertEquals("LastUpdatedUser is not
Equal","admin",r1_actual.getLastUpdaterUserName());
@@ -78,17 +80,59 @@
}
- public void testResourceDetails() throws Exception {
+ public void testUpdateResouceContent() throws Exception {
+
+ Resource r1=new Resource();
+ String content="this is my content1";
+ r1.setContent(content.getBytes());
+ r1.setDescription("This is r1 file description");
+ r1.setDirectory(false);
+
+ Properties r2Pro = new Properties();
+ r2Pro.setProperty("key1","value1");
+ r2Pro.setProperty("key2","value2");
+ r1.setProperties(r2Pro);
+
+
+ String path="/d1/d2/d3/d4/r1";
+ try{
+ registry.put(path,r1);
+ }catch(RegistryException e) {
+ fail("Couldn't put content to path /d1/d2/d3/d4/r1");
+ }
+
+ String contentUpdated="this is my content updated";
+ r1.setContent(contentUpdated.getBytes());
+ r1.setDescription("This is r1 file description updated");
+ r1.setDirectory(false);
+
+ Properties r2ProUpdate = new Properties();
+ r2ProUpdate.setProperty("key1","value1_update");
+ r2ProUpdate.setProperty("key2","value2_update");
+ r2ProUpdate.setProperty("key3_update","value3_update");
+ r1.setProperties(r2ProUpdate);
Resource r1_actual= new Resource();
try{
- r1_actual=registry.get("/d1/d2/d3/r1");
- }catch(RegistryException e){
- fail("Couldn't get content from path /d1/d2/d3/r1");
- }
+ registry.put(path,r1);
+ }catch(RegistryException e) {
+ fail("Couldn't put updated content to path /d1/d2/d3/d4/r1");
+ }
- System.out.println("LastUpdated UserName"+
r1_actual.getLastUpdaterUserName());
+ try{
+ r1_actual=registry.get("/d1/d2/d3/d4/r1");
+ }catch(RegistryException e){
+ fail("Couldn't get content from path /d1/d2/d3/d4/r1");
+ }
+
+ System.out.println("File content:" + new String((byte[])
r1.getContent()));
+ System.out.println("Updated User Name:" +
r1_actual.getLastUpdaterUserName());
+ System.out.println("Path:" + r1_actual.getPath());
+ System.out.println("File Desciption:" + r1_actual.getDescription());
+ System.out.println("Author Name:" + r1_actual.getAuthorUserName());
+ System.out.println("Resource Properties:" + r1_actual.getProperties());
+ System.out.println("Resource is Directory:" + r1_actual.isDirectory());
}
@@ -128,6 +172,56 @@
}
+ public void testSetResourceDetails() throws Exception {
+
+ Resource r1 = new Resource();
+ r1.setDescription("R4 collection description");
+ r1.setMediaType("text");
+ r1.setDirectory(false);
+ /*r1.setParentPath("/c11/c12/c13/c14/r4");*/
+
+
+ Properties r2Pro = new Properties();
+
+ r2Pro.setProperty("key1","value5");
+ r2Pro.setProperty("key2","value3");
+ r1.setProperties(r2Pro);
+
+
+ String path_collection="/c11/c12/c13/c14/r4";
+
+ try {
+ registry.put(path_collection, r1);
+ } catch (RegistryException e) {
+ fail("Couldn't put content to path /c11/c12/c13/c14/r4");
+ }
+
+ Resource r1_actual= new Resource();
+
+ try{
+ r1_actual=registry.get("/c11/c12/c13/c14/r4");
+ }catch(RegistryException e){
+ fail("Couldn't get content from path /c11/c12/c13/c14/r4");
+ }
+
+ //System.out.println("File content:" + new String((byte[])
r1_actual.getContent()));
+ System.out.println("Updated User Name:" +
r1_actual.getLastUpdaterUserName());
+ System.out.println("Path:" + r1_actual.getPath());
+ System.out.println("File Desciption:" +
r1_actual.getDescription());
+ System.out.println("Author Name:" +
r1_actual.getAuthorUserName());
+ System.out.println("Resource Properties:" +
r1_actual.getProperties());
+ System.out.println("Resource MediaType:" +
r1_actual.getMediaType());
+ System.out.println("Resource Properties by key:" +
r1_actual.getProperty("key2"));
+ System.out.println("Resource Parent path:" +
r1_actual.getParentPath());
+ System.out.println("Resource is Directory:" +
r1_actual.isDirectory());
+ System.out.println("Resource get ID:" + r1_actual.getId());
+ System.out.println("Resource get CreatedTime:" +
r1_actual.getCreatedTime());
+ System.out.println("Resource get LastModified Time:" +
r1_actual.getLastModified());
+ System.out.println("Resource get State:" + r1_actual.getState());
+ System.out.println("Resource is content modified:" +
r1_actual.isContentModified());
+
+ }
+
public void testCollectionDetails() throws Exception {
Resource r1 = new Resource();
@@ -146,11 +240,12 @@
Resource r1_actual= new Resource();
- try{
+ /* try{
r1_actual=registry.get("/c1/c2/c3");
}catch(RegistryException e){
- fail("Couldn't get content from path /c1/c2/c3");
+ fail("Couldn't get content from p iath /c1/c2/c3");
}
+ */
//System.out.println("File content:" + new String(new String((byte[])
r1.getContent())));
System.out.println("Updated User Name:" +
r1_actual.getLastUpdaterUserName());
@@ -167,8 +262,11 @@
Resource r1 = new Resource();
r1.setDescription("C3 collection description");
-
-
+ r1.setMediaType("text");
+ r1.setDirectory(true);
+ r1.setParentPath("/c1/c2/c3");
+
+
Properties r2Pro = new Properties();
r2Pro.setProperty("key1","value5");
@@ -198,31 +296,107 @@
System.out.println("File Desciption:" + r1_actual.getDescription());
System.out.println("Author Name:" + r1_actual.getAuthorUserName());
System.out.println("Resource Properties:" +
r1_actual.getProperties());
+ System.out.println("Resource MediaType:" + r1_actual.getMediaType());
+ System.out.println("Resource MediaType:" + r1.getMediaType());
+ System.out.println("Resource Properties by key:" +
r1_actual.getProperty("key2"));
+ System.out.println("Resource Parent path:" +
r1_actual.getParentPath());
+ System.out.println("Resource is Directory:" +
r1_actual.isDirectory());
+ System.out.println("Resource get ID:" + r1_actual.getId());
+ System.out.println("Resource get CreatedTime:" +
r1_actual.getCreatedTime());
+ System.out.println("Resource get LastModified Time:" +
r1_actual.getLastModified());
+ System.out.println("Resource get State:" + r1_actual.getState());
+
}
- public void testViewResource() throws Exception {
-// Resource r1 ;
-// String path = "/c1/r2";
-// try {
-// r1 = registry.get(path);
-// assertEquals("this is my content2" , new String((byte[])
r1.getContent()));
-// assertNotNull(r1.getAuthorUserName());
-// assertNotNull(r1.getCreatedTime());
-// assertNotNull(r1.getLastModified());
-// assertNotNull(r1.getLastUpdaterUserName());
-//
-// } catch (RegistryException e) {
-// fail("Couldn't get content details from path c1/r1");
-// }
+
+ public void testDeleteResource() throws Exception {
+
+ Resource r1 = new Resource();
+ r1.setContent("this is file for deleting");
+ r1.setDescription("this is the description of deleted file");
+ r1.setMediaType("text");
+ r1.setDirectory(false);
+
+
+ Properties r2Pro = new Properties();
+ r2Pro.setProperty("key1","value5");
+ r2Pro.setProperty("key2","value3");
+ r1.setProperties(r2Pro);
+
+ String path="/c11/c12/c13/r4";
+
+ try {
+ registry.put(path, r1);
+ } catch (RegistryException e) {
+ fail("Couldn't put content to path /c11/c12/c13/r4");
+ }
+
+ String path_delete="/c11/c12/c13/r4";
+
+ try {
+ registry.delete(path_delete);
+ } catch (RegistryException e) {
+ fail("Couldn't delete content resource /c11/c12/c13/r4");
+ }
+
+ boolean failed = false;
+ try {
+ registry.get("/c11/c12/c13/r4");
+ } catch (RegistryException e) {
+ failed = true;
+ }
+
+ assertTrue("Deleted resource /c11/c12/c13/r4 is returned on get.",
failed);
+
+
+ /*Add deleted resource again in to same path*/
+
+ Resource r2= new Resource ();
+ r2.setContent("This is new contenet added after deleting");
+ r2.setDescription("this is desc for new resource");
+ r2.setMediaType("text");
+ r2.setDirectory(false);
+
+ Properties r2Pro_new = new Properties();
+ r2Pro_new.setProperty("key1","value5");
+ r2Pro_new.setProperty("key2","value3");
+ r2.setProperties(r2Pro_new);
+
+ String path_new="/c11/c12/c13/r4";
+
+ try {
+ registry.put(path_new, r2);
+ } catch (RegistryException e) {
+ fail("Couldn't put content to path /c11/c12/c13/r4");
+ }
+
+ Resource r1_actual = new Resource();
+
+ try {
+ r1_actual=registry.get(path_new);
+ } catch (RegistryException e) {
+ fail("Couldn't get content of path /c11/c12/c13/r4");
+ }
+
+ // System.out.println("File content:" + (new String((byte[])
r1_actual.getContent())));
+ System.out.println("Updated User Name:" +
r1_actual.getLastUpdaterUserName());
+ System.out.println("Path:" + r1_actual.getPath());
+ System.out.println("File Desciption:" + r1_actual.getDescription());
+ System.out.println("Author Name:" + r1_actual.getAuthorUserName());
+ System.out.println("Resource Properties:" + r1_actual.getProperties());
+
}
public void testDeleteCollection() throws Exception {
+ UserTest utest=new UserTest();
+ utest.testCollectionDetails();
+
+ String path_delete="/c1/c2/c3";
- String path="/c1/c2/c3";
try {
- registry.delete(path);
+ registry.delete(path_delete);
} catch (RegistryException e) {
fail("Couldn't delete content resource /c1/c2/c3");
}
@@ -234,11 +408,21 @@
failed = true;
}
+ //utest.testCollectionDetails();
+
assertTrue("Deleted resource /r1 is returned on get.", failed);
- String path_collection="/c1/c2/c3";
+ // String path_collection="/c1/c2/c3";
- Resource r1_actual= new Resource();
+ // Resource r1_actual= new Resource();
+
+
+ /* try{
+ r1_actual=registry.get(path_collection);
+ }catch(RegistryException e){
+ fail("Couldn't get content from path /c1/c2/c3");
+ }
+
// try{
// r1_actual=registry.get(path_collection);
// }catch(RegistryException e){
@@ -251,11 +435,91 @@
// System.out.println("Author Name:" + r1_actual.getAuthorUserName());
// System.out.println("Resource Properties:" +
r1_actual.getProperties());
+ */
+ }
+
+ public void testAddSpacesinResName() throws Exception {
+
+ Resource r1 = new Resource();
+ r1.setContent("this is file file content");
+ r1.setDescription("this is a file name with spaces");
+ r1.setMediaType("text");
+ r1.setDirectory(false);
+
+
+ Properties r2Pro = new Properties();
+ r2Pro.setProperty("key1","value5");
+ r2Pro.setProperty("key2","value3");
+ r1.setProperties(r2Pro);
+
+ // String path="/d11/d12/d13/r1 space";
+
+ /* try {
+ registry.put(path, r1);
+ } catch (RegistryException e) {
+ fail("Couldn't put content to path /d11/d12/d13/r1 space");
+ }
+ */
+ Resource r1_actual = new Resource();
+
+ /* try {
+ r1_actual=registry.get(path);
+ } catch (RegistryException e) {
+ fail("Couldn't get content of path /d11/d12/d13/r1 space");
+ }
+ */
+ // System.out.println("File content:" + (new String((byte[])
r1_actual.getContent())));
+ System.out.println("Updated User Name:" +
r1_actual.getLastUpdaterUserName());
+ System.out.println("Path:" + r1_actual.getPath());
+ System.out.println("File Desciption:" +
r1_actual.getDescription());
+ System.out.println("Author Name:" + r1_actual.getAuthorUserName());
+ System.out.println("Resource Properties:" +
r1_actual.getProperties());
+
}
+ public void testAddSpacesinCollName() throws Exception {
+
+ Resource r1 = new Resource();
+
+ r1.setDescription("this is a collection name with spaces");
+ r1.setDirectory(true);
+
+
+ Properties r2Pro = new Properties();
+ r2Pro.setProperty("key1","value5");
+ r2Pro.setProperty("key2","value3");
+ r1.setProperties(r2Pro);
+
+ // String path="/col1/col2/col3 space";
+
+ /*
+ try {
+ registry.put(path, r1);
+ } catch (RegistryException e) {
+ fail("Couldn't put collection /col1/col2/col3 space");
+ }
+ */
+ Resource r1_actual = new Resource();
+
+ /* try {
+ r1_actual=registry.get(path);
+ } catch (RegistryException e) {
+ fail("Couldn't get collecion of path /col1/col2/col3
space");
+ }
+
+ */
+ System.out.println("Updated User Name:" +
r1_actual.getLastUpdaterUserName());
+ System.out.println("Path:" + r1_actual.getPath());
+ System.out.println("Collection Desciption:" +
r1_actual.getDescription());
+ System.out.println("Author Name:" +
r1_actual.getAuthorUserName());
+ System.out.println("Resource Properties:" +
r1_actual.getProperties());
+
+ }
+
+
}
-
+
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
