Skip to content

Commit 382ccba

Browse files
BillFarberBillFarber
committed
Pretty good start at moving from scripts to Gradle for test-complete setup
This handles *most* of the tests up through the temporal tests. There are still about 10 tests failing before getting to the temporal tests.
1 parent 76ba6f2 commit 382ccba

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+4512
-5
lines changed

‎test-complete-app/build.gradle‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,32 @@ ext {
1818
command.setValidFor(365)
1919
mlAppDeployer.commands.add(command)
2020
}
21+
22+
tasks.register("curlPeople", Exec) {
23+
commandLine = [
24+
'curl',
25+
'--fail',
26+
'--anyauth', '--user', 'admin:admin',
27+
'-i',
28+
'-X', 'POST',
29+
'--data-binary', '@./src/main/turtle/people/people.ttl',
30+
'-H', 'Content-type: text/turtle',
31+
'http://localhost:8079/v1/graphs?graph=/people'
32+
]
33+
}
34+
35+
tasks.register("curlCompanies", Exec) {
36+
commandLine = [
37+
'curl',
38+
'--fail',
39+
'--anyauth', '--user', 'admin:admin',
40+
'-i',
41+
'-X', 'POST',
42+
'--data-binary', '@./src/main/turtle/companies/companies_100.ttl',
43+
'-H', 'Content-type: text/turtle',
44+
'http://localhost:8079/v1/graphs?graph=/optic/sparql/test/companies.ttl'
45+
]
46+
}
47+
48+
mlDeploy.finalizedBy curlPeople
49+
mlDeploy.finalizedBy curlCompanies

‎test-complete-app/gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,6 @@ mlUsername=admin
33
mlPassword=admin
44

55
mlNoRestServer=true
6+
mlModulesDatabaseName=nodeOpticFunctionalTestModules
7+
mlSchemasDatabaseName=Schemas
8+
mlRestPort=8079

‎test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server-modules.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"database-name": "dmsdk-api-rest-server-modules"
3+
}

‎test-complete-app/src/main/ml-config/databases/dmsdk-api-rest-server.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"database-name": "dmsdk-api-rest-server",
3+
"schema-database": "Schemas",
4+
"range-element-index": [
5+
]
6+
}

‎test-complete-app/src/main/ml-config/databases/node-client-api-rest-server-modules.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"database-name": "node-client-api-rest-server-modules"
3+
}

‎test-complete-app/src/main/ml-config/databases/node-client-api-rest-server.json‎

