1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
|
From: Ole Streicher <olebole@debian.org>
Date: Mon, 20 Feb 2017 11:01:05 +0100
Subject: Exclude some tests
FormatsTest and StorageTest depend on fits and votable, which shall
not be build-deps to avoid circular dependencies. So, during build we can't
test them. However, for CI tests we have everything available, and they
will be included in the test.
The FormatsTest needs to be adjusted to the supported formats.
---
build.xml | 11 ++++++
.../uk/ac/starlink/table/FormatsTest.java | 45 ++--------------------
2 files changed, 14 insertions(+), 42 deletions(-)
diff --git a/build.xml b/build.xml
index b32745b..910b2c3 100644
--- a/build.xml
+++ b/build.xml
@@ -316,6 +316,11 @@
classname="uk.ac.starlink.util.DataSource"/>
<fail message="No Util available" unless="util.present"/>
+ <!-- Need Votable and Fits for some testcases, not essential -->
+ <available property="votable.present"
+ classpathref="classpath"
+ classname="uk.ac.starlink.votable.VOTableWriter"/>
+
<!-- Need JUnit for testcases, not essential -->
<available property="junit.present"
classpathref="classpath"
@@ -934,6 +939,9 @@
<classpath refid="tests-classpath"/>
<exclude name="uk/ac/starlink/table/join/SkyPixellatorTest.java"/>
+ <exclude name="uk/ac/starlink/table/FormatsTest.java" unless="votable.present"/>
+ <exclude name="uk/ac/starlink/table/HealpixTest.java" unless="votable.present"/>
+ <exclude name="uk/ac/starlink/table/storage/StorageTest.java" unless="votable.present"/>
</javac>
@@ -972,6 +980,9 @@
<fileset dir="${tests.dir}">
<include name="**/*Test*"/>
<exclude name="uk/ac/starlink/table/join/SkyPixellatorTest.java"/>
+ <exclude name="uk/ac/starlink/table/FormatsTest.java" unless="votable.present"/>
+ <exclude name="uk/ac/starlink/table/HealpixTest.java" unless="votable.present"/>
+ <exclude name="uk/ac/starlink/table/storage/StorageTest.java" unless="votable.present"/>
</fileset>
</batchtest>
diff --git a/src/testcases/uk/ac/starlink/table/FormatsTest.java b/src/testcases/uk/ac/starlink/table/FormatsTest.java
index 87497e6..6aafb93 100644
--- a/src/testcases/uk/ac/starlink/table/FormatsTest.java
+++ b/src/testcases/uk/ac/starlink/table/FormatsTest.java
@@ -22,8 +22,6 @@ import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
import uk.ac.starlink.ecsv.EcsvTableBuilder;
import uk.ac.starlink.ecsv.EcsvTableWriter;
-import uk.ac.starlink.feather.FeatherTableBuilder;
-import uk.ac.starlink.feather.FeatherTableWriter;
import uk.ac.starlink.fits.AbstractFitsTableWriter;
import uk.ac.starlink.fits.AbstractWideFits;
import uk.ac.starlink.fits.BintableStarTable;
@@ -34,8 +32,6 @@ import uk.ac.starlink.fits.FitsTableWriter;
import uk.ac.starlink.fits.HealpixFitsTableWriter;
import uk.ac.starlink.fits.VariableFitsTableWriter;
import uk.ac.starlink.fits.WideFits;
-import uk.ac.starlink.parquet.ParquetTableBuilder;
-import uk.ac.starlink.parquet.ParquetTableWriter;
import uk.ac.starlink.table.storage.AdaptiveByteStore;
import uk.ac.starlink.table.storage.ByteStoreRowStore;
import uk.ac.starlink.table.storage.FileByteStore;
@@ -99,9 +95,7 @@ public class FormatsTest extends TableCase {
LogUtils.getLogger( "uk.ac.starlink.table" ).setLevel( Level.WARNING );
LogUtils.getLogger( "uk.ac.starlink.fits" ).setLevel( Level.SEVERE );
LogUtils.getLogger( "uk.ac.starlink.votable" ).setLevel( Level.WARNING);
- LogUtils.getLogger( "uk.ac.starlink.feather" ).setLevel( Level.SEVERE );
LogUtils.getLogger( "uk.ac.starlink.ecsv" ).setLevel( Level.SEVERE );
- LogUtils.getLogger( "uk.ac.starlink.parquet" ).setLevel( Level.WARNING);
}
private StarTable table;
@@ -200,8 +194,8 @@ public class FormatsTest extends TableCase {
String[] fnames = new String[] {
"fits-basic", "fits-plus", "fits-var", "fits-healpix",
"colfits-basic", "colfits-plus",
- "votable", "ecsv", "feather", "text", "ascii", "csv",
- "ipac", "tst", "html", "latex", "mirage",
+ "votable", "ecsv", "text", "ascii", "csv",
+ "ipac", "tst", "html", "latex",
};
for ( String fname : fnames ) {
assertNotNull( tout.getHandler( fname ) );
@@ -211,7 +205,7 @@ public class FormatsTest extends TableCase {
StarTableFactory tfact = new StarTableFactory();
String[] bnames = new String[] {
"fits", "colfits-basic", "colfits-plus",
- "votable", "cdf", "ecsv", "parquet", "feather",
+ "votable", "cdf", "ecsv",
};
for ( String bname : bnames ) {
assertNotNull( tfact.getTableBuilder( bname ) );
@@ -275,11 +269,7 @@ public class FormatsTest extends TableCase {
"VOTable",
"CDF",
"ECSV",
- "PDS4",
"MRT",
- "parquet",
- "feather",
- "GBIN",
};
String[] knownFormats = new String[] {
"FITS-plus",
@@ -289,11 +279,7 @@ public class FormatsTest extends TableCase {
"VOTable",
"CDF",
"ECSV",
- "PDS4",
"MRT",
- "parquet",
- "feather",
- "GBIN",
"ASCII",
"CSV",
"TST",
@@ -344,8 +330,6 @@ public class FormatsTest extends TableCase {
"colfits-basic",
"votable",
"ecsv",
- "parquet",
- "feather",
"text",
"ascii",
"csv",
@@ -353,7 +337,6 @@ public class FormatsTest extends TableCase {
"tst",
"html",
"latex",
- "mirage",
};
String[] gotFormats = new String[ handlers.size() ];
for ( int j = 0; j < handlers.size(); j++ ) {
@@ -555,22 +538,6 @@ public class FormatsTest extends TableCase {
new EcsvTableBuilder(), "ecsv" );
exerciseReadWrite( EcsvTableWriter.COMMA_WRITER,
new EcsvTableBuilder(), "ecsv" );
-
- ParquetTableBuilder parquetBuilder = new ParquetTableBuilder();
- ParquetTableWriter parquetWriter = new ParquetTableWriter();
- parquetBuilder.setCacheCols( Boolean.FALSE );
- parquetWriter.setGroupArray( false );
- exerciseReadWrite( parquetWriter, parquetBuilder, "parquet");
- parquetBuilder.setCacheCols( Boolean.TRUE );
- parquetWriter.setGroupArray( true );
- exerciseReadWrite( parquetWriter, parquetBuilder, "parquet");
-
- exerciseReadWrite(
- new FeatherTableWriter( false, StoragePolicy.PREFER_MEMORY ),
- new FeatherTableBuilder(), "feather" );
- exerciseReadWrite(
- new FeatherTableWriter( true, StoragePolicy.PREFER_MEMORY ),
- new FeatherTableBuilder(), "feather" );
exerciseReadWrite( new AsciiTableWriter(),
new AsciiTableBuilder(), "text" );
exerciseReadWrite( new CsvTableWriter( true ),
@@ -648,12 +615,6 @@ public class FormatsTest extends TableCase {
else if ( "ecsv".equals( equalMethod ) ) {
assertEcsvTableEquals( t1, t2 );
}
- else if ( "parquet".equals( equalMethod ) ) {
- assertParquetTableEquals( t1, t2 );
- }
- else if ( "feather".equals( equalMethod ) ) {
- assertFeatherTableEquals( t1, t2 );
- }
else if ( "exact".equals( equalMethod ) ) {
assertTableEquals( t1, t2 );
}
|
