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, 376 insertions, 139 deletions

diff --git a/collaboration/GSoC-2011-Eranda/cassandra/pom.xml b/collaboration/GSoC-2011-Eranda/cassandra/pom.xml
index 6c52fbfe9d..1194cdfd26 100644
--- a/collaboration/GSoC-2011-Eranda/cassandra/pom.xml
+++ b/collaboration/GSoC-2011-Eranda/cassandra/pom.xml
@@ -48,6 +48,11 @@ under the License.
             <artifactId>cassandra-all</artifactId>

             <version>0.7.4</version>

         </dependency>

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <version>4.8.2</version>

+        </dependency>

     </dependencies>

 

     <build>

diff --git a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/Database.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/Database.java
index 73e43a93fd..8dfdee5356 100644
--- a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/Database.java
+++ b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/Database.java
@@ -18,8 +18,17 @@
  */

 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);

+    Group createGroup(String groupId);

+    Group getGroup(String groupId);

+    void deleteGroup(String groupId) throws GroupNotFoundException;

 }

diff --git a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/Group.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/Group.java
index f5d9b4dbba..78eeffc383 100644
--- a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/Group.java
+++ b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/Group.java
@@ -18,9 +18,20 @@
  */

 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, Object value);

-	void updateEntry(String key, Object value);

-	void deleteEntry(String key);

-    Object getValue(String key);

+    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/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/Session.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/Session.java
index 5f43259bbe..3d2b93cc4b 100644
--- a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/Session.java
+++ b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/Session.java
@@ -18,8 +18,19 @@
  */

 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);

-	Database getDatabase(String databaseName);

-	void deleteDatabase(String databaseName);

+    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/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/SessionFactory.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/SessionFactory.java
index cb5ec2d47e..1db8ecc3d7 100644
--- a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/SessionFactory.java
+++ b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/SessionFactory.java
@@ -20,16 +20,17 @@ package org.apache.tuscany.nosqldatastore;
 

 import org.apache.tuscany.nosqldatastore.cassandra.CassandraSession;

 

-public class SessionFactory {

-	

-	private static org.apache.tuscany.nosqldatastore.Session session;

-	

-	private SessionFactory(){

-	}

-	

-	public static Session getCassandraSession(){

-		session = new CassandraSession("DataCluster");

-		return session;

-	}

-	

+public class

+        SessionFactory {

+

+    private org.apache.tuscany.nosqldatastore.Session session;

+

+    public SessionFactory(){

+    }

+

+    public Session getCassandraSession(){

+        session = new CassandraSession("DataCluster");

+        return session;

+    }

+

 }

diff --git a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraDatabase.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraDatabase.java
index 0760a78f34..da12203690 100644
--- a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraDatabase.java
+++ b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraDatabase.java
@@ -23,17 +23,19 @@ import me.prettyprint.hector.api.Cluster;
 import me.prettyprint.hector.api.Keyspace;

 import me.prettyprint.hector.api.ddl.KeyspaceDefinition;

 import me.prettyprint.hector.api.exceptions.HInvalidRequestException;

+import me.prettyprint.hector.api.exceptions.HectorException;

 import me.prettyprint.hector.api.factory.HFactory;

 import org.apache.tuscany.nosqldatastore.Database;

 import org.apache.tuscany.nosqldatastore.Group;

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

 

 class CassandraDatabase implements Database {

-	

+

 	private Keyspace keyspace;

 	private Cluster cluster;

-	

-	CassandraDatabase(String databaseName, Cluster cluster) {

-        try{            

+

+	CassandraDatabase(String databaseName, Cluster cluster) throws HectorException{

+        try{

             KeyspaceDefinition ksDef = new ThriftKsDef(databaseName, "org.apache.cassandra.locator.SimpleStrategy", 1, null);

             cluster.addKeyspace(ksDef);

         }catch (HInvalidRequestException e){

@@ -44,17 +46,22 @@ class CassandraDatabase implements Database {
 	}

 

 	public Group createGroup(String groupId) {

-		CassandraGroup group = new CassandraGroup(groupId, keyspace, cluster);

-		return group;

+		Group group = new CassandraGroup(groupId, keyspace, cluster);

+        return group;

 	}

 

     public Group getGroup(String groupId) {

-		return createGroup(groupId);

+		Group group = createGroup(groupId);

+        return group;

     }

 

 

-    public void deleteGroup(String key) {

-		cluster.dropColumnFamily(keyspace.getKeyspaceName(), key);

+    public void deleteGroup(String groupId) throws GroupNotFoundException {

+        try{

+		    cluster.dropColumnFamily(keyspace.getKeyspaceName(), groupId);

+        } catch(HInvalidRequestException e){

+            throw new GroupNotFoundException("Group does not exists "+groupId);

+        }

 	}

 

 }

diff --git a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraGroup.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraGroup.java
index 3b29399e3e..30ab8698b4 100644
--- a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraGroup.java
+++ b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraGroup.java
@@ -29,6 +29,8 @@ import me.prettyprint.hector.api.ddl.ColumnFamilyDefinition;
 import me.prettyprint.hector.api.exceptions.HInvalidRequestException;

 import me.prettyprint.hector.api.factory.HFactory;

 import org.apache.tuscany.nosqldatastore.Group;

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

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

 

 class CassandraGroup implements Group {

 

@@ -36,35 +38,57 @@ class CassandraGroup implements Group {
     private ColumnFamilyUpdater<String, String> updater;

     private final StringSerializer se = StringSerializer.get();

 

-	CassandraGroup(String groupId, Keyspace keyspace, Cluster cluster) {

+    CassandraGroup(String groupId, Keyspace keyspace, Cluster cluster) {

         try{

-        ColumnFamilyDefinition cfDef = HFactory.createColumnFamilyDefinition(keyspace.getKeyspaceName(), groupId);

-		cluster.addColumnFamily(cfDef);

+            ColumnFamilyDefinition cfDef = HFactory.createColumnFamilyDefinition(keyspace.getKeyspaceName(), groupId);

+            cluster.addColumnFamily(cfDef);

         }catch (HInvalidRequestException e){

             System.out.println("Connect to the existing group...");

         }

         template = new ThriftColumnFamilyTemplate<String, String>(keyspace,groupId,se,se,HFactory.createMutator(keyspace, se));

-	}

+    }

 

-	public void addEntry(String key, Object value) {

-        updater = template.createUpdater(key);

-		updater.setString(key, (String) value);

-		template.update(updater);

-		template.addColumn(key, se);		

-	}

+    public void addEntry(String key, String value) throws DuplicateEntryException {

+        ColumnFamilyResult wrapper = template.queryColumns(key);

+        if(wrapper.getString(key) == null){

+            updater = template.createUpdater(key);

+            updater.setString(key, value);

+            template.update(updater);

+            template.addColumn(key, se);

+            return;

+        }

+        throw new DuplicateEntryException("Entry already exist for key "+key);

+    }

 

-	public void deleteEntry(String key) {

-		template.deleteColumn(key, key);

-		

-	}

+    public void deleteEntry(String key) throws EntryNotFoundException {

+        ColumnFamilyResult wrapper = template.queryColumns(key);

+        if(wrapper.getString(key) != null){

+            template.deleteColumn(key, key);

+            return;

+        }

+        throw new EntryNotFoundException("Entry does not exist for key "+key);

+    }

 

-    public Object getValue(String key) {

+    public String getEntry(String key) throws EntryNotFoundException {

         ColumnFamilyResult wrapper = template.queryColumns(key);

-        return wrapper.getString(key);

+        String entry =  wrapper.getString(key);

+        if(entry != null){

+            return entry;

+        }

+        throw new EntryNotFoundException("Entry does not exist for key "+key);

+

     }

 

-    public void updateEntry(String key, Object value) {

-		addEntry(key, value);

-	}

+    public void updateEntry(String key, String value) throws EntryNotFoundException {

+        ColumnFamilyResult wrapper = template.queryColumns(key);

+        if(wrapper.getString(key) != null){

+            updater = template.createUpdater(key);

+            updater.setString(key, value);

+            template.update(updater);

+            template.addColumn(key, se);

+            return;

+        }

+        throw new EntryNotFoundException("Entry does not exist for key "+key);

+    }

 

 }

diff --git a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraSession.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraSession.java
index 7a9faf7b43..186d9f8d1a 100644
--- a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraSession.java
+++ b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraSession.java
@@ -20,31 +20,46 @@ package org.apache.tuscany.nosqldatastore.cassandra;
 

 import me.prettyprint.cassandra.service.CassandraHostConfigurator;

 import me.prettyprint.hector.api.Cluster;

+import me.prettyprint.hector.api.exceptions.HInvalidRequestException;

+import me.prettyprint.hector.api.exceptions.HectorException;

 import me.prettyprint.hector.api.factory.HFactory;

 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.GroupNotFoundException;

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

 

 public class CassandraSession implements Session {

-	

-	private CassandraHostConfigurator cassandraHostConfigurator;

-	private Cluster cluster;

-	

-	public CassandraSession(String clusterName) {

-		cluster = HFactory.getOrCreateCluster("Test Cluster", "127.0.0.1:9160");

-	}

-

-	public Database createDatabase(String keyspaceName) {

-		Database database = new CassandraDatabase(keyspaceName, cluster);

-		return database;

-	}

-

-	public Database getDatabase(String keyspaceName) {

-		Database database = new CassandraDatabase(keyspaceName, cluster);

-		return database;

-	}

-

-	public void deleteDatabase(String keyspaceName) {

-		cluster.dropKeyspace(keyspaceName);

-	}

+

+    private CassandraHostConfigurator cassandraHostConfigurator;

+    private Cluster cluster;

+

+    public CassandraSession(String clusterName) {

+        cluster = HFactory.getOrCreateCluster("Test Cluster", "127.0.0.1:9160");

+    }

+

+    public Database createDatabase(String databaseName) throws SessionException {

+        Database database = null;

+        try{

+            database = new CassandraDatabase(databaseName, cluster);

+        } catch (HectorException e){

+            throw new SessionException("Session error");

+        }

+        return database;

+    }

+

+    public Database getDatabase(String databaseName) throws SessionException {

+        return createDatabase(databaseName);

+    }

+

+    public void deleteDatabase(String databaseName) throws DatabaseNotFoundException, SessionException {

+        try{

+            cluster.dropKeyspace(databaseName);

+        } catch(HInvalidRequestException e){

+            throw new DatabaseNotFoundException("Database "+databaseName+" not found");

+        } catch (HectorException e){

+            throw new SessionException("Session error");

+        }

+    }

 

 }

diff --git a/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/exception/DatabaseNotFoundException.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/exception/DatabaseNotFoundException.java
new file mode 100644
index 0000000000..871d0ac7ed
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/cassandra/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/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/exception/DuplicateEntryException.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/exception/DuplicateEntryException.java
new file mode 100644
index 0000000000..4bd19fcd99
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/cassandra/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/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/exception/EntryNotFoundException.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/exception/EntryNotFoundException.java
new file mode 100644
index 0000000000..f2f459d200
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/cassandra/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/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/exception/GroupNotFoundException.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/exception/GroupNotFoundException.java
new file mode 100644
index 0000000000..70f5326745
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/cassandra/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/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/exception/SessionException.java b/collaboration/GSoC-2011-Eranda/cassandra/src/main/java/org/apache/tuscany/nosqldatastore/exception/SessionException.java
new file mode 100644
index 0000000000..016c7e6264
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/cassandra/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/cassandra/src/test/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraTest.java b/collaboration/GSoC-2011-Eranda/cassandra/src/test/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraTest.java
deleted file mode 100644
index 8ca38d2f9f..0000000000
--- a/collaboration/GSoC-2011-Eranda/cassandra/src/test/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraTest.java
+++ /dev/null
@@ -1,68 +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.cassandra;

-

-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 CassandraTest {

-	

-	Session session;

-	

-	public CassandraTest(){

-		session = SessionFactory.getCassandraSession();

-	}

-	

-	public static void main(String[] args){

-		CassandraTest test = new CassandraTest();

-		test.create();

-		test.delete();

-	}

-

-	public void create(){

-		Database db = session.createDatabase("TwitApp");

-		Group group1 = db.createGroup("twits");

-

-        group1.addEntry("twitName1", "Here I am");

-        group1.addEntry("twitName2", "I am not here");

-        group1.addEntry("twitName3", "Sometimes");

-

-		Group group2 = db.createGroup("users");

-

-        group2.addEntry("userName1", "eranda");

-        group2.addEntry("userName2", "ishara");

-        group2.addEntry("userName3", "ravi");

-

-        group2.deleteEntry("userName3");

-        group2.updateEntry("userName2", "eranda");

-

-        System.out.println(group2.getValue("userName1"));

-	}

-	

-	public void delete(){

-		Database db = session.getDatabase("TwitApp");

-		db.deleteGroup("twits");

-		db.deleteGroup("users");

-		session.deleteDatabase("TwitApp");

-	}

-	

-}

diff --git a/collaboration/GSoC-2011-Eranda/cassandra/src/test/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraTestCase.java b/collaboration/GSoC-2011-Eranda/cassandra/src/test/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraTestCase.java
new file mode 100644
index 0000000000..267808dfa1
--- /dev/null
+++ b/collaboration/GSoC-2011-Eranda/cassandra/src/test/java/org/apache/tuscany/nosqldatastore/cassandra/CassandraTestCase.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.cassandra;

+

+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.*;

+import org.junit.Before;

+import org.junit.Test;

+

+import org.junit.Assert;

+

+

+public class CassandraTestCase {

+

+    private Session session;

+

+    @Before

+    public void init(){

+        SessionFactory factory = new SessionFactory();

+        session = factory.getCassandraSession();

+    }

+

+    @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");

+    }

+}