Skip to content
This repository was archived by the owner on Jun 23, 2022. It is now read-only.

Commit 1eae590

Browse files
scgrayscgray
committed
Merge pull request #59 from scgray/ODPI-117
ODPI-117: Improvements in checking directory content
2 parents 0c59495 + ffb6ff9 commit 1eae590

8 files changed

Lines changed: 183 additions & 156 deletions

File tree

‎bigtop-tests/spec-tests/runtime/src/test/groovy/org/odpi/specs/runtime/TestSpecsRuntime.groovy‎

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ public class TestSpecsRuntime {
162162
case 'dircontent':
163163
def expectedFiles = []
164164
new File("${testsList}", "${arguments['referenceList']}").eachLine { line ->
165-
expectedFiles << line
165+
expectedFiles << ~line
166166
}
167167

168168
def baseDir = getEnv(arguments['baseDirEnv'], arguments['envcmd'])
@@ -187,9 +187,37 @@ public class TestSpecsRuntime {
187187
}
188188
}
189189

190+
def missingList = []
191+
for (def wantFile : expectedFiles) {
192+
def ok = false
193+
for (def haveFile : actualFiles) {
194+
if (haveFile =~ wantFile) {
195+
ok = true
196+
break
197+
}
198+
}
199+
if (! ok) {
200+
missingList << wantFile
201+
}
202+
}
203+
204+
def extraList = []
205+
for (def haveFile : actualFiles) {
206+
def ok = false
207+
for (def wantFile : expectedFiles) {
208+
if (haveFile =~ wantFile) {
209+
ok = true
210+
break
211+
}
212+
}
213+
if (! ok) {
214+
extraList << haveFile
215+
}
216+
}
217+
190218
def commonFiles = actualFiles.intersect(expectedFiles)
191-
Assert.assertTrue("${testName} fail: Directory content for ${dir.path} does not match reference. ",
192-
commonFiles.size()==actualFiles.size() && commonFiles.size()==expectedFiles.size())
219+
Assert.assertTrue("${testName} fail: Directory content for ${dir.path} does not match reference. Missing files: ${missingList}. Extra files: ${extraList}",
220+
missingList.size() == 0 && extraList.size() == 0)
193221
break
194222
case 'hadoop_tools':
195223
def toolsPathStr = getEnv("HADOOP_TOOLS_PATH", "hadoop envvars")

‎bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common-jar.list‎

