[Registry-dev] svn commit r14705 -
trunk/registry/modules/core/src/test/java/org/wso2/registry/app
svn at wso2.org
svn at wso2.org
Tue Mar 11 04:38:57 PDT 2008
Author: krishantha
Date: Tue Mar 11 04:38:53 2008
New Revision: 14705
Log:
added testcases for multiple properties testing and replaced system.out statements with asserts.
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 Tue Mar 11 04:38:53 2008
@@ -18,13 +18,16 @@
*/
package org.wso2.registry.app;
+import org.wso2.registry.Collection;
import org.wso2.registry.RegistryException;
import org.wso2.registry.Resource;
-import org.wso2.registry.Collection;
-import java.util.Properties;
+import java.util.ArrayList;
+import java.util.List;
+
public class UserTest extends AbstractAPPTest {
+
public void testHierachicalResource() throws Exception {
Resource r1 = registry.newResource();
String content = "this is my content1";
@@ -32,7 +35,6 @@
r1.setDescription("This is r1 file description");
String path = "/d1/d2/d3/r1";
-
try {
registry.put(path, r1);
} catch (RegistryException e) {
@@ -40,24 +42,19 @@
}
Resource r1_actual = registry.newResource();
-
try {
r1_actual = registry.get("/d1/d2/d3/r1");
} catch (RegistryException e) {
fail("Couldn't get content from path /d1/d2/d3/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.getResourcePath());
-// //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());
+ assertEquals("Can not get Resource path", "/d1/d2/d3/r1", r1_actual.getPath());
+ assertEquals("Can not get Resource parent path", "/d1/d2/d3", r1_actual.getParentPath());
+ assertEquals("Resource description is not equal", r1.getDescription(), r1_actual.getDescription());
+ assertEquals("Resource description is not equal", "admin", r1_actual.getAuthorUserName());
}
@@ -68,11 +65,8 @@
String content = "this is my content1";
r1.setContent(content.getBytes());
r1.setDescription("This is r1 file description");
-
- Properties r2Pro = new Properties();
- r2Pro.setProperty("key1", "value1");
- r2Pro.setProperty("key2", "value2");
- r1.setProperties(r2Pro);
+ r1.setProperty("key1", "value1");
+ r1.setProperty("key2", "value2");
String path = "/d1/d2/d3/d4/r1";
try {
@@ -81,28 +75,39 @@
fail("Couldn't put content to path /d1/d2/d3/d4/r1");
}
+ Resource r1_actual = registry.get("/d1/d2/d3/d4/r1");
+
+ 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());
+ assertEquals("Can not get Resource path", "/d1/d2/d3/d4/r1", r1_actual.getPath());
+ assertEquals("Can not get Resource parent path", "/d1/d2/d3/d4", r1_actual.getParentPath());
+ assertEquals("Resource description is not equal", r1.getDescription(), r1_actual.getDescription());
+ assertEquals("Author is not equal", "admin", r1_actual.getAuthorUserName());
+ assertEquals("Resource properties are equal", r1.getProperty("key1"), r1_actual.getProperty("key1"));
+ assertEquals("Resource properties are equal", r1.getProperty("key2"), r1_actual.getProperty("key2"));
+ assertEquals("Resource properties are equal", r1.getProperty("key3_update"), r1_actual.getProperty("key3_update"));
+
String contentUpdated = "this is my content updated";
r1.setContent(contentUpdated.getBytes());
r1.setDescription("This is r1 file description updated");
-
- Properties r2ProUpdate = new Properties();
- r2ProUpdate.setProperty("key1", "value1_update");
- r2ProUpdate.setProperty("key2", "value2_update");
- r2ProUpdate.setProperty("key3_update", "value3_update");
- r1.setProperties(r2ProUpdate);
+ r1.setProperty("key1", "value1_update");
+ r1.setProperty("key2", "value2_update");
+ r1.setProperty("key3_update", "value3_update");
registry.put(path, r1);
+ Resource r2_actual = registry.get("/d1/d2/d3/d4/r1");
- Resource r1_actual = registry.get("/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.getResourcePath());
-// //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[])r2_actual.getContent()));
+ assertEquals("LastUpdatedUser is not Equal", "admin", r2_actual.getLastUpdaterUserName());
+ assertEquals("Can not get Resource path", "/d1/d2/d3/d4/r1", r2_actual.getPath());
+ assertEquals("Can not get Resource parent path", "/d1/d2/d3/d4", r2_actual.getParentPath());
+ assertEquals("Resource description is not equal", r1.getDescription(), r2_actual.getDescription());
+ assertEquals("Author is not equal", "admin", r2_actual.getAuthorUserName());
+ assertEquals("Resource properties are equal", r1.getProperty("key1"), r2_actual.getProperty("key1"));
+ assertEquals("Resource properties are equal", r1.getProperty("key2"), r2_actual.getProperty("key2"));
+ assertEquals("Resource properties are equal", r1.getProperty("key3_update"), r2_actual.getProperty("key3_update"));
}
public void testAddAnotherResource() throws Exception {
@@ -112,12 +117,8 @@
r1.setDescription("r2 file description");
String path = "/d1/d2/r2";
- Properties r2Pro = new Properties();
-
- r2Pro.setProperty("key1", "value1");
- r2Pro.setProperty("key2", "value2");
- r1.setProperties(r2Pro);
-
+ r1.setProperty("key1", "value1");
+ r1.setProperty("key2", "value2");
try {
registry.put(path, r1);
} catch (RegistryException e) {
@@ -125,39 +126,33 @@
}
Resource r1_actual = registry.newResource();
-
try {
r1_actual = registry.get("/d1/d2/r2");
} catch (RegistryException e) {
fail("Couldn't get content from path /d1/d2/r2");
}
-// //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.getResourcePath());
-// //System.out.println("File Desciption:" + r1_actual.getDescription());
-// //System.out.println("Author Name:" + r1_actual.getAuthorUserName());
-// //System.out.println("Resource Properties:" + r1_actual.getProperties());
-//
+ 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());
+ assertEquals("Can not get Resource path", "/d1/d2/r2", r1_actual.getPath());
+ assertEquals("Can not get Resource parent path", "/d1/d2", r1_actual.getParentPath());
+ assertEquals("Resource description is not equal", r1.getDescription(), r1_actual.getDescription());
+ assertEquals("Author is not equal", "admin", r1_actual.getAuthorUserName());
+ assertEquals("Resource properties are equal", r1.getProperty("key1"), r1_actual.getProperty("key1"));
+ assertEquals("Resource properties are equal", r1.getProperty("key2"), r1_actual.getProperty("key2"));
+
}
public void testSetResourceDetails() throws Exception {
-
Resource r1 = registry.newResource();
r1.setDescription("R4 collection description");
- r1.setMediaType("jpg/xml");
- /*r1.setParentPath("/c11/c12/c13/c14/r4");*/
-
-
- Properties r2Pro = new Properties();
-
- r2Pro.setProperty("key1", "value5");
- r2Pro.setProperty("key2", "value3");
- r1.setProperties(r2Pro);
+ r1.setMediaType("jpg/image");
+ r1.setProperty("key1", "value5");
+ r1.setProperty("key2", "value3");
String path_collection = "/c11/c12/c13/c14/r4";
-
try {
registry.put(path_collection, r1);
} catch (RegistryException e) {
@@ -165,28 +160,20 @@
}
Resource r1_actual = registry.newResource();
-
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 get:" + 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());
+ assertEquals("LastUpdatedUser is not Equal", "admin", r1_actual.getLastUpdaterUserName());
+ assertEquals("Can not get Resource path", path_collection, r1_actual.getPath());
+ assertEquals("Can not get Resource parent path", "/c11/c12/c13/c14", r1_actual.getParentPath());
+ assertEquals("Resource description is not equal", r1.getDescription(), r1_actual.getDescription());
+ assertEquals("Authour is not equal", "admin", r1_actual.getAuthorUserName());
+ assertEquals("Resource properties are equal", r1.getProperty("key1"), r1_actual.getProperty("key1"));
+ assertEquals("Resource properties are equal", r1.getProperty("key2"), r1_actual.getProperty("key2"));
+ assertEquals("Media Types is not equal", r1.getMediaType(),r1_actual.getMediaType());
}
@@ -200,29 +187,17 @@
try {
registry.put(path, r1);
} catch (RegistryException e) {
- fail("Couldn't put content to path /c1/c2/c3/c4/r3");
+ fail("Couldn't put Collection to path /c1/c2/c3/c4/r3");
}
Resource r1_actual = registry.newResource();
-
- /*
try{
r1_actual=registry.get("/c1/c2/c3");
}catch(RegistryException e){
fail("Couldn't get content from path /c1/c2/c3");
}
- */
- ////System.out.println("File content:" + new String(new String((byte[]) r1.getContent())));
-// //System.out.println("Updated User Name:" + r1_actual.getLastUpdaterUserName());
-// //System.out.println("Path:" + r1_actual.getResourcePath());
-// //System.out.println("File Desciption:" + r1_actual.getDescription());
-// //System.out.println("Author Name:" + r1_actual.getAuthorUserName());
-// //System.out.println("Resource Properties:" + r1_actual.getProperties());
-
- // Now delete the collection
String path_delete = "/c1/c2/c3";
-
try {
registry.delete(path_delete);
} catch (RegistryException e) {
@@ -231,7 +206,7 @@
boolean failed = false;
try {
- registry.get(path_delete);
+ registry.get(path);
} catch (RegistryException e) {
failed = true;
}
@@ -243,13 +218,9 @@
public void testSetCollectionDetails() throws Exception {
Collection r1 = registry.newCollection();
r1.setDescription("C3 collection description");
- r1.setMediaType("text");
-
- Properties r2Pro = new Properties();
-
- r2Pro.setProperty("key1", "value5");
- r2Pro.setProperty("key2", "value3");
- r1.setProperties(r2Pro);
+ r1.setMediaType("jpg");
+ r1.setProperty("key1", "value5");
+ r1.setProperty("key2", "value3");
String path_collection = "/c1/c2/c3";
@@ -257,23 +228,17 @@
Resource r1_actual = registry.get("/c1/c2/c3");
- ////System.out.println("File content:" + new String(new String((byte[]) r1.getContent())));
-// //System.out.println("Updated User Name:" + r1_actual.getLastUpdaterUserName());
-// //System.out.println("Path:" + r1_actual.getResourcePath());
-// //System.out.println("File Desciption:" + r1_actual.getDescription());
-// //System.out.println("Author Name:" + r1_actual.getAuthorUserName());
-// //System.out.println("Resource Properties:" + r1_actual.getProperties());
-//
assertEquals(r1_actual.getMediaType(), r1.getMediaType());
assertEquals(r1_actual.getParentPath(), r1.getParentPath());
-// //System.out.println("Resource Properties by key:" + r1_actual.getProperty("key2"));
assertTrue(r1_actual instanceof Collection);
-// //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());
-
-
+ assertEquals("LastUpdatedUser is not Equal", "admin", r1_actual.getLastUpdaterUserName());
+ assertEquals("Can not get Resource path", path_collection, r1_actual.getPath());
+ assertEquals("Can not get Resource parent path", "/c1/c2", r1_actual.getParentPath());
+ assertEquals("Resource description is not equal", r1.getDescription(), r1_actual.getDescription());
+ assertEquals("Authour is not equal", "admin", r1_actual.getAuthorUserName());
+ assertEquals("Resource properties are equal", r1.getProperty("key1"), r1_actual.getProperty("key1"));
+ assertEquals("Resource properties are equal", r1.getProperty("key2"), r1_actual.getProperty("key2"));
+ assertEquals("Media Types is not equal", r1.getMediaType(),r1_actual.getMediaType());
}
@@ -284,10 +249,8 @@
r1.setDescription("this is the description of deleted file");
r1.setMediaType("text");
- Properties r2Pro = new Properties();
- r2Pro.setProperty("key1", "value5");
- r2Pro.setProperty("key2", "value3");
- r1.setProperties(r2Pro);
+ r1.setProperty("key1", "value1");
+ r1.setProperty("key2", "value2");
String path = "/c11/c12/c13/r4";
@@ -313,13 +276,10 @@
r2.setDescription("this is desc for new resource");
r2.setMediaType("text");
- Properties r2Pro_new = new Properties();
- r2Pro_new.setProperty("key1", "value5");
- r2Pro_new.setProperty("key2", "value3");
- r2.setProperties(r2Pro_new);
+ r2.setProperty("key1", "value5");
+ r2.setProperty("key2", "value3");
String path_new = "/c11/c12/c13/r4";
-
try {
registry.put(path_new, r2);
} catch (RegistryException e) {
@@ -327,114 +287,159 @@
}
Resource r1_actual = registry.newResource();
-
try {
r1_actual = registry.get(path_new);
} catch (RegistryException e) {
fail("Couldn't get content of path /c11/c12/c13/r4");
}
+ assertEquals("LastUpdatedUser is not Equal", "admin", r1_actual.getLastUpdaterUserName());
+ assertEquals("Can not get Resource path", path_new, r1_actual.getPath());
+ assertEquals("Can not get Resource parent path", "/c11/c12/c13", r1_actual.getParentPath());
+ assertEquals("Resource description is not equal", r2.getDescription(), r1_actual.getDescription());
+ assertEquals("Authour is not equal", "admin", r1_actual.getAuthorUserName());
+ assertEquals("Resource properties are equal", r2.getProperty("key1"), r1_actual.getProperty("key1"));
+ assertEquals("Resource properties are equal", r2.getProperty("key2"), r1_actual.getProperty("key2"));
+ assertEquals("Media Types is not equal", r2.getMediaType(),r1_actual.getMediaType());
+ }
+
+ public void testDeleteCollection() throws Exception {
+
+ Resource r1 = registry.newCollection();
+ r1.setDescription("this is a collection for deleting");
+ r1.setMediaType("text");
+ r1.setProperty("key1", "value1");
+ r1.setProperty("key2", "value2");
+ String path = "/c20/c21/c22";
+
+ registry.put(path, r1);
+ String path_delete = "/c20/c21/c22";
+
+ registry.delete(path_delete);
+
+ boolean failed = false;
+ try {
+ registry.get("/c20/c21/c22");
+ } catch (RegistryException e) {
+ failed = true;
+ }
- // //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.getResourcePath());
-// //System.out.println("File Desciption:" + r1_actual.getDescription());
-// //System.out.println("Author Name:" + r1_actual.getAuthorUserName());
-// //System.out.println("Resource Properties:" + r1_actual.getProperties());
+ assertTrue("Deleted collection /c20/c21/c22 is returned on get.", failed);
+
+ /*Add deleted resource again in to same path*/
+ Resource r2 = registry.newCollection();
+ r2.setDescription("this is desc for new collection");
+ r2.setMediaType("text");
+ r2.setProperty("key1", "value5");
+ r2.setProperty("key2", "value3");
+ String path_new = "/c20/c21/c22";
+
+ try {
+ registry.put(path_new, r2);
+ } catch (RegistryException e) {
+ fail("Couldn't put content to path /c20/c21/c22");
+ }
+ Resource r1_actual = registry.newCollection();
+ try {
+ r1_actual = registry.get(path_new);
+ } catch (RegistryException e) {
+ fail("Couldn't get content of path /c20/c21/c22");
+ }
+ assertEquals("LastUpdatedUser is not Equal", "admin", r1_actual.getLastUpdaterUserName());
+ assertEquals("Can not get Resource path", path_new, r1_actual.getPath());
+ assertEquals("Can not get Resource parent path", "/c20/c21", r1_actual.getParentPath());
+ assertEquals("Resource description is not equal", r2.getDescription(), r1_actual.getDescription());
+ assertEquals("Authour is not equal", "admin", r1_actual.getAuthorUserName());
+ assertEquals("Resource properties are equal", r2.getProperty("key1"), r1_actual.getProperty("key1"));
+ assertEquals("Resource properties are equal", r2.getProperty("key2"), r1_actual.getProperty("key2"));
+ assertEquals("Media Types is not equal", r2.getMediaType(),r1_actual.getMediaType());
}
+
public void testAddSpacesinResName() throws Exception {
Resource r1 = registry.newResource();
r1.setContent("this is file file content");
r1.setDescription("this is a file name with spaces");
r1.setMediaType("text");
+ r1.setProperty("key1", "value5");
+ r1.setProperty("key2", "value3");
+
+ 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");
+ }
- 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 = registry.newResource();
+ try {
+ r1_actual=registry.get(path);
+ } catch (RegistryException e) {
+ fail("Couldn't get content of path /d11/d12/d13/r1 space");
+ }
- /* 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.getResourcePath());
-// //System.out.println("File Desciption:" + r1_actual.getDescription());
-// //System.out.println("Author Name:" + r1_actual.getAuthorUserName());
-// //System.out.println("Resource Properties:" + r1_actual.getProperties());
+ assertEquals("LastUpdatedUser is not Equal", "admin", r1_actual.getLastUpdaterUserName());
+ assertEquals("Can not get Resource path", path, r1_actual.getPath());
+ assertEquals("Can not get Resource parent path", "/d11/d12/d13", r1_actual.getParentPath());
+ assertEquals("Resource description is not equal", r1.getDescription(), r1_actual.getDescription());
+ assertEquals("Authour is not equal", "admin", r1_actual.getAuthorUserName());
+ assertEquals("Resource properties are equal", r1.getProperty("key1"), r1_actual.getProperty("key1"));
+ assertEquals("Resource properties are equal", r1.getProperty("key2"), r1_actual.getProperty("key2"));
+ assertEquals("Media Types is not equal", r1.getMediaType(),r1_actual.getMediaType());
}
public void testAddSpacesinCollName() throws Exception {
Collection c1 = registry.newCollection();
-
c1.setDescription("this is a collection name with spaces");
+ c1.setProperty("key1", "value5");
+ c1.setProperty("key2", "value3");
+ String path="/col1/col2/col3 space";
- Properties r2Pro = new Properties();
- r2Pro.setProperty("key1", "value5");
- r2Pro.setProperty("key2", "value3");
- c1.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");
- }
- */
+ try {
+ registry.put(path, c1);
+ } catch (RegistryException e) {
+ fail("Couldn't put collection /col1/col2/col3 space");
+ }
Resource r1_actual = registry.newResource();
-
- /* 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.getResourcePath());
-// //System.out.println("Collection Desciption:" + r1_actual.getDescription());
-// //System.out.println("Author Name:" + r1_actual.getAuthorUserName());
-// //System.out.println("Resource Properties:" + r1_actual.getProperties());
+ try {
+ r1_actual=registry.get(path);
+ } catch (RegistryException e) {
+ fail("Couldn't get collecion of path /col1/col2/col3 space");
+ }
+ assertEquals("LastUpdatedUser is not Equal", "admin", r1_actual.getLastUpdaterUserName());
+ assertEquals("Can not get Resource path", path, r1_actual.getPath());
+ assertEquals("Can not get Resource parent path", "/col1/col2", r1_actual.getParentPath());
+ assertEquals("Resource description is not equal", c1.getDescription(), r1_actual.getDescription());
+ assertEquals("Authour is not equal", "admin", r1_actual.getAuthorUserName());
+ assertEquals("Resource properties are equal", c1.getProperty("key1"), r1_actual.getProperty("key1"));
+ assertEquals("Resource properties are equal", c1.getProperty("key2"), r1_actual.getProperty("key2"));
}
- /*
- public void testAddResourceFromURL() throws Exception{
+ public void testAddResourceFromURL() throws Exception{
- String path="/d25/d21/d23/r1";
- String url="http://131.107.72.15/SoapWsdl_BaseDataTypes_XmlFormatter_Service_Indigo/BaseDataTypesDocLitW.svc?wsdl";
+ String path="/d25/d21/d23/d24/r1";
+ String url="https://wso2.org/repos/wso2/trunk/registry/modules/core/src/test/java/org/wso2/registry/app/UserTest.java";
- try{
- registry.importResource(path,url,"wsdl");
+ Resource r1 = registry.newResource();
+ r1.setDescription("this is a file imported from url");
+ r1.setMediaType("java");
+ r1.setProperty("key1", "value5");
+ r1.setProperty("key2", "value3");
- }catch(RegistryException e) {
+ try{
+ registry.importResource(path,url,r1);
+ }catch(RegistryException e) {
fail("Couldn't import content to path:"+ path);
- }
-
- Resource r1_actual= new Resource();
+ }
- try{
+ Resource r1_actual= registry.newResource();
+ try{
r1_actual=registry.get(path);
}catch(RegistryException e){
fail("Couldn't get content from path" + path);
@@ -446,30 +451,16 @@
}
assertTrue("Imported file is empty",content);
-
-<<<<<<< .mine
- //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.getResourcePath());
- //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());
-=======
- //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 is Directory:" + r1_actual.isDirectory());
->>>>>>> .r12721
-
assertEquals("LastUpdatedUser is not Equal","admin",r1_actual.getLastUpdaterUserName());
-
+ assertEquals("Can not get Resource path", path, r1_actual.getPath());
+ assertEquals("Can not get Resource parent path", "/d25/d21/d23/d24", r1_actual.getParentPath());
+ //assertEquals("Resource description is not equal", r1.getDescription(), r1_actual.getDescription());
+ assertEquals("Authour is not equal", "admin", r1_actual.getAuthorUserName());
+ //assertEquals("Resource properties are equal", r1.getProperty("key1"), r1_actual.getProperty("key1"));
+ //assertEquals("Resource properties are equal", r1.getProperty("key2"), r1_actual.getProperty("key2"));
}
- */
+
public void testRenameResource() throws Exception {
@@ -477,8 +468,8 @@
String content = "this is my content";
r1.setContent(content.getBytes());
r1.setDescription("This is r1 file description");
-
String path = "/d30/d31/r1";
+
try {
registry.put(path, r1);
} catch (RegistryException e) {
@@ -505,7 +496,20 @@
} catch (RegistryException e) {
fail("Can not rename the path from" + path + "to" + new_path);
}
- //System.out.println("This is the returned value" + new_value);
+
+ Resource r2_actual = registry.newResource();
+ try {
+ r2_actual = registry.get(new_path);
+ } catch (RegistryException e) {
+ fail("Couldn't get content from path" + new_path);
+ }
+ assertEquals("LastUpdatedUser is not Equal", "admin", r2_actual.getLastUpdaterUserName());
+ assertEquals("Can not get Resource path", new_path, r2_actual.getPath());
+ assertEquals("Can not get Resource parent path", "/d33/d34", r2_actual.getParentPath());
+ assertEquals("Resource description is not equal", r1.getDescription(), r2_actual.getDescription());
+ assertEquals("Authour is not equal", "admin", r2_actual.getAuthorUserName());
+ assertEquals("Resource properties are equal", r1.getProperty("key1"), r2_actual.getProperty("key1"));
+ assertEquals("Resource properties are equal", r1.getProperty("key2"), r2_actual.getProperty("key2"));
}
public void testDeleteandUpdateResource() throws Exception {
@@ -514,8 +518,8 @@
String content = "this is my content";
r1.setContent(content.getBytes());
r1.setDescription("This is r1 file description");
-
String path = "/d40/d43/r1";
+
try {
registry.put(path, r1);
} catch (RegistryException e) {
@@ -566,4 +570,99 @@
assertEquals("Content is not equal.", new String((byte[])r2.getContent()),
new String((byte[])r1_actual2.getContent()));
}
+
+ public void testResourcemultipleProperties() throws Exception{
+
+ try{
+ String path= "/m11/m12/r1";
+ Resource r1 = registry.newResource();
+ String content = "this is my content";
+ r1.setContent(content.getBytes());
+ r1.setDescription("This is r1 file description");
+
+ r1.addProperty("key1","value1");
+ r1.addProperty("key1","value2");
+ r1.addProperty("key1","value3");
+ r1.addProperty("key2","value1");
+ r1.addProperty("key2","value2");
+
+ registry.put(path,r1);
+
+ Resource r1_actual2 = registry.newResource();
+ r1_actual2 = registry.get(path);
+
+ assertEquals("Content is not equal.", new String((byte[])r1.getContent()),
+ new String((byte[])r1_actual2.getContent()));
+
+ List propertyValues = new ArrayList();
+ propertyValues = r1_actual2.getPropertyValues("key1");
+ Object[] valueName = propertyValues.toArray();
+
+ List propertyValuesKey2 = new ArrayList();
+ propertyValuesKey2 = r1_actual2.getPropertyValues("key2");
+ Object[] valueNameKey2 = propertyValuesKey2.toArray();
+
+ assertTrue("value1 is not associated with key1",containsString(valueName,"value1"));
+ assertTrue("value2 is not associated with key1",containsString(valueName,"value2"));
+ assertTrue("value3 is not associated with key1",containsString(valueName,"value3"));
+ assertTrue("value1 is not associated with key2",containsString(valueNameKey2,"value1"));
+ assertTrue("value2 is not associated with key2",containsString(valueNameKey2,"value2"));
+
+ }catch (RegistryException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ public void testCollectionmultipleProperties() throws Exception{
+
+ try{
+ String path= "/m15/m16/m17";
+ Resource r1 = registry.newCollection();
+
+ r1.setDescription("This m17 description");
+ r1.addProperty("key1","value1");
+ r1.addProperty("key1","value2");
+ r1.addProperty("key1","value3");
+ r1.addProperty("key2","value1");
+ r1.addProperty("key2","value2");
+
+ registry.put(path,r1);
+
+ Resource r1_actual2 = registry.newCollection();
+ r1_actual2 = registry.get(path);
+
+ List propertyValues = new ArrayList();
+ propertyValues = r1_actual2.getPropertyValues("key1");
+ Object[] valueName = propertyValues.toArray();
+
+ List propertyValuesKey2 = new ArrayList();
+ propertyValuesKey2 = r1_actual2.getPropertyValues("key2");
+ Object[] valueNameKey2 = propertyValuesKey2.toArray();
+
+ assertTrue("value1 is not associated with key1",containsString(valueName,"value1"));
+ assertTrue("value2 is not associated with key1",containsString(valueName,"value2"));
+ assertTrue("value3 is not associated with key1",containsString(valueName,"value3"));
+ assertTrue("value1 is not associated with key2",containsString(valueNameKey2,"value1"));
+ assertTrue("value2 is not associated with key2",containsString(valueNameKey2,"value2"));
+
+ }catch (RegistryException e) {
+ e.printStackTrace();
+ }
+
+ }
+
+ private boolean containsString(Object[] array, String value) {
+
+ boolean found = false;
+ for (Object anArray : array) {
+ String s = anArray.toString();
+ if (s.startsWith(value)) {
+ found = true;
+ break;
+ }
+ }
+
+ return found;
+ }
}
More information about the Registry-dev
mailing list