Lines changed: 190 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
{
2+
"database-name": "node-client-api-rest-server",
3+
"schema-database": "Schemas",
4+
"range-element-index": [
5+
{
6+
"scalar-type": "double",
7+
"namespace-uri": "",
8+
"localname": "score",
9+
"range-value-positions": false,
10+
"invalid-values": "ignore"
11+
},
12+
{
13+
"scalar-type": "int",
14+
"namespace-uri": "",
15+
"localname": "popularity",
16+
"range-value-positions": false,
17+
"invalid-values": "ignore"
18+
},
19+
{
20+
"scalar-type": "int",
21+
"namespace-uri": "",
22+
"localname": "rate",
23+
"range-value-positions": false,
24+
"invalid-values": "ignore"
25+
},
26+
{
27+
"scalar-type": "dateTime",
28+
"namespace-uri": "",
29+
"localname": "datetime",
30+
"range-value-positions": false,
31+
"invalid-values": "ignore"
32+
}
33+
],
34+
"range-path-index": [
35+
{
36+
"scalar-type": "decimal",
37+
"path-expression": "price/amt",
38+
"collation": "",
39+
"range-value-positions": false,
40+
"invalid-values": "reject"
41+
}
42+
],
43+
"geospatial-path-index": [
44+
{
45+
"path-expression": "gElemChildParent/gElemChildPoint",
46+
"coordinate-system": "wgs84",
47+
"point-format": "point",
48+
"range-value-positions": false,
49+
"invalid-values": "reject"
50+
}
51+
],
52+
"geospatial-element-index": [
53+
{
54+
"namespace-uri": "",
55+
"localname": "gElemPoint",
56+
"coordinate-system": "wgs84",
57+
"point-format": "point",
58+
"range-value-positions": false,
59+
"invalid-values": "reject"
60+
},
61+
{
62+
"namespace-uri": "",
63+
"localname": "gElemPointWgs84Double",
64+
"coordinate-system": "wgs84/double",
65+
"point-format": "point",
66+
"range-value-positions": false,
67+
"invalid-values": "reject"
68+
}
69+
],
70+
"geospatial-element-child-index": [
71+
{
72+
"parent-namespace-uri": "",
73+
"parent-localname": "gElemChildParent",
74+
"namespace-uri": "",
75+
"localname": "gElemChildPoint",
76+
"coordinate-system": "wgs84",
77+
"point-format": "point",
78+
"range-value-positions": false,
79+
"invalid-values": "reject"
80+
},
81+
{
82+
"parent-namespace-uri": "",
83+
"parent-localname": "gElemChildParentEtrs89Double",
84+
"namespace-uri": "",
85+
"localname": "gElemChildPointEtrs89Double",
86+
"coordinate-system": "etrs89/double",
87+
"point-format": "point",
88+
"range-value-positions": false,
89+
"invalid-values": "reject"
90+
}
91+
],
92+
"geospatial-element-pair-index": [
93+
{
94+
"parent-namespace-uri": "",
95+
"parent-localname": "gElemPair",
96+
"latitude-namespace-uri": "",
97+
"latitude-localname": "latitude",
98+
"longitude-namespace-uri": "",
99+
"longitude-localname": "longitude",
100+
"coordinate-system": "wgs84",
101+
"range-value-positions": false,
102+
"invalid-values": "reject"
103+
},
104+
{
105+
"parent-namespace-uri": "",
106+
"parent-localname": "gElemPairRawDouble",
107+
"latitude-namespace-uri": "",
108+
"latitude-localname": "latitudeRawDouble",
109+
"longitude-namespace-uri": "",
110+
"longitude-localname": "longitudeRawDouble",
111+
"coordinate-system": "raw/double",
112+
"range-value-positions": false,
113+
"invalid-values": "reject"
114+
}
115+
],
116+
"geospatial-element-attribute-pair-index": [
117+
{
118+
"parent-namespace-uri": "",
119+
"parent-localname": "gAttrPair",
120+
"latitude-namespace-uri": "",
121+
"latitude-localname": "latitude",
122+
"longitude-namespace-uri": "",
123+
"longitude-localname": "longitude",
124+
"coordinate-system": "wgs84",
125+
"range-value-positions": false,
126+
"invalid-values": "reject"
127+
}
128+
],
129+
"geospatial-region-path-index": [
130+
{
131+
"path-expression": "/root/item/point",
132+
"coordinate-system": "wgs84",
133+
"geohash-precision": 1,
134+
"invalid-values": "reject"
135+
},
136+
{
137+
"path-expression": "/root/item/linestring",
138+
"coordinate-system": "wgs84/double",
139+
"geohash-precision": 2,
140+
"invalid-values": "ignore"
141+
},
142+
{
143+
"path-expression": "/root/item/circle",
144+
"coordinate-system": "wgs84/double",
145+
"geohash-precision": 1,
146+
"invalid-values": "reject"
147+
},
148+
{
149+
"path-expression": "/root/item/circle",
150+
"coordinate-system": "wgs84",
151+
"geohash-precision": 1,
152+
"invalid-values": "reject"
153+
},
154+
{
155+
"path-expression": "/root/item/box",
156+
"coordinate-system": "wgs84/double",
157+
"geohash-precision": 2,
158+
"invalid-values": "ignore"
159+
},
160+
{
161+
"path-expression": "/root/item/polygon",
162+
"coordinate-system": "wgs84",
163+
"geohash-precision": 3,
164+
"invalid-values": "reject"
165+
},
166+
{
167+
"path-expression": "/root/item/complex-polygon",
168+
"coordinate-system": "wgs84",
169+
"geohash-precision": 1,
170+
"invalid-values": "ignore"
171+
}
172+
],
173+
"element-word-lexicon": [
174+
{
175+
"collation": "http://marklogic.com/collation/",
176+
"namespace-uri": "",
177+
"localname": "defaultWordKey"
178+
},
179+
{
180+
"collation": "http://marklogic.com/collation/",
181+
"namespace-uri": "",
182+
"localname": "taggedWordKey"
183+
},
184+
{
185+
"collation": "http://marklogic.com/collation/",
186+
"namespace-uri": "",
187+
"localname": "otherKey"
188+
}
189+
]
190+
}