Lines changed: 60 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,61 +1,60 @@
1-
api-util-1.0.0-M20.jar
2-
curator-recipes-2.7.1.jar
3-
curator-framework-2.7.1.jar
4-
netty-3.6.2.Final.jar
5-
gson-2.2.4.jar
6-
paranamer-2.3.jar
7-
jackson-core-asl-1.9.13.jar
8-
jackson-xc-1.9.13.jar
9-
jersey-server-1.9.jar
10-
stax-api-1.0-2.jar
11-
zookeeper-3.4.6.jar
12-
htrace-core-3.1.0-incubating.jar
13-
slf4j-api-1.7.10.jar
14-
avro-1.7.4.jar
15-
slf4j-log4j12-1.7.10.jar
16-
curator-client-2.7.1.jar
17-
jets3t-0.9.0.jar
18-
commons-net-3.1.jar
19-
jaxb-impl-2.2.3-1.jar
20-
httpclient-4.2.5.jar
21-
apacheds-kerberos-codec-2.0.0-M15.jar
22-
commons-cli-1.2.jar
23-
log4j-1.2.17.jar
24-
jackson-mapper-asl-1.9.13.jar
25-
java-xmlbuilder-0.4.jar
26-
jsp-api-2.1.jar
27-
guava-11.0.2.jar
28-
jetty-6.1.26.jar
29-
commons-logging-1.1.3.jar
30-
snappy-java-1.0.4.1.jar
31-
commons-httpclient-3.1.jar
32-
jsch-0.1.42.jar
33-
jersey-core-1.9.jar
34-
commons-compress-1.4.1.jar
35-
jettison-1.1.jar
36-
junit-4.11.jar
37-
commons-collections-3.2.1.jar
38-
xz-1.0.jar
39-
asm-3.2.jar
40-
commons-codec-1.4.jar
41-
commons-digester-1.8.jar
42-
api-asn1-api-1.0.0-M20.jar
43-
xmlenc-0.52.jar
44-
commons-configuration-1.6.jar
45-
mockito-all-1.8.5.jar
46-
commons-lang-2.6.jar
47-
jetty-util-6.1.26.jar
48-
jsr305-3.0.0.jar
49-
protobuf-java-2.5.0.jar
50-
httpcore-4.2.5.jar
51-
commons-io-2.4.jar
52-
activation-1.1.jar
53-
jersey-json-1.9.jar
54-
jaxb-api-2.2.2.jar
55-
commons-math3-3.1.1.jar
56-
hamcrest-core-1.3.jar
57-
commons-beanutils-core-1.8.0.jar
58-
apacheds-i18n-2.0.0-M15.jar
59-
servlet-api-2.5.jar
60-
commons-beanutils-1.7.0.jar
61-
jackson-jaxrs-1.9.13.jar
1+
api-util-1\.0\.0-M20([^.0-9].*)?\.jar
2+
curator-recipes-2\.7\.1([^.0-9].*)?\.jar
3+
curator-framework-2\.7\.1([^.0-9].*)?\.jar
4+
netty-3\.6\.2\.Final([^.0-9].*)?\.jar
5+
gson-2\.2\.4([^.0-9].*)?\.jar
6+
paranamer-2\.3([^.0-9].*)?\.jar
7+
jackson-core-asl-1\.9\.13([^.0-9].*)?\.jar
8+
jackson-xc-1\.9\.13([^.0-9].*)?\.jar
9+
jersey-server-1\.9([^.0-9].*)?\.jar
10+
stax-api-1\.0-2([^.0-9].*)?\.jar
11+
zookeeper-3\.4\.6([^.0-9].*)?\.jar
12+
htrace-core-3\.1\.0-incubating([^.0-9].*)?\.jar
13+
slf4j-api-1\.7\.10([^.0-9].*)?\.jar
14+
avro-1\.7\.[4-7]([^.0-9].*)?\.jar
15+
slf4j-log4j12-1\.7\.10([^.0-9].*)?\.jar
16+
curator-client-2\.7\.1([^.0-9].*)?\.jar
17+
jets3t-0\.9\.0([^.0-9].*)?\.jar
18+
commons-net-3\.1([^.0-9].*)?\.jar
19+
jaxb-impl-2\.2\.3-1([^.0-9].*)?\.jar
20+
httpclient-4\.2\.5([^.0-9].*)?\.jar
21+
apacheds-kerberos-codec-2\.0\.0-M15([^.0-9].*)?\.jar
22+
commons-cli-1\.2([^.0-9].*)?\.jar
23+
log4j-1\.2\.17([^.0-9].*)?\.jar
24+
jackson-mapper-asl-1\.9\.13([^.0-9].*)?\.jar
25+
java-xmlbuilder-0\.4([^.0-9].*)?\.jar
26+
jsp-api-2\.1([^.0-9].*)?\.jar
27+
guava-11\.0\.2([^.0-9].*)?\.jar
28+
jetty-6\.1\.26([^.0-9].*)?\.jar
29+
commons-logging-1\.1\.3([^.0-9].*)?\.jar
30+
snappy-java-1\.0\.[45](\.[0-9])?([^.0-9].*)?\.jar
31+
commons-httpclient-3\.1([^.0-9].*)?\.jar
32+
jsch-0\.1\.(4[2-9]|[5-9]\d)([^.0-9].*)?\.jar
33+
jersey-core-1\.9([^.0-9].*)?\.jar
34+
commons-compress-1\.4\.1([^.0-9].*)?\.jar
35+
jettison-1\.1([^.0-9].*)?\.jar
36+
junit-4\.11([^.0-9].*)?\.jar
37+
commons-collections-3\.2\.[12]([^.0-9].*)?\.jar
38+
xz-1\.0([^.0-9].*)?\.jar
39+
asm-3\.2([^.0-9].*)?\.jar
40+
commons-codec-1\.4([^.0-9].*)?\.jar
41+
commons-digester-1\.8([^.0-9].*)?\.jar
42+
api-asn1-api-1\.0\.0-M20([^.0-9].*)?\.jar
43+
xmlenc-0\.52([^.0-9].*)?\.jar
44+
commons-configuration-1\.6([^.0-9].*)?\.jar
45+
mockito-all-1\.8\.5([^.0-9].*)?\.jar
46+
commons-lang-2\.6([^.0-9].*)?\.jar
47+
jetty-util-6\.1\.26([^.0-9].*)?\.jar
48+
jsr305-3\.0\.0([^.0-9].*)?\.jar
49+
protobuf-java-2\.5\.0([^.0-9].*)?\.jar
50+
httpcore-4\.2\.5([^.0-9].*)?\.jar
51+
commons-io-2\.4([^.0-9].*)?\.jar
52+
activation-1\.1([^.0-9].*)?\.jar
53+
jersey-json-1\.9([^.0-9].*)?\.jar
54+
jaxb-api-2\.2\.2([^.0-9].*)?\.jar
55+
commons-math3-3\.1\.1([^.0-9].*)?\.jar
56+
hamcrest-core-1\.3([^.0-9].*)?\.jar
57+
commons-beanutils(-core)?-1\.[78]\.0([^.0-9].*)?\.jar
58+
apacheds-i18n-2\.0\.0-M15([^.0-9].*)?\.jar
59+
servlet-api-2\.5([^.0-9].*)?\.jar
60+
jackson-jaxrs-1\.9\.13([^.0-9].*)?\.jar

