1. Remove static variable in SessionFactory

2. Set spaces to 4
3. Exception handling
4. Rename *Test to *TestCase
5. Convert test cases in to JUnit
6. Rename addValue() method in Group.java to addEntry()
7. Updated the addEntry method signature to accept String type only



git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1144620 13f79535-47bb-0310-9956-ffa450edef68

15 files changed, 420 insertions, 173 deletions

diff --git a/collaboration/GSoC-2011-Eranda/couchdb/pom.xml b/collaboration/GSoC-2011-Eranda/couchdb/pom.xml
index 858e7fac59..32c17907ad 100644
--- a/collaboration/GSoC-2011-Eranda/couchdb/pom.xml
+++ b/collaboration/GSoC-2011-Eranda/couchdb/pom.xml
@@ -34,10 +34,15 @@ under the License.
 
     <dependencies>
         <dependency>
-    		<groupId>com.google.code.jcouchdb</groupId>
-    		<artifactId>jcouchdb</artifactId>
-    		<version>0.10.0-1</version>
-	</dependency>
+            <groupId>com.google.code.jcouchdb</groupId>
+            <artifactId>jcouchdb</artifactId>
+            <version>0.10.0-1</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.2</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/Database.java b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/Database.java
index ad80b06f04..8dfdee5356 100644
--- a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/Database.java
+++ b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/Database.java
@@ -1,26 +1,34 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.apache.tuscany.nosqldatastore;
-
-public interface Database {
-	Group createGroup(String groupId);
-	Group getGroup(String groupId);
-	void deleteGroup(String groupId);
-}
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you 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.apache.tuscany.nosqldatastore;

+

+import org.apache.tuscany.nosqldatastore.exception.GroupNotFoundException;

+

+/*

+Database:

+Use to manipulate the groups, where  groups are use to categorize the data

+1. Creating a group

+2. Retrieving a group

+3. Deleting a group

+*/

+public interface Database {

+    Group createGroup(String groupId);

+    Group getGroup(String groupId);

+    void deleteGroup(String groupId) throws GroupNotFoundException;

+}

diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/Group.java b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/Group.java
index 634ab59cf0..78eeffc383 100644
--- a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/Group.java
+++ b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/Group.java
@@ -1,27 +1,37 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.apache.tuscany.nosqldatastore;
-
-public interface Group {
-	void addEntry(String key, Object value);
-	void updateEntry(String key, Object value);
-	void deleteEntry(String key);
-    Object getValue(String key);
-}
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you 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.apache.tuscany.nosqldatastore;

+

+import org.apache.tuscany.nosqldatastore.exception.DuplicateEntryException;

+import org.apache.tuscany.nosqldatastore.exception.EntryNotFoundException;

+

+/*

+Group:

+Group use to categorize the data into different categories

+1. Add entry to the database

+2. Update an existing entry

+3. Delete  an existing entry

+4. Get a existing entry

+ */

+public interface Group {

+    void addEntry(String key, String value) throws DuplicateEntryException;

+    void updateEntry(String key, String value) throws EntryNotFoundException;

+    void deleteEntry(String key) throws EntryNotFoundException;

+    String getEntry(String key) throws EntryNotFoundException;

+}

diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/Session.java b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/Session.java
index 5aa9641715..3d2b93cc4b 100644
--- a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/Session.java
+++ b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/Session.java
@@ -1,26 +1,36 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.apache.tuscany.nosqldatastore;
-
-public interface Session {
-	Database createDatabase(String databaseName);
-	Database getDatabase(String databaseName);
-	void deleteDatabase(String databaseName);
-}
+/*

+ * Licensed to the Apache Software Foundation (ASF) under one

+ * or more contributor license agreements.  See the NOTICE file

+ * distributed with this work for additional information

+ * regarding copyright ownership.  The ASF licenses this file

+ * to you 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.apache.tuscany.nosqldatastore;

+

+import org.apache.tuscany.nosqldatastore.exception.DatabaseNotFoundException;

+import org.apache.tuscany.nosqldatastore.exception.GroupNotFoundException;

+import org.apache.tuscany.nosqldatastore.exception.SessionException;

+

+/*

+Session:

+Session is a database session use to access the database

+1. Create a database

+2. Get instance of existing database

+3. Delete a database

+*/

+public interface Session {

+    Database createDatabase(String databaseName) throws SessionException;

+    Database getDatabase(String databaseName) throws SessionException;

+    void deleteDatabase(String databaseName) throws DatabaseNotFoundException, SessionException;

+}

diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/SessionFactory.java b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/SessionFactory.java
index 2438adf228..534a6905c4 100644
--- a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/SessionFactory.java
+++ b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/SessionFactory.java
@@ -22,15 +22,15 @@ package org.apache.tuscany.nosqldatastore;
 import org.apache.tuscany.nosqldatastore.couchdb.CouchDBSession;
 
 public class SessionFactory {
-	
-	private static org.apache.tuscany.nosqldatastore.Session session;
-	
-	private SessionFactory(){
-	}
-	
-	public static Session getCouchDBSession(){
-		session = new CouchDBSession();
-		return session;
-	}
-	
+
+    private org.apache.tuscany.nosqldatastore.Session session;
+
+    public SessionFactory(){
+    }
+
+    public Session getCouchDBSession(){
+        session = new CouchDBSession("couchdb");
+        return session;
+    }
+
 }
diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBDatatabase.java b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBDatatabase.java
index 20e426a1c4..2e6cbc92e6 100644
--- a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBDatatabase.java
+++ b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBDatatabase.java
@@ -21,23 +21,25 @@ package org.apache.tuscany.nosqldatastore.couchdb;
 
 import org.apache.tuscany.nosqldatastore.Database;
 import org.apache.tuscany.nosqldatastore.Group;
+import org.apache.tuscany.nosqldatastore.exception.GroupNotFoundException;
 import org.jcouchdb.db.Server;
 import org.jcouchdb.document.DesignDocument;