‎test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTest.json‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
{
2+
"database-name": "nodeOpticFunctionalTest",
3+
"schema-database": "Schemas",
4+
"fast-element-trailing-wildcard-searches": true,
5+
"two-character-searches": true,
6+
"one-character-searches": true,
7+
"uri-lexicon": true,
8+
"range-element-index": [
9+
{
10+
"scalar-type": "string",
11+
"collation": "http://marklogic.com/collation/",
12+
"namespace-uri": "",
13+
"localname": "city",
14+
"range-value-positions": false,
15+
"invalid-values": "ignore"
16+
},
17+
{
18+
"scalar-type": "string",
19+
"collation": "http://marklogic.com/collation/",
20+
"namespace-uri": "",
21+
"localname": "cityName",
22+
"range-value-positions": false,
23+
"invalid-values": "ignore"
24+
},
25+
{
26+
"scalar-type": "string",
27+
"collation": "http://marklogic.com/collation/",
28+
"namespace-uri": "",
29+
"localname": "cityTeam",
30+
"range-value-positions": false,
31+
"invalid-values": "ignore"
32+
},
33+
{
34+
"scalar-type": "date",
35+
"namespace-uri": "",
36+
"localname": "date",
37+
"range-value-positions": false,
38+
"invalid-values": "ignore"
39+
},
40+
{
41+
"scalar-type": "double",
42+
"namespace-uri": "",
43+
"localname": "distance",
44+
"range-value-positions": false,
45+
"invalid-values": "ignore"
46+
},
47+
{
48+
"scalar-type": "decimal",
49+
"namespace-uri": "",
50+
"localname": "id",
51+
"range-value-positions": false,
52+
"invalid-values": "ignore"
53+
},
54+
{
55+
"scalar-type": "int",
56+
"namespace-uri": "",
57+
"localname": "popularity",
58+
"range-value-positions": false,
59+
"invalid-values": "ignore"
60+
}
61+
],
62+
"geospatial-element-index": [
63+
{
64+
"namespace-uri": "",
65+
"localname": "latLonPoint",
66+
"coordinate-system": "wgs84",
67+
"point-format": "point",
68+
"range-value-positions": false,
69+
"invalid-values": "reject"
70+
}
71+
]
72+
}

‎test-complete-app/src/main/ml-config/databases/nodeOpticFunctionalTestModules.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"database-name": "nodeOpticFunctionalTestModules"
3+
}

‎test-complete-app/src/main/ml-config/security/roles/eval.json‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
{
2+
"role-name": "eval",
3+
"description": "eval role",
4+
"role": [],
5+
"privilege": [
6+
{
7+
"privilege-name": "xdbc-eval",
8+
"action": "http://marklogic.com/xdmp/privileges/xdbc-eval",
9+
"kind": "execute"
10+
},
11+
{
12+
"privilege-name": "xdmp-eval-in",
13+
"action": "http://marklogic.com/xdmp/privileges/xdmp-eval-in",
14+
"kind": "execute"
15+
},
16+
{
17+
"privilege-name": "xdmp-invoke",
18+
"action": "http://marklogic.com/xdmp/privileges/xdmp-invoke",
19+
"kind": "execute"
20+
},
21+
{
22+
"privilege-name": "xdmp-invoke-in",
23+
"action": "http://marklogic.com/xdmp/privileges/xdmp-invoke-in",
24+
"kind": "execute"
25+
},
26+
{
27+
"privilege-name": "xdmp-spawn",
28+
"action": "http://marklogic.com/xdmp/privileges/xdmp-spawn",
29+
"kind": "execute"
30+
},
31+
{
32+
"privilege-name": "xdmp-spawn-in",
33+
"action": "http://marklogic.com/xdmp/privileges/xdmp-spawn-in",
34+
"kind": "execute"
35+
}
36+
]
37+
}

0 commit comments

Comments
 (0)