‎bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-common.list‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ client/hadoop-mapreduce-client-common-2\.7\.[0-9]([^.0-9].*)?\.jar
3838
client/commons-digester-1\.8([^.0-9].*)?\.jar
3939
client/curator-client-2\.7\.1([^.0-9].*)?\.jar
4040
client/httpclient([^.0-9].*)?\.jar
41-
client/commons-beanutils(-core)?-1\.8\.0([^.0-9].*)?\.jar
41+
client/commons-beanutils(-core)?-1\.[78]\.0([^.0-9].*)?\.jar
4242
client/jsp-api-2\.1([^.0-9].*)?\.jar
4343
client/leveldbjni-all-1\.8([^.0-9].*)?\.jar
4444
client/slf4j-api-1\.7\.10([^.0-9].*)?\.jar
@@ -164,7 +164,7 @@ lib/commons-configuration-1\.6([^.0-9].*)?\.jar
164164
lib/commons-cli-1\.2([^.0-9].*)?\.jar
165165
lib/commons-digester-1\.8([^.0-9].*)?\.jar
166166
lib/curator-client-2\.7\.1([^.0-9].*)?\.jar
167-
lib/commons-beanutils(-core)?-1\.8\.0([^.0-9].*)?\.jar
167+
lib/commons-beanutils(-core)?-1\.[78]\.0([^.0-9].*)?\.jar
168168
lib/jsp-api-2\.1([^.0-9].*)?\.jar
169169
lib/jets3t-0\.9\.0([^.0-9].*)?\.jar
170170
lib/slf4j-api-1\.7\.10([^.0-9].*)?\.jar

‎bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-hdfs-jar.list‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
1-
netty-3.6.2.Final.jar
2-
leveldbjni-all-1.8.jar
3-
jackson-core-asl-1.9.13.jar
4-
jersey-server-1.9.jar
5-
htrace-core-3.1.0-incubating.jar
6-
commons-daemon-1.0.13.jar
7-
commons-cli-1.2.jar
8-
log4j-1.2.17.jar
9-
jackson-mapper-asl-1.9.13.jar
10-
guava-11.0.2.jar
11-
jetty-6.1.26.jar
12-
commons-logging-1.1.3.jar
13-
jersey-core-1.9.jar
14-
asm-3.2.jar
15-
commons-codec-1.4.jar
16-
xml-apis-1.3.04.jar
17-
xercesImpl-2.9.1.jar
18-
xmlenc-0.52.jar
19-
commons-lang-2.6.jar
20-
netty-all-4.0.23.Final.jar
21-
jetty-util-6.1.26.jar
22-
jsr305-3.0.0.jar
23-
protobuf-java-2.5.0.jar
24-
commons-io-2.4.jar
25-
servlet-api-2.5.jar
1+
netty-3\.6\.2\.Final([^.0-9].*)?\.jar
2+
leveldbjni-all-1\.8([^.0-9].*)?\.jar
3+
jackson-core-asl-1\.9\.13([^.0-9].*)?\.jar
4+
jersey-server-1\.9([^.0-9].*)?\.jar
5+
htrace-core-3\.1\.0-incubating([^.0-9].*)?\.jar
6+
commons-daemon-1\.0\.13([^.0-9].*)?\.jar
7+
commons-cli-1\.2([^.0-9].*)?\.jar
8+
log4j-1\.2\.17([^.0-9].*)?\.jar
9+
jackson-mapper-asl-1\.9\.13([^.0-9].*)?\.jar
10+
guava-11\.0\.2([^.0-9].*)?\.jar
11+
jetty-6\.1\.26([^.0-9].*)?\.jar
12+
commons-logging-1\.1\.3([^.0-9].*)?\.jar
13+
jersey-core-1\.9([^.0-9].*)?\.jar
14+
asm-3\.2([^.0-9].*)?\.jar
15+
commons-codec-1\.4([^.0-9].*)?\.jar
16+
xml-apis-1\.3\.04([^.0-9].*)?\.jar
17+
xercesImpl-2\.9\.1([^.0-9].*)?\.jar
18+
xmlenc-0\.52([^.0-9].*)?\.jar
19+
commons-lang-2\.6([^.0-9].*)?\.jar
20+
netty-all-4\.0\.23\.Final([^.0-9].*)?\.jar
21+
jetty-util-6\.1\.26([^.0-9].*)?\.jar
22+
jsr305-3\.0\.0([^.0-9].*)?\.jar
23+
protobuf-java-2\.5\.0([^.0-9].*)?\.jar
24+
commons-io-2\.4([^.0-9].*)?\.jar
25+
servlet-api-2\.5([^.0-9].*)?\.jar

