Added tests to cover basic cases for Workbook, Datasource, and Connection classes. The temp-file setUp isn't the greatest but it's functional for now and will help with confidance if we decide to move anything around. Already uncovered a bug with them, fixed in this commit -- TDS files don't seem to have a 'name' attribute but instead call it 'formatted-name' I added a simple OR into the _name logic of the Datasource class and that resolves the bug.

Author: t8y8

Document API/tableaudocumentapi/datasource.py

@@ -24,7 +24,7 @@ def __init__(self, dsxml):
 
         """
         self._datasourceXML = dsxml
-        self._name = self._datasourceXML.get('name')
+        self._name = self._datasourceXML.get('name') or self._datasourceXML.get('formatted-name') # TDS files don't have a name attribute
         self._version = self._datasourceXML.get('version')
         self._connection = Connection(self._datasourceXML.find('connection'))
 

Document API/test.py

@@ -1,6 +1,27 @@
 import unittest
+import tempfile
 
-from tableaudocumentapi import Workbook
+import xml.etree.ElementTree as ET
+
+from tableaudocumentapi import Workbook, Datasource, Connection
+
+TABLEAU_93_WORKBOOK = '''<?xml version='1.0' encoding='utf-8' ?>
+<workbook source-build='9.3.1 (9300.16.0510.0100)' source-platform='mac' version='9.3' xmlns:user='http://www.tableausoftware.com/xml/user'>
+  <datasources>
+    <datasource caption='xy (TestV1)' inline='true' name='sqlserver.17u3bqc16tjtxn14e2hxh19tyvpo' version='9.3'>
+      <connection authentication='sspi' class='sqlserver' dbname='TestV1' odbc-native-protocol='yes' one-time-sql='' server='mssql2012.test.tsi.lan' username=''>
+      </connection>
+    </datasource>
+  </datasources>
+</workbook>'''
+
+TABLEAU_93_TDS = '''<?xml version='1.0' encoding='utf-8' ?>
+<datasource formatted-name='sqlserver.17u3bqc16tjtxn14e2hxh19tyvpo' inline='true' source-platform='mac' version='9.3' xmlns:user='http://www.tableausoftware.com/xml/user'>
+  <connection authentication='sspi' class='sqlserver' dbname='TestV1' odbc-native-protocol='yes' one-time-sql='' server='mssql2012.test.tsi.lan' username=''>
+  </connection>
+</datasource>'''
+
+TABLEAU_CONNECTION_XML = ET.fromstring('''<connection authentication='sspi' class='sqlserver' dbname='TestV1' odbc-native-protocol='yes' one-time-sql='' server='mssql2012.test.tsi.lan' username=''></connection>''')
 
 class HelperMethodTests(unittest.TestCase):
 
@@ -14,5 +35,56 @@ def test_is_valid_file_with_invalid_inputs(self):
         self.assertFalse(Workbook._is_valid_file('file1.tds2'))
         self.assertFalse(Workbook._is_valid_file('file2.twb3'))
 
+class WorkbookModelTests(unittest.TestCase):
+
+    def setUp(self):
+        self.workbook_file = tempfile.NamedTemporaryFile(suffix='.twb')
+        self.workbook_file.write(TABLEAU_93_WORKBOOK.encode('utf8'))
+        self.workbook_file.seek(0)
+
+    def test_can_extract_datasource(self):
+        wb = Workbook(self.workbook_file.name)
+        self.assertEqual(len(wb.datasources), 1)
+        self.assertIsInstance(wb.datasources[0], Datasource)
+        self.assertEqual(wb.datasources[0].name, 'sqlserver.17u3bqc16tjtxn14e2hxh19tyvpo')
+
+class DatasourceModelTests(unittest.TestCase):
+
+    def setUp(self):
+        self.tds_file = tempfile.NamedTemporaryFile(suffix='.tds')
+        self.tds_file.write(TABLEAU_93_TDS.encode('utf8'))
+        self.tds_file.seek(0)
+
+    def test_can_extract_datasource_from_file(self):
+        ds = Datasource.from_file(self.tds_file.name)
+        self.assertEqual(ds.name, 'sqlserver.17u3bqc16tjtxn14e2hxh19tyvpo')
+        self.assertEqual(ds.version, '9.3')
+
+    def test_can_extract_connection(self):
+        ds = Datasource.from_file(self.tds_file.name)
+        self.assertIsInstance(ds.connection, Connection)
+        self.assertEqual(ds.connection.dbname, 'TestV1')
+        self.assertEqual(ds.connection.server, 'mssql2012.test.tsi.lan')
+        self.assertEqual(ds.connection.username, '')
+
+class ConnectionModelTests(unittest.TestCase):
+
+    def setUp(self):
+        self.connection = TABLEAU_CONNECTION_XML
+
+    def test_can_read_attributes_from_connection(self):
+        conn = Connection(self.connection)
+        self.assertEqual(conn.dbname, 'TestV1')
+        self.assertEqual(conn.username, '')
+        self.assertEqual(conn.server, 'mssql2012.test.tsi.lan')
+
+    def test_can_write_attributes_to_connection(self):
+        conn = Connection(self.connection)
+        conn.dbname = 'BubblesInMyDrink'
+        conn.server = 'mssql2014.test.tsi.lan'
+        self.assertEqual(conn.dbname, 'BubblesInMyDrink')
+        self.assertEqual(conn.username, '')
+        self.assertEqual(conn.server, 'mssql2014.test.tsi.lan')
+
 if __name__ == '__main__':
     unittest.main()