+import org.jcouchdb.exception.CouchDBException;
 
 public class CouchDBDatatabase implements Database{
 
     private org.jcouchdb.db.Database db;
     private String dbname;
 
-    CouchDBDatatabase(String dbname){
+    CouchDBDatatabase(String dbname) throws CouchDBException{
         this.dbname = dbname;
         db = new org.jcouchdb.db.Database("localhost",dbname);
         Server server = db.getServer();
         if(!server.listDatabases().contains(dbname)){
             server.createDatabase(dbname);
-            System.out.println("New database created...");
+            return;
         }
-
+        System.out.println("Connect to the existing database...");
     }
 
     public Group createGroup(String groupId) {
@@ -50,8 +52,12 @@ public class CouchDBDatatabase implements Database{
         return group;
     }
 
-    public void deleteGroup(String groupId) {
+    public void deleteGroup(String groupId) throws GroupNotFoundException{
         DesignDocument doc = db.getDesignDocument(groupId);
-        db.delete(doc);
+        if(doc != null){
+            db.delete(doc);
+            return;
+        }
+        throw new GroupNotFoundException("Group does not exists "+groupId);
     }
 }
diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBGroup.java b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBGroup.java
index 2590dacc0c..485e87149d 100644
--- a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBGroup.java
+++ b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBGroup.java
@@ -20,6 +20,8 @@
 package org.apache.tuscany.nosqldatastore.couchdb;
 
 import org.apache.tuscany.nosqldatastore.Group;
+import org.apache.tuscany.nosqldatastore.exception.DuplicateEntryException;
+import org.apache.tuscany.nosqldatastore.exception.EntryNotFoundException;
 import org.jcouchdb.document.DesignDocument;
 import org.jcouchdb.document.DocumentHelper;
 import org.jcouchdb.exception.UpdateConflictException;
@@ -42,33 +44,52 @@ public class CouchDBGroup implements Group {
         try{
             database.createOrUpdateDocument(doc);
         }catch(UpdateConflictException e){
-            System.out.println("Connect to the doc "+groupId);   
+            System.out.println("Connect to the doc "+groupId);
         }
     }
 
-    public void addEntry(String key, Object value) {
+    public void addEntry(String key, String value) throws DuplicateEntryException {
         DesignDocument doc = database.getDesignDocument(groupId);
         Map<String, String> lists  = doc.getListFunctions();
-        lists.put(key, (String)value);
-        doc.setListFunctions(lists);
-        database.updateDocument(doc);
+        if(!lists.containsKey(key)){
+            lists.put(key, value);
+            doc.setListFunctions(lists);
+            database.updateDocument(doc);
+            return;
+        }
+        throw new DuplicateEntryException("Entry already exist for key "+key);
     }
 
-    public void updateEntry(String key, Object value) {
-        addEntry(key, value);
+    public void updateEntry(String key, String value) throws EntryNotFoundException{
+        DesignDocument doc = database.getDesignDocument(groupId);
+        Map<String, String> lists  = doc.getListFunctions();
+        if(lists.containsKey(key)){
+            lists.put(key, value);
+            doc.setListFunctions(lists);
+            database.updateDocument(doc);
+            return;
+        }
+        throw new EntryNotFoundException("Entry does not exist for key "+key);
     }
 
-    public void deleteEntry(String key) {
+    public void deleteEntry(String key) throws EntryNotFoundException {
         DesignDocument doc = database.getDesignDocument(groupId);
         Map<String, String> lists  = doc.getListFunctions();
-        lists.remove(key);
-        doc.setListFunctions(lists);
-        database.updateDocument(doc);
+        if(lists.containsKey(key)){
+            lists.remove(key);
+            doc.setListFunctions(lists);
+            database.updateDocument(doc);
+            return;
+        }
+        throw new EntryNotFoundException("Entry does not exist for key "+key);
     }
 
-    public Object getValue(String key) {
+    public String getEntry(String key) throws EntryNotFoundException {
         DesignDocument doc = database.getDesignDocument(groupId);
         Map<String, String> lists  = doc.getListFunctions();
-        return lists.get(key);
+        if(lists.containsKey(key)){
+            return lists.get(key);
+        }
+        throw new EntryNotFoundException("Entry does not exist for key "+key);
     }
 }
diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBSession.java b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBSession.java
index 3805d03283..add2e258ff 100644
--- a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBSession.java
+++ b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBSession.java
@@ -21,25 +21,44 @@ package org.apache.tuscany.nosqldatastore.couchdb;
 
 import org.apache.tuscany.nosqldatastore.Database;
 import org.apache.tuscany.nosqldatastore.Session;
+import org.apache.tuscany.nosqldatastore.exception.DatabaseNotFoundException;
+import org.apache.tuscany.nosqldatastore.exception.SessionException;
 import org.jcouchdb.db.Server;
+import org.jcouchdb.exception.CouchDBException;
 
 public class CouchDBSession implements Session{
 
-    public CouchDBSession(){
+    private String sessionName;
+
+    public CouchDBSession(String name){
+        sessionName = name;
     }
 
-    public Database createDatabase(String databaseName) {
-        Database database = new CouchDBDatatabase(databaseName);
+    public Database createDatabase(String databaseName) throws SessionException {
+        Database database = null;
+        try{
+            database = new CouchDBDatatabase(databaseName);
+        } catch(CouchDBException e){
+            throw new SessionException("Session error");
+        }
         return database;
     }
 
-    public Database getDatabase(String databaseName) {
-        Database database = new CouchDBDatatabase(databaseName);
+    public Database getDatabase(String databaseName) throws SessionException {
+        Database database = createDatabase(databaseName);
         return database;
     }
 
-    public void deleteDatabase(String databaseName) {
+    public void deleteDatabase(String databaseName) throws SessionException, DatabaseNotFoundException {
         org.jcouchdb.db.Database db = new org.jcouchdb.db.Database("localhost",databaseName);
-        db.getServer().deleteDatabase(databaseName);                                                     
+        if(db.getServer().listDatabases().contains(databaseName)){
+            try{
+                db.getServer().deleteDatabase(databaseName);
+            } catch(CouchDBException e){
+                throw new SessionException("Session error");
+            }
+        } else {
+            throw new DatabaseNotFoundException("Database "+databaseName+" not found");
+        }
     }
 }
diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/DatabaseNotFoundException.java b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/DatabaseNotFoundException.java
new file mode 100644
index 0000000000..871d0ac7ed
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/DatabaseNotFoundException.java
@@ -0,0 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.apache.tuscany.nosqldatastore.exception;
+
+public class DatabaseNotFoundException extends Exception{
+
+    public DatabaseNotFoundException(String msg){
+        super(msg);
+    }
+}
diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/DuplicateEntryException.java b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/DuplicateEntryException.java
new file mode 100644
index 0000000000..4bd19fcd99
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/DuplicateEntryException.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.apache.tuscany.nosqldatastore.exception;
+
+public class DuplicateEntryException extends Exception{
+    public DuplicateEntryException(String msg) {
+        super(msg);
+    }
+}
diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/EntryNotFoundException.java b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/EntryNotFoundException.java
new file mode 100644
index 0000000000..f2f459d200
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/EntryNotFoundException.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.apache.tuscany.nosqldatastore.exception;
+
+public class EntryNotFoundException extends Exception{
+    public EntryNotFoundException(String msg) {
+        super(msg);
+    }
+}
diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/GroupNotFoundException.java b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/GroupNotFoundException.java
new file mode 100644
index 0000000000..70f5326745
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/GroupNotFoundException.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.apache.tuscany.nosqldatastore.exception;
+
+public class GroupNotFoundException extends Exception{
+    public GroupNotFoundException(String msg){
+        super(msg);
+    }
+}
diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/SessionException.java b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/SessionException.java
new file mode 100644
index 0000000000..016c7e6264
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/couchdb/src/main/java/org/apache/tuscany/nosqldatastore/exception/SessionException.java
@@ -0,0 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.apache.tuscany.nosqldatastore.exception;
+
+public class SessionException extends Exception{
+    public SessionException(String msg){
+        super(msg);
+    }
+}
diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/test/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBTest.java b/collaboration/GSoC-2011-Eranda/couchdb/src/test/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBTest.java
deleted file mode 100644
index 6e94288382..0000000000
--- a/collaboration/GSoC-2011-Eranda/couchdb/src/test/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBTest.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you 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.apache.tuscany.nosqldatastore.couchdb;
-
-import org.apache.tuscany.nosqldatastore.Database;
-import org.apache.tuscany.nosqldatastore.Group;
-import org.apache.tuscany.nosqldatastore.Session;
-import org.apache.tuscany.nosqldatastore.SessionFactory;
-
-public class CouchDBTest {
-
-    Session session;
-
-    private CouchDBTest(){
-        session = SessionFactory.getCouchDBSession();
-    }
-
-    public static void main(String[] args){
-        CouchDBTest test = new CouchDBTest();
-        test.start();
-    }
-
-    public void start(){
-        
-        Database db = session.createDatabase("db1");
-        Group group = db.createGroup("group4");
-        group.addEntry("eranda", "Eranda Sooriyabandara");
-        group.addEntry("ishara", "Ishara Karunarathne");
-        group.addEntry("mahesh", "Eranda Sooriyabandara");
-        group.deleteEntry("eranda");
-        group.deleteEntry("ishara");
-        System.out.println(group.getValue("mahesh"));
-        db.deleteGroup("group4");
-        session.deleteDatabase("db1");
-
-
-    }
-}
diff --git a/collaboration/GSoC-2011-Eranda/couchdb/src/test/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBTestCase.java b/collaboration/GSoC-2011-Eranda/couchdb/src/test/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBTestCase.java
new file mode 100644
index 0000000000..2ce1948584
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/couchdb/src/test/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBTestCase.java
@@ -0,0 +1,96 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.apache.tuscany.nosqldatastore.couchdb;
+
+import org.apache.tuscany.nosqldatastore.Database;
+import org.apache.tuscany.nosqldatastore.Group;
+import org.apache.tuscany.nosqldatastore.Session;
+import org.apache.tuscany.nosqldatastore.SessionFactory;
+
+import org.apache.tuscany.nosqldatastore.exception.EntryNotFoundException;
+import org.junit.Before;
+import org.junit.Test;
+
+import org.junit.Assert;
+
+public class CouchDBTestCase {
+
+    private Session session;
+
+    @Before
+    public void init(){
+        SessionFactory factory = new SessionFactory();
+        session = factory.getCouchDBSession();
+    }
+
+    @Test
+    public void testAddEntry() throws Exception {
+        Database db = session.createDatabase("twitapp");
+        Group group = db.createGroup("twits");
+
+        group.addEntry("twitName1", "Here I am");
+        group.addEntry("twitName2", "I am not here");
+        group.addEntry("twitName3", "Sometimes");
+
+        Assert.assertEquals(group.getEntry("twitName1"), "Here I am");
+        Assert.assertEquals(group.getEntry("twitName2"), "I am not here");
+        Assert.assertEquals(group.getEntry("twitName3"), "Sometimes");
+
+        db.deleteGroup("twits");
+        session.deleteDatabase("twitapp");
+    }
+
+    @Test
+    public void testDeleteEntry() throws Exception {
+        Database db = session.createDatabase("twitapp");
+        Group group = db.createGroup("twits");
+
+        group.addEntry("twitName1", "Here I am");
+        group.addEntry("twitName2", "I am not here");
+        group.addEntry("twitName3", "Sometimes");
+
+        group.deleteEntry("twitName1");
+
+        try {
+            Assert.assertNull(group.getEntry("twitName1"));
+            Assert.fail("Deleted entry exists");
+        } catch(EntryNotFoundException e) {
+            //Expected
+        }
+
+        db.deleteGroup("twits");
+        session.deleteDatabase("twitapp");
+    }
+
+    @Test
+    public void testUpdateEntry() throws Exception {
+        Database db = session.createDatabase("twitapp");
+        Group group = db.createGroup("twits");
+
+        group.addEntry("twitName1", "Here I am");
+        group.addEntry("twitName2", "I am not here");
+        group.addEntry("twitName3", "Sometimes");
+
+        group.updateEntry("twitName3", "Never");
+        Assert.assertEquals(group.getEntry("twitName3"), "Never");
+
+        db.deleteGroup("twits");
+        session.deleteDatabase("twitapp");
+    }
+}