‎bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce-jar.list‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
1-
netty-3.6.2.Final.jar
2-
leveldbjni-all-1.8.jar
3-
paranamer-2.3.jar
4-
jackson-core-asl-1.9.13.jar
5-
jersey-server-1.9.jar
6-
guice-3.0.jar
7-
avro-1.7.4.jar
8-
log4j-1.2.17.jar
9-
jackson-mapper-asl-1.9.13.jar
10-
snappy-java-1.0.4.1.jar
11-
jersey-core-1.9.jar
12-
jersey-guice-1.9.jar
13-
commons-compress-1.4.1.jar
14-
junit-4.11.jar
15-
xz-1.0.jar
16-
asm-3.2.jar
17-
aopalliance-1.0.jar
18-
javax.inject-1.jar
19-
protobuf-java-2.5.0.jar
20-
commons-io-2.4.jar
21-
hamcrest-core-1.3.jar
22-
guice-servlet-3.0.jar
1+
netty-3\.6\.2\.Final([^.0-9].*)?\.jar
2+
leveldbjni-all-1\.8([^.0-9].*)?\.jar
3+
paranamer-2\.3([^.0-9].*)?\.jar
4+
jackson-core-asl-1\.9\.13([^.0-9].*)?\.jar
5+
jersey-server-1\.9([^.0-9].*)?\.jar
6+
guice-3\.0([^.0-9].*)?\.jar
7+
avro-1\.7\.[4-7]([^.0-9].*)?\.jar
8+
log4j-1\.2\.17([^.0-9].*)?\.jar
9+
jackson-mapper-asl-1\.9\.13([^.0-9].*)?\.jar
10+
snappy-java-1\.0\.[45](\.[0-9])?([^.0-9].*)?\.jar
11+
jersey-core-1\.9([^.0-9].*)?\.jar
12+
jersey-guice-1\.9([^.0-9].*)?\.jar
13+
commons-compress-1\.4\.1([^.0-9].*)?\.jar
14+
junit-4\.11([^.0-9].*)?\.jar
15+
xz-1\.0([^.0-9].*)?\.jar
16+
asm-3\.2([^.0-9].*)?\.jar
17+
aopalliance-1\.0([^.0-9].*)?\.jar
18+
javax\.inject-1([^.0-9].*)?\.jar
19+
protobuf-java-2\.5\.0([^.0-9].*)?\.jar
20+
commons-io-2\.4([^.0-9].*)?\.jar
21+
hamcrest-core-1\.3([^.0-9].*)?\.jar
22+
guice-servlet-3\.0([^.0-9].*)?\.jar

‎bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-mapreduce.list‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ commons-cli-1\.2([^.0-9].*)?\.jar
1212
hadoop-mapreduce-client-common-2\.7\.[0-9]([^.0-9].*)?\.jar
1313
commons-digester-1\.8([^.0-9].*)?\.jar
1414
curator-client-2\.7\.1([^.0-9].*)?\.jar
15-
commons-beanutils(-core)?-1\.8\.0([^.0-9].*)?\.jar
15+
commons-beanutils(-core)?-1\.[78]\.0([^.0-9].*)?\.jar
1616
jsp-api-2\.1([^.0-9].*)?\.jar
1717
jets3t-0\.9\.0([^.0-9].*)?\.jar
1818
hadoop-sls-2\.7\.[0-9]([^.0-9].*)?\.jar

‎bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-subprojs.list‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
hadoop-annotations.jar
2-
hadoop-auth.jar
3-
hadoop-common.jar
4-
hadoop-nfs.jar
1+
hadoop-annotations\.jar
2+
hadoop-auth\.jar
3+
hadoop-common\.jar
4+
hadoop-nfs\.jar

