Remove excess functionality.

Higher level functionality should be reserved for separate a package.
ExternalReality · Oct 20, 2011 · df0dea7 · df0dea7
1 parent e3227e7
commit df0dea7
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 68 deletions.
diff --git a/src/Database/SednaDB/Sedna.hs b/src/Database/SednaDB/Sedna.hs
diff --git a/src/Database/SednaDB/SednaBindings.hs b/src/Database/SednaDB/SednaBindings.hs
@@ -20,10 +20,7 @@ module Database.SednaDB.SednaBindings
     , sednaShowTime
     , sednaTransactionStatus
     , sednaLoadFile
-
     , sednaLoadData
-
-
     ) where
 
 --------------------------------------------------------------------------------

diff --git a/test/suite/Integration/SednaBindingTests.hs b/test/suite/Integration/SednaBindingTests.hs
@@ -112,21 +112,19 @@ testGetConnectionAttr =
                                 result)
                 "Testing inspection of connection attributes"
 
--- --------------------------------------------------------------------------------
+---------------------------------------------------------------------------------
 testLoadData :: Test
-testLoadData =
- testCaseFMsg "Test loading of XML Data" $ sednaDBTest
- connectionTest (conn -> do
-                   sednaBegin conn
-                   sednaLoadData conn
-                                 (pack "<?xml version=\"1.0\" standalone=\"yes\"?>")
-                                 "testdoc"
-                                 "testcollection"
-                   sednaEndLoadData conn)
+testLoadData =  
+    connectionTest (\conn ->  do
+                      sednaBegin conn
+                      sednaLoadData conn
+                                    (pack "<?xml version=\"1.0\" standalone=\"yes\"?>")
+                                    "testdoc"
+                                    "testcollection"
+                      sednaEndLoadData conn
+                      sednaCommit conn)
                    "Testing proper loading of chunk data"
 
-
-
 -- --------------------------------------------------------------------------------
 -- -- testLoadFile = sednaDBTest $
 -- --                (\(_,conn) -> do
@@ -202,15 +200,16 @@ controlTests = testGroup "Control Tests" [ testGetConnectionAttr
                                          ]
 
 -- --------------------------------------------------------------------------------
--- transactionTests :: Test
--- transactionTests = testGroup "Transaction Tests" [ testBeginTransaction
---                                                  , testLoadData
---                                                  , testExecuteQuery
---                                                  , testLoadRetrieveData
---                                                  ]
+transactionTests :: Test
+transactionTests = testGroup "Transaction Tests" [ testBeginTransaction
+                                                 , testLoadData
+                                                 --, testExecuteQuery
+                                                 --, testLoadRetrieveData
+                                                 ]
 
 --------------------------------------------------------------------------------
 integrationTests :: Test
 integrationTests = testGroup "Sedna C API Integration Tests" [ connectionTests 
                                                              , controlTests
+                                                             , transactionTests
                                                              ]