add missing test file

remove cruft from TapSchemaDAOTest
opencadc · Oct 2, 2024 · ff996e3 · ff996e3
1 parent af7e684
commit ff996e3
Show file tree

Hide file tree

Showing 2 changed files with 56 additions and 6 deletions.
diff --git a/cadc-tap-schema/src/intTest/java/ca/nrc/cadc/tap/schema/TapSchemaDAOTest.java b/cadc-tap-schema/src/intTest/java/ca/nrc/cadc/tap/schema/TapSchemaDAOTest.java
@@ -103,13 +103,8 @@ public class TapSchemaDAOTest extends TestUtil {
     }
 
     public TapSchemaDAOTest() {
-        // create a datasource and register with JNDI
+        super();
         try {
-            DBConfig conf = new DBConfig();
-            ConnectionConfig cc = conf.getConnectionConfig("TAP_SCHEMA_TEST", "cadctest");
-            dataSource = DBUtil.getDataSource(cc);
-            log.info("configured data source: " + cc.getServer() + "," + cc.getDatabase() + "," + cc.getDriver() + "," + cc.getURL());
-
             // init creates the tap_schema tables and populates with self-describing content
             log.info("InitDatabaseTS: START");
             InitDatabaseTS init = new InitDatabaseTS(dataSource, "cadctest", "tap_schema");

diff --git a/youcat/src/intTest/resources/binary-vot.xml b/youcat/src/intTest/resources/binary-vot.xml
@@ -0,0 +1,55 @@
+<?xml version='1.0'?>
+<VOTABLE version="1.2"
+ xmlns="http://www.ivoa.net/xml/VOTable/v1.2">
+<!--
+ !  VOTable written by STIL version 4.2-1+ (uk.ac.starlink.votable.VOTableWriter)
+ !  at 2024-08-19T19:31:57
+ !-->
+<RESOURCE>
+<TABLE name="votable" nrows="23">
+<FIELD datatype="short" name="d_short">
+<VALUES null='-32768'/>
+</FIELD>
+<FIELD datatype="int" name="d_int">
+<VALUES null='-2147483648'/>
+</FIELD>
+<FIELD datatype="long" name="d_long">
+<VALUES null='-9223372036854775808'/>
+</FIELD>
+<FIELD datatype="float" name="d_float"/>
+<FIELD datatype="double" name="d_double"/>
+<FIELD arraysize="1" datatype="char" name="d_char"/>
+<FIELD arraysize="2" datatype="char" name="d_string"/>
+<FIELD arraysize="19" datatype="char" name="d_time" xtype="timestamp"/>
+<DATA>
+<BINARY>
+<STREAM encoding='base64'>
+AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABBMAAyMDAwLTAxLTAxVDAwOjAwOjAw
+AAEAAAABAAAAAAAAAAE/kAAAP/IAAAAAAABCMQAyMDAwLTAxLTAyVDAwOjE0OjI0
+AAIAAAACAAAAAAAAAAJAEAAAQAIAAAAAAABDMgAyMDAwLTAxLTAzVDAwOjI4OjQ4
+AAMAAAADAAAAAAAAAANAWAAAQAsAAAAAAABEMwAyMDAwLTAxLTA0VDAwOjQzOjEy
+AAQAAAAEAAAAAAAAAARAkAAAQBIAAAAAAABFNAAyMDAwLTAxLTA1VDAwOjU3OjM2
+AAUAAAAFAAAAAAAAAAVAtAAAQBaAAAAAAABGNQAyMDAwLTAxLTA2VDAxOjEyOjAw
+AAYAAAAGAAAAAAAAAAZA2AAAQBsAAAAAAABHNgAyMDAwLTAxLTA3VDAxOjI2OjI0
+AAcAAAAHAAAAAAAAAAdA/AAAQB+AAAAAAABINwAyMDAwLTAxLTA4VDAxOjQwOjQ4
+AAgAAAAIAAAAAAAAAAhBEAAAQCIAAAAAAABJOAAyMDAwLTAxLTA5VDAxOjU1OjEy
+AAkAAAAJAAAAAAAAAAlBIgAAQCRAAAAAAABKOQAyMDAwLTAxLTEwVDAyOjA5OjM2
+AAoAAAAKAAAAAAAAAApBNAAAQCaAAAAAAABLMTAyMDAwLTAxLTExVDAyOjI0OjAw
+AAsAAAALAAAAAAAAAAtBRgAAQCjAAAAAAABMMTEyMDAwLTAxLTEyVDAyOjM4OjI0
+AAwAAAAMAAAAAAAAAAxBWAAAQCsAAAAAAABNMTIyMDAwLTAxLTEzVDAyOjUyOjQ4
+AA0AAAANAAAAAAAAAA1BagAAQC1AAAAAAABOMTMyMDAwLTAxLTE0VDAzOjA3OjEy
+AA4AAAAOAAAAAAAAAA5BfAAAQC+AAAAAAABPMTQyMDAwLTAxLTE1VDAzOjIxOjM2
+AA8AAAAPAAAAAAAAAA9BhwAAQDDgAAAAAABQMTUyMDAwLTAxLTE2VDAzOjM2OjAw
+ABAAAAAQAAAAAAAAABBBkAAAQDIAAAAAAABRMTYyMDAwLTAxLTE3VDAzOjUwOjI0
+ABEAAAARAAAAAAAAABFBmQAAQDMgAAAAAABSMTcyMDAwLTAxLTE4VDA0OjA0OjQ4
+ABIAAAASAAAAAAAAABJBogAAQDRAAAAAAABTMTgyMDAwLTAxLTE5VDA0OjE5OjEy
+ABMAAAATAAAAAAAAABNBqwAAQDVgAAAAAABUMTkyMDAwLTAxLTIwVDA0OjMzOjM2
+ABQAAAAUAAAAAAAAABRBtAAAQDaAAAAAAABVMjAyMDAwLTAxLTIxVDA0OjQ4OjAw
+ABUAAAAVAAAAAAAAABVBvQAAQDegAAAAAABWMjEyMDAwLTAxLTIyVDA1OjAyOjI0
+gACAAAAAgAAAAAAAAAB/wAAAf/gAAAAAAABXMjIyMDAwLTAxLTIzVDA1OjE2OjQ4
+</STREAM>
+</BINARY>
+</DATA>
+</TABLE>
+</RESOURCE>
+</VOTABLE>