‎bigtop-tests/spec-tests/runtime/src/test/resources/hadoop-yarn-jar.list‎

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
netty-3.6.2.Final.jar
2-
leveldbjni-all-1.8.jar
3-
jackson-core-asl-1.9.13.jar
4-
jackson-xc-1.9.13.jar
5-
jersey-server-1.9.jar
6-
stax-api-1.0-2.jar
7-
zookeeper-3.4.6.jar
8-
guice-3.0.jar
9-
jaxb-impl-2.2.3-1.jar
10-
zookeeper-3.4.6-tests.jar
11-
jersey-client-1.9.jar
12-
commons-cli-1.2.jar
13-
log4j-1.2.17.jar
14-
jackson-mapper-asl-1.9.13.jar
15-
guava-11.0.2.jar
16-
jetty-6.1.26.jar
17-
commons-logging-1.1.3.jar
18-
jersey-core-1.9.jar
19-
jersey-guice-1.9.jar
20-
commons-compress-1.4.1.jar
21-
jettison-1.1.jar
22-
commons-collections-3.2.1.jar
23-
xz-1.0.jar
24-
asm-3.2.jar
25-
commons-codec-1.4.jar
26-
aopalliance-1.0.jar
27-
javax.inject-1.jar
28-
commons-lang-2.6.jar
29-
jetty-util-6.1.26.jar
30-
jsr305-3.0.0.jar
31-
protobuf-java-2.5.0.jar
32-
commons-io-2.4.jar
33-
activation-1.1.jar
34-
jersey-json-1.9.jar
35-
jaxb-api-2.2.2.jar
36-
guice-servlet-3.0.jar
37-
servlet-api-2.5.jar
38-
jackson-jaxrs-1.9.13.jar
1+
netty-3\.6\.2\.Final([^.0-9].*)?\.jar
2+
leveldbjni-all-1\.8([^.0-9].*)?\.jar
3+
jackson-core-asl-1\.9\.13([^.0-9].*)?\.jar
4+
jackson-xc-1\.9\.13([^.0-9].*)?\.jar
5+
jersey-server-1\.9([^.0-9].*)?\.jar
6+
stax-api-1\.0-2([^.0-9].*)?\.jar
7+
zookeeper-3\.4\.6([^.0-9].*)?\.jar
8+
guice-3\.0([^.0-9].*)?\.jar
9+
jaxb-impl-2\.2\.3-1([^.0-9].*)?\.jar
10+
zookeeper-3\.4\.6([^.0-9].*)?-tests\.jar
11+
jersey-client-1\.9([^.0-9].*)?\.jar
12+
commons-cli-1\.2([^.0-9].*)?\.jar
13+
log4j-1\.2\.17([^.0-9].*)?\.jar
14+
jackson-mapper-asl-1\.9\.13([^.0-9].*)?\.jar
15+
guava-11\.0\.2([^.0-9].*)?\.jar
16+
jetty-6\.1\.26([^.0-9].*)?\.jar
17+
commons-logging-1\.1\.3([^.0-9].*)?\.jar
18+
jersey-core-1\.9([^.0-9].*)?\.jar
19+
jersey-guice-1\.9([^.0-9].*)?\.jar
20+
commons-compress-1\.4\.1([^.0-9].*)?\.jar
21+
jettison-1\.1([^.0-9].*)?\.jar
22+
commons-collections-3\.2\.[12]([^.0-9].*)?\.jar
23+
xz-1\.0([^.0-9].*)?\.jar
24+
asm-3\.2([^.0-9].*)?\.jar
25+
commons-codec-1\.4([^.0-9].*)?\.jar
26+
aopalliance-1\.0([^.0-9].*)?\.jar
27+
javax\.inject-1([^.0-9].*)?\.jar
28+
commons-lang-2\.6([^.0-9].*)?\.jar
29+
jetty-util-6\.1\.26([^.0-9].*)?\.jar
30+
jsr305-3\.0\.0([^.0-9].*)?\.jar
31+
protobuf-java-2\.5\.0([^.0-9].*)?\.jar
32+
commons-io-2\.4([^.0-9].*)?\.jar
33+
activation-1\.1([^.0-9].*)?\.jar
34+
jersey-json-1\.9([^.0-9].*)?\.jar
35+
jaxb-api-2\.2\.2([^.0-9].*)?\.jar
36+
guice-servlet-3\.0([^.0-9].*)?\.jar
37+
servlet-api-2\.5([^.0-9].*)?\.jar
38+
jackson-jaxrs-1\.9\.13([^.0-9].*)?\.jar

0 commit comments

Comments
 (0)