Author: deepal
Date: Mon Jan 21 01:18:03 2008
New Revision: 12573
Log:
fixing the build
(but there is only one test case is failing , I am working on it)
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryServer.java
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/HSQLDBInitializer.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/APPBasedTagTest.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/UserTest.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/VersionTest.java
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryServer.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryServer.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/app/RegistryServer.java
Mon Jan 21 01:18:03 2008
@@ -15,20 +15,14 @@
*/
package org.wso2.registry.app;
-import org.wso2.registry.Registry;
-import org.wso2.registry.RegistryConstants;
-import org.wso2.registry.jdbc.realm.RegistryRealm;
-import org.wso2.registry.jdbc.realm.InMemoryRegistryRealm;
-import org.wso2.registry.jdbc.InMemoryJDBCRegistry;
-import org.wso2.registry.jdbc.JDBCRegistry;
-import org.wso2.registry.servlet.RegistryServlet;
+import org.apache.abdera.protocol.server.ServiceContext;
import org.apache.abdera.protocol.server.impl.AbstractSingletonProviderManager;
import org.apache.abdera.protocol.server.impl.DefaultServiceContext;
import org.apache.abdera.protocol.server.servlet.AbderaServlet;
-import org.apache.abdera.protocol.server.ServiceContext;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.ServletHolder;
+import org.wso2.registry.servlet.RegistryServlet;
import javax.servlet.ServletException;
@@ -40,7 +34,7 @@
DefaultServiceContext abderaServiceContext = new
RegistryAPPServiceContext();
int port = 8081;
String baseURL = "/wso2registry";
-// Registry registry;
+ // Registry registry;
Server server;
public RegistryServer() {
@@ -61,14 +55,6 @@
}
public void start() throws Exception {
-// RegistryRealm realm = new InMemoryRegistryRealm();
-// JDBCRegistry jdbcRegistry = new InMemoryJDBCRegistry(realm);
- JDBCRegistry jdbcRegistry ;
-// System.getProperties().put(RegistryConstants.REGISTRY, jdbcRegistry);
-// System.getProperties().put(RegistryConstants.REGISTRY_REALM, realm);
-
-// registry = null;
-
RegistryAPPTargetResolver resolver = new RegistryAPPTargetResolver();
abderaServiceContext.setTargetResolver(resolver);
AbstractSingletonProviderManager pm = new
RegistryAtomProviderManager();
@@ -77,11 +63,10 @@
server = new Server(port);
Context root = new Context(server, baseURL, Context.SESSIONS);
root.addServlet(new ServletHolder(new RegistryServlet() {
- public void init() throws ServletException {
- super.init();
- }
+// public void init() throws ServletException {
+// super.init();
+// }
}), "/resources/*");
-// registry = (Registry)
System.getProperties().get(RegistryConstants.REGISTRY);
root.addServlet(new ServletHolder(new AbderaServlet() {
@Override
@@ -94,9 +79,9 @@
return abderaServiceContext;
}
- public void init() throws ServletException {
- super.init();
- }
+// public void init() throws ServletException {
+// super.init();
+// }
}), "/atom/*");
server.start();
}
Modified:
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/HSQLDBInitializer.java
==============================================================================
---
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/HSQLDBInitializer.java
(original)
+++
trunk/registry/modules/core/src/main/java/org/wso2/registry/secure/HSQLDBInitializer.java
Mon Jan 21 01:18:03 2008
@@ -20,7 +20,7 @@
import org.apache.commons.logging.LogFactory;
import org.wso2.registry.RegistryException;
import org.wso2.usermanager.UserManagerException;
-import org.wso2.usermanager.readwrite.util.DefaultDatabaseUtil;
+import org.wso2.usermanager.readwrite.DefaultDatabaseUtil;
import javax.sql.DataSource;
import java.sql.Connection;
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/APPBasedTagTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/APPBasedTagTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/APPBasedTagTest.java
Mon Jan 21 01:18:03 2008
@@ -16,11 +16,7 @@
package org.wso2.registry.app;
-import org.wso2.registry.RegistryException;
-import org.wso2.registry.Resource;
-import org.wso2.registry.Tag;
import org.wso2.registry.jdbc.TagsTest;
-import org.wso2.registry.secure.SecureRegistry;
import java.net.URL;
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
Mon Jan 21 01:18:03 2008
@@ -29,7 +29,7 @@
public class UserTest extends TestCase {
RegistryServer server = new RegistryServer();
- private static Registry registry = null;
+ private static Registry registry = null;
public void setUp() {
try {
@@ -42,97 +42,97 @@
}
}
- public void testHierachicalResource() throws Exception{
+ public void testHierachicalResource() 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);
-
- String path="/d1/d2/d3/r1";
-
- try{
- registry.put(path,r1);
- }catch(RegistryException e) {
- fail("Couldn't put content to path /d1/d2/d3/r1");
- }
-
- 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");
- }
-
- 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());
+ Resource r1 = new Resource();
+ String content = "this is my content1";
+ r1.setContent(content.getBytes());
+ r1.setDescription("This is r1 file description");
+ r1.setDirectory(false);
- 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());
+ String path = "/d1/d2/d3/r1";
- }
+ try {
+ registry.put(path, r1);
+ } catch (RegistryException e) {
+ fail("Couldn't put content to path /d1/d2/d3/r1");
+ }
+
+ 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");
+ }
+
+// 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());
+
+ 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());
+
+ }
public void testUpdateResouceContent() throws Exception {
- Resource r1=new Resource();
- String content="this is my content1";
+ 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");
+ 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) {
+ 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";
+ 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");
+ r2ProUpdate.setProperty("key1", "value1_update");
+ r2ProUpdate.setProperty("key2", "value2_update");
+ r2ProUpdate.setProperty("key3_update", "value3_update");
r1.setProperties(r2ProUpdate);
- Resource r1_actual= new Resource();
+ Resource r1_actual = new Resource();
- try{
- registry.put(path,r1);
- }catch(RegistryException e) {
+ try {
+ registry.put(path, r1);
+ } catch (RegistryException e) {
fail("Couldn't put updated content to path /d1/d2/d3/d4/r1");
}
- try{
- r1_actual=registry.get("/d1/d2/d3/d4/r1");
- }catch(RegistryException e){
+ 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());
+// 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());
}
@@ -145,8 +145,8 @@
Properties r2Pro = new Properties();
- r2Pro.setProperty("key1","value1");
- r2Pro.setProperty("key2","value2");
+ r2Pro.setProperty("key1", "value1");
+ r2Pro.setProperty("key2", "value2");
r1.setProperties(r2Pro);
try {
@@ -155,73 +155,73 @@
fail("Couldn't put content to path /d1/d2/r2");
}
- Resource r1_actual= new Resource();
+ Resource r1_actual = new Resource();
- 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.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());
+ 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.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 testSetResourceDetails() throws Exception {
- Resource r1 = new Resource();
- r1.setDescription("R4 collection description");
- r1.setMediaType("text");
- r1.setDirectory(false);
+ 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);
+ 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");
- }
+ String path_collection = "/c11/c12/c13/c14/r4";
- Resource r1_actual= new Resource();
+ try {
+ registry.put(path_collection, r1);
+ } catch (RegistryException e) {
+ fail("Couldn't put content to path /c11/c12/c13/c14/r4");
+ }
- 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());
+ 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();
@@ -231,31 +231,29 @@
String path = "/c1/c2/c3/c4/r3";
-
try {
registry.put(path, r1);
} catch (RegistryException e) {
fail("Couldn't put content to path /c1/c2/c3/c4/r3");
}
- Resource r1_actual= new Resource();
+ Resource r1_actual = new Resource();
- /* try{
- r1_actual=registry.get("/c1/c2/c3");
- }catch(RegistryException e){
- 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());
- 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());
+ /* try{
+ r1_actual=registry.get("/c1/c2/c3");
+ }catch(RegistryException e){
+ 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());
+// 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 testSetCollectionDetails() throws Exception {
@@ -269,12 +267,12 @@
Properties r2Pro = new Properties();
- r2Pro.setProperty("key1","value5");
- r2Pro.setProperty("key2","value3");
+ r2Pro.setProperty("key1", "value5");
+ r2Pro.setProperty("key2", "value3");
r1.setProperties(r2Pro);
- String path_collection="/c1/c2/c3";
+ String path_collection = "/c1/c2/c3";
try {
registry.put(path_collection, r1);
@@ -282,29 +280,29 @@
fail("Couldn't put content to path /c1/c2/c3");
}
- Resource r1_actual= new Resource();
+ Resource r1_actual = new Resource();
- 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.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());
-
- 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.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());
+ 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.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());
+//
+ 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.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());
}
@@ -320,11 +318,11 @@
Properties r2Pro = new Properties();
- r2Pro.setProperty("key1","value5");
- r2Pro.setProperty("key2","value3");
+ r2Pro.setProperty("key1", "value5");
+ r2Pro.setProperty("key2", "value3");
r1.setProperties(r2Pro);
- String path="/c11/c12/c13/r4";
+ String path = "/c11/c12/c13/r4";
try {
registry.put(path, r1);
@@ -332,7 +330,7 @@
fail("Couldn't put content to path /c11/c12/c13/r4");
}
- String path_delete="/c11/c12/c13/r4";
+ String path_delete = "/c11/c12/c13/r4";
try {
registry.delete(path_delete);
@@ -349,21 +347,20 @@
assertTrue("Deleted resource /c11/c12/c13/r4 is returned on get.",
failed);
-
/*Add deleted resource again in to same path*/
- Resource r2= new Resource ();
+ 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");
+ r2Pro_new.setProperty("key1", "value5");
+ r2Pro_new.setProperty("key2", "value3");
r2.setProperties(r2Pro_new);
- String path_new="/c11/c12/c13/r4";
+ String path_new = "/c11/c12/c13/r4";
try {
registry.put(path_new, r2);
@@ -374,26 +371,26 @@
Resource r1_actual = new Resource();
try {
- r1_actual=registry.get(path_new);
+ 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());
+ // 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();
+ UserTest utest = new UserTest();
utest.testCollectionDetails();
- String path_delete="/c1/c2/c3";
+ String path_delete = "/c1/c2/c3";
try {
registry.delete(path_delete);
@@ -411,48 +408,46 @@
//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){
+ // fail("Couldn't get content from path /c1/c2/c3");
+ // }
+ //
+ // 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());
- /* 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){
-// fail("Couldn't get content from path /c1/c2/c3");
-// }
-//
-// 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 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);
+ 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);
+ Properties r2Pro = new Properties();
+ r2Pro.setProperty("key1", "value5");
+ r2Pro.setProperty("key2", "value3");
+ r1.setProperties(r2Pro);
- // String path="/d11/d12/d13/r1 space";
+ // String path="/d11/d12/d13/r1 space";
/* try {
registry.put(path, r1);
@@ -460,7 +455,7 @@
fail("Couldn't put content to path /d11/d12/d13/r1 space");
}
*/
- Resource r1_actual = new Resource();
+ Resource r1_actual = new Resource();
/* try {
r1_actual=registry.get(path);
@@ -468,27 +463,27 @@
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());
+ // 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();
+ Resource r1 = new Resource();
- r1.setDescription("this is a collection name with spaces");
- r1.setDirectory(true);
+ 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);
+ Properties r2Pro = new Properties();
+ r2Pro.setProperty("key1", "value5");
+ r2Pro.setProperty("key2", "value3");
+ r1.setProperties(r2Pro);
// String path="/col1/col2/col3 space";
@@ -499,7 +494,7 @@
fail("Couldn't put collection /col1/col2/col3 space");
}
*/
- Resource r1_actual = new Resource();
+ Resource r1_actual = new Resource();
/* try {
r1_actual=registry.get(path);
@@ -508,16 +503,16 @@
}
*/
- 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());
+// 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());
- }
+ }
- }
+}
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/VersionTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/VersionTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/app/VersionTest.java
Mon Jan 21 01:18:03 2008
@@ -1,3 +1,18 @@
+/*
+ * Copyright (c) 2006, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.wso2.registry.app;
import junit.framework.TestCase;
@@ -7,13 +22,6 @@
import java.net.URL;
-/*
- * Created by IntelliJ IDEA.
- * User: krishantha
- * Date: Jan 18, 2008
- * Time: 11:23:00 AM
- * To change this template use File | Settings | File Templates.
- */
public class VersionTest extends TestCase {
RegistryServer server = new RegistryServer();
@@ -23,7 +31,7 @@
try {
if (registry == null) {
server.start();
- registry = new RemoteRegistry(new
URL("http://localhost:8080/wso2registry/atom";), "admin", "admin");
+ registry = new RemoteRegistry(new
URL("http://localhost:8081/wso2registry/atom";), "admin", "admin");
}
} catch (Exception e) {
fail("Failed to initialize the registry.");
@@ -104,7 +112,7 @@
fail("Failed to read content from the file");
}
- System.out.println("File content:" + new String((byte[])
r4.getContent()));
+// System.out.println("File content:" + new String((byte[])
r4.getContent()));
/*delete the resource*/
@@ -145,9 +153,9 @@
}catch (RegistryException e){
fail("Failed to read content from the resotered file");
}
- System.out.println("File content:" + new String((byte[])
r4.getContent()));
- System.out.println("File content:" + new String((byte[])
r1.getContent()));
- System.out.println("File content:" + new String((byte[])
r3.getContent()));
+// System.out.println("File content:" + new String((byte[])
r4.getContent()));
+// System.out.println("File content:" + new String((byte[])
r1.getContent()));
+// System.out.println("File content:" + new String((byte[])
r3.getContent()));
assertEquals("Restored file content is not matching",new
String((byte[]) r1.getContent()),new String((byte[]) r3.getContent()));
}
Modified:
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
==============================================================================
---
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
(original)
+++
trunk/registry/modules/core/src/test/java/org/wso2/registry/jdbc/JDBCRegistryTest.java
Mon Jan 21 01:18:03 2008
@@ -216,9 +216,9 @@
Resource v2 = null;
Resource v3 = null;
try {
- v1 = registry.get(versionPaths[0]);
+ v1 = registry.get(versionPaths[2]);
v2 = registry.get(versionPaths[1]);
- v3 = registry.get(versionPaths[2]);
+ v3 = registry.get(versionPaths[0]);
} catch (RegistryException e) {
e.printStackTrace();
fail("Failed to get versioned resource.");
@@ -233,7 +233,7 @@
assertEquals("Content is not versioned properly.", content3, "New
content2");
try {
- registry.restoreVersion(versionPaths[0]);
+ registry.restoreVersion(versionPaths[2]);
} catch (RegistryException e) {
fail("Valid restore version failed.");
}
@@ -335,8 +335,8 @@
Resource c10v1 = null;
Resource c10v2 = null;
try {
- c10v1 = registry.get(versionPaths[0]);
- c10v2 = registry.get(versionPaths[1]);
+ c10v1 = registry.get(versionPaths[1]);
+ c10v2 = registry.get(versionPaths[0]);
} catch (RegistryException e) {
fail("Valid get failed.");
}
@@ -352,7 +352,7 @@
containsString(chidrenOfv2, "/c10/r2"));
try {
- registry.restoreVersion(versionPaths[0]);
+ registry.restoreVersion(versionPaths[1]);
} catch (RegistryException e) {
fail("Valid restore failed.");
}
_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev
