From 611747a6fea6b03c16d955af639d101319cf0b7f Mon Sep 17 00:00:00 2001 From: eranda Date: Sat, 9 Jul 2011 09:02:32 +0000 Subject: 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 --- .../nosqldatastore/couchdb/CouchDBTest.java | 54 ------------ .../nosqldatastore/couchdb/CouchDBTestCase.java | 96 ++++++++++++++++++++++ 2 files changed, 96 insertions(+), 54 deletions(-) delete mode 100644 collaboration/GSoC-2011-Eranda/couchdb/src/test/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBTest.java create mode 100644 collaboration/GSoC-2011-Eranda/couchdb/src/test/java/org/apache/tuscany/nosqldatastore/couchdb/CouchDBTestCase.java (limited to 'collaboration/GSoC-2011-Eranda/couchdb/src/test') 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"); + } +} -- cgit v1.2.3