update Sample.py

Author: sreeder

Examples/Sample.py

@@ -17,18 +17,15 @@
 #connect to database
 # createconnection (dbtype, servername, dbname, username, password)
 # session_factory = dbconnection.createConnection('connection type: sqlite|mysql|mssql|postgresql', '/your/path/to/db/goes/here', 2.0)#sqlite
-# session_factory = dbconnection.createConnection('postgresql', 'localhost', 'odm2', 'ODM', 'odm')
+session_factory = dbconnection.createConnection('postgresql', 'localhost', 'odm2', 'ODM', 'odm')
 # session_factory = dbconnection.createConnection('mysql', 'localhost', 'odm2', 'ODM', 'odm')#mysql
 
 # session_factory= dbconnection.createConnection('mssql', "(local)", "ODM2", "ODM", "odm")#win MSSQL
 
-
 # session_factory= dbconnection.createConnection('mssql', "arroyoodm2", "", "ODM", "odm")#mac/linux MSSQL
 # session_factory = dbconnection.createConnection('sqlite', '/Users/stephanie/DEV/YODA-Tools/tests/test_files/XL_specimen.sqlite', 2.0)
 
 
-session_factory = dbconnection.createConnection('postgresql', 'odm2wofpy1.uwrl.usu.edu', 'odm2', 'dbadmin', 'pinkbananastastegross')
-
 
 
 
@@ -42,9 +39,6 @@
 create = CreateODM2(session_factory)
 
 
-
-
-
 # Run some basic sample queries.
 # ------------------------------
 # Get all of the variables from the database and print their names to the console

tests/test_odm2/test_readservice.py

@@ -92,6 +92,26 @@ def test_getSamplingFeatureByID(self):
         resapi = self.reader.getSamplingFeatures(ids=[sfid])
         assert resapi is not None
 
+#DataSets
+    def test_getDataSets(self):
+        # get all datasets from the database
+        ds = self.engine.execute('SELECT * FROM DataSets').fetchone()
+        dsid = ds[0]
+
+        dsapi = self.reader.getDataSets(ids=[dsid])
+        assert dsapi is not None
+        assert True
+
+    def test_getDataSetsResults(self):
+        # get all datasetresults from the database
+        dsr = self.engine.execute('SELECT * FROM DataSetsResults').fetchone()
+        dsid = dsr[2]
+
+        dsrapi = self.reader.getDataSetsResults(ids=[dsid])
+        assert dsrapi is not None
+        assert True
+
+
 # Models
     """
         TABLE Models