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
|
diff --git a/src/nom/tam/fits/test/CompressTest.java b/src/nom/tam/fits/test/CompressTest.java
index dd3aad0..c6d953e 100644
--- a/src/nom/tam/fits/test/CompressTest.java
+++ b/src/nom/tam/fits/test/CompressTest.java
@@ -54,58 +54,57 @@ public class CompressTest {
@Test
public void testStream() throws Exception {
- InputStream is;
+ String is;
- is = new FileInputStream("test.fits");
+ is = "test.fits";
assertEquals("Stream1", 300, streamRead(is, false, false));
- is = new FileInputStream("test.fits.Z");
+ is = "test.fits.Z";
assertEquals("Stream2", 300, streamRead(is, false, false));
- is = new FileInputStream("test.fits.gz");
+ is = "test.fits.gz";
assertEquals("Stream3", 300, streamRead(is, false, false));
- is = new FileInputStream("test.fits");
+ is = "test.fits";
assertEquals("Stream4", 300, streamRead(is, false, true));
- is = new FileInputStream("test.fits.Z");
+ is = "test.fits.Z";
assertEquals("Stream5", 300, streamRead(is, false, true));
- is = new FileInputStream("test.fits.gz");
+ is = "test.fits.gz";
assertEquals("Stream6", 300, streamRead(is, false, true));
-
- is = new FileInputStream("test.fits.Z");
+ is = "test.fits.Z";
assertEquals("Stream7", 300, streamRead(is, true, true));
- is = new FileInputStream("test.fits.gz");
+ is = "test.fits.gz";
assertEquals("Stream8", 300, streamRead(is, true, true));
- is = new FileInputStream("test.fits.bz2");
+ is = "test.fits.bz2";
assertEquals("Stream9", 300, streamRead(is, true, true));
}
@Test
public void testFile() throws Exception {
- File is = new File("test.fits");
+ String is = "test.fits";
assertEquals("File1", 300, fileRead(is, false, false));
- is = new File("test.fits.Z");
+ is = "test.fits.Z";
assertEquals("File2", 300, fileRead(is, false, false));
- is = new File("test.fits.gz");
+ is = "test.fits.gz";
assertEquals("File3", 300, fileRead(is, false, false));
- is = new File("test.fits");
+ is = "test.fits";
assertEquals("File4", 300, fileRead(is, false, true));
- is = new File("test.fits.Z");
+ is = "test.fits.Z";
assertEquals("File7", 300, fileRead(is, true, true));
- is = new File("test.fits.gz");
+ is = "test.fits.gz";
assertEquals("File8", 300, fileRead(is, true, true));
- is = new File("test.fits.bz2");
+ is = "test.fits.bz2";
assertEquals("File9", 300, fileRead(is, true, true));
}
@@ -131,7 +130,6 @@ public class CompressTest {
is = "test.fits.bz2";
assertEquals("String8", 300, stringRead(is, true, true));
-
}
@Test
@@ -158,13 +156,9 @@ public class CompressTest {
assertEquals("String8", 300, urlRead(is, true, true));
}
- int urlRead(String is, boolean comp, boolean useComp)
+ int urlRead(String filename, boolean comp, boolean useComp)
throws Exception {
- File fil = new File(is);
-
- String path = fil.getCanonicalPath();
- URL u = new URL("file://" + path);
-
+ URL u = CompressTest.class.getResource(filename);
Fits f;
if (useComp) {
f = new Fits(u, comp);
@@ -176,8 +170,9 @@ public class CompressTest {
return total(data);
}
- int streamRead(InputStream is, boolean comp, boolean useComp)
+ int streamRead(String filename, boolean comp, boolean useComp)
throws Exception {
+ InputStream is = CompressTest.class.getResourceAsStream(filename);
Fits f;
if (useComp) {
f = new Fits(is, comp);
@@ -190,8 +185,9 @@ public class CompressTest {
return total(data);
}
- int fileRead(File is, boolean comp, boolean useComp)
+ int fileRead(String filename, boolean comp, boolean useComp)
throws Exception {
+ File is = new File(CompressTest.class.getResource(filename).getPath());
Fits f;
if (useComp) {
f = new Fits(is, comp);
@@ -203,8 +199,9 @@ public class CompressTest {
return total(data);
}
- int stringRead(String is, boolean comp, boolean useComp)
+ int stringRead(String filename, boolean comp, boolean useComp)
throws Exception {
+ String is = CompressTest.class.getResource(filename).getPath();
Fits f;
if (useComp) {
f = new Fits(is, comp);
|
GitWeb