Skip to content

Commit 2999a19

Browse files
edwardsphedwardsph
authored
Update test subjects and support for CSS 5.0 (#80)
1 parent 3f60eb8 commit 2999a19

3 files changed

Lines changed: 46 additions & 126 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## Release 0.0.12
44
* Use harness API to test sending requests without a content type header.
55
* Ensure container created correctly on slash semantic tests.
6+
* Update default test subjects for latest releases.
67

78
## Release 0.0.11
89
* Moved repository to `solid-contrib` organization.

‎run.sh‎

Lines changed: 34 additions & 100 deletions
Original file line numberDiff line numberDiff line change
@@ -28,112 +28,45 @@ setup_css() {
2828
mkdir -p config
2929
cat > ./config/css-config.json <<EOF
3030
{
31-
"@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^4.0.0/components/context.jsonld",
31+
"@context": "https://linkedsoftwaredependencies.org/bundles/npm/@solid/community-server/^5.0.0/components/context.jsonld",
3232
"import": [
33-
"files-scs:config/app/main/default.json",
34-
"files-scs:config/app/init/initialize-prefilled-root.json",
35-
"files-scs:config/app/setup/optional.json",
36-
"files-scs:config/app/variables/default.json",
37-
"files-scs:config/http/handler/default.json",
38-
"files-scs:config/http/middleware/websockets.json",
39-
"files-scs:config/http/server-factory/websockets.json",
40-
"files-scs:config/http/static/default.json",
41-
"files-scs:config/identity/access/public.json",
42-
"files-scs:config/identity/email/default.json",
43-
"files-scs:config/identity/handler/default.json",
44-
"files-scs:config/identity/ownership/token.json",
45-
"files-scs:config/identity/pod/static.json",
46-
"files-scs:config/identity/registration/enabled.json",
47-
"files-scs:config/ldp/authentication/dpop-bearer.json",
48-
"files-scs:config/ldp/authorization/webacl.json",
49-
"files-scs:config/ldp/handler/default.json",
50-
"files-scs:config/ldp/metadata-parser/default.json",
51-
"files-scs:config/ldp/metadata-writer/default.json",
52-
"files-scs:config/ldp/modes/default.json",
53-
"files-scs:config/storage/backend/memory.json",
54-
"files-scs:config/storage/key-value/resource-store.json",
55-
"files-scs:config/storage/middleware/default.json",
56-
"files-scs:config/util/auxiliary/acl.json",
57-
"files-scs:config/util/identifiers/suffix.json",
58-
"files-scs:config/util/index/default.json",
59-
"files-scs:config/util/logging/winston.json",
60-
"files-scs:config/util/representation-conversion/default.json",
61-
"files-scs:config/util/resource-locker/memory.json",
62-
"files-scs:config/util/variables/default.json"
33+
"css:config/app/main/default.json",
34+
"css:config/app/init/initialize-prefilled-root.json",
35+
"css:config/app/setup/optional.json",
36+
"css:config/app/variables/default.json",
37+
"css:config/http/handler/default.json",
38+
"css:config/http/middleware/websockets.json",
39+
"css:config/http/server-factory/https-websockets.json",
40+
"css:config/http/static/default.json",
41+
"css:config/identity/access/public.json",
42+
"css:config/identity/email/default.json",
43+
"css:config/identity/handler/default.json",
44+
"css:config/identity/ownership/token.json",
45+
"css:config/identity/pod/static.json",
46+
"css:config/identity/registration/enabled.json",
47+
"css:config/ldp/authentication/dpop-bearer.json",
48+
"css:config/ldp/authorization/webacl.json",
49+
"css:config/ldp/handler/default.json",
50+
"css:config/ldp/metadata-parser/default.json",
51+
"css:config/ldp/metadata-writer/default.json",
52+
"css:config/ldp/modes/default.json",
53+
"css:config/storage/backend/memory.json",
54+
"css:config/storage/key-value/resource-store.json",
55+
"css:config/storage/middleware/default.json",
56+
"css:config/util/auxiliary/acl.json",
57+
"css:config/util/identifiers/suffix.json",
58+
"css:config/util/index/default.json",
59+
"css:config/util/logging/winston.json",
60+
"css:config/util/representation-conversion/default.json",
61+
"css:config/util/resource-locker/memory.json",
62+
"css:config/util/variables/default.json"
6363
],
6464
"@graph": [
6565
{
6666
"comment": [
67-
"Adds CLI options --httpsKey and --httpsCert and uses those to start an HTTPS server.",
68-
"The http/server-factory import above has been omitted since that feature is set below."
67+
"Adds CLI options --httpsKey and --httpsCert and uses those to start an HTTPS server."
6968
]
7069
},
71-
{
72-
"@id": "urn:solid-server-app-setup:default:CliExtractor",
73-
"@type": "YargsCliExtractor",
74-
"extendedParameters": {
75-
"httpsKey": {
76-
"demandOption": true,
77-
"requiresArg": true,
78-
"type": "string",
79-
"describe": "File path to the HTTPS key."
80-
},
81-
"httpsCert": {
82-
"demandOption": true,
83-
"requiresArg": true,
84-
"type": "string",
85-
"describe": "File path to the HTTPS certificate."
86-
}
87-
}
88-
},
89-
{
90-
"comment": "Adds resolvers to assign the CLI values to the Components.js variables.",
91-
"@id": "urn:solid-server-app-setup:default:SettingsResolver",
92-
"@type": "CombinedSettingsResolver",
93-
"resolvers": [
94-
{
95-
"CombinedSettingsResolver:_resolvers_key": "urn:solid-server:custom:variable:httpsKey",
96-
"CombinedSettingsResolver:_resolvers_value": {
97-
"@type": "KeyExtractor",
98-
"key": "httpsKey"
99-
}
100-
},
101-
{
102-
"CombinedSettingsResolver:_resolvers_key": "urn:solid-server:custom:variable:httpsCert",
103-
"CombinedSettingsResolver:_resolvers_value": {
104-
"@type": "KeyExtractor",
105-
"key": "httpsCert"
106-
}
107-
}
108-
]
109-
},
110-
{
111-
"comment": [
112-
"Creates an HTTPS server with the settings provided via the command line.",
113-
"Replaces the example import from config/http/server-factory.https-example.json."
114-
],
115-
"@id": "urn:solid-server:default:ServerFactory",
116-
"@type": "WebSocketServerFactory",
117-
"baseServerFactory": {
118-
"@id": "urn:solid-server:default:HttpServerFactory",
119-
"@type": "BaseHttpServerFactory",
120-
"handler": { "@id": "urn:solid-server:default:HttpHandler" },
121-
"options_showStackTrace": { "@id": "urn:solid-server:default:variable:showStackTrace" },
122-
"options_https": true,
123-
"options_key": {
124-
"@id": "urn:solid-server:custom:variable:httpsKey",
125-
"@type": "Variable"
126-
},
127-
"options_cert": {
128-
"@id": "urn:solid-server:custom:variable:httpsCert",
129-
"@type": "Variable"
130-
}
131-
},
132-
"webSocketHandler": {
133-
"@type": "UnsecureWebSocketsProtocol",
134-
"source": { "@id": "urn:solid-server:default:ResourceStore" }
135-
}
136-
}
13770
]
13871
}
13972
EOF
@@ -148,7 +81,8 @@ EOF
14881
docker network create testnet
14982
docker run -d --name=server --network=testnet --env NODE_TLS_REJECT_UNAUTHORIZED=0 \
15083
-v "$(pwd)"/config:/config \
151-
-v "$(pwd)"/certs:/certs -p 443:443 -it solidproject/community-server:4 \
84+
-v "$(pwd)"/certs:/certs \
85+
-p 443:443 -it solidproject/community-server:5 \
15286
-c /config/css-config.json \
15387
--httpsKey=/certs/server.key --httpsCert=/certs/server.cert \
15488
--port=443 --baseUrl=https://server/

‎test-subjects.ttl‎

Lines changed: 11 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,62 +12,47 @@
1212

1313
<ess>
1414
a earl:Software, earl:TestSubject ;
15-
doap:name "Enterprise Solid Server (ACP version)"@en ;
15+
doap:name "Enterprise Solid Server"@en ;
1616
doap:release <ess#test-subject-release> ;
1717
doap:developer <https://inrupt.com/profile/card/#us> ;
1818
doap:homepage <https://inrupt.com/products/enterprise-solid-server> ;
1919
doap:description "A production-grade Solid server produced and supported by Inrupt."@en ;
2020
doap:programming-language "Java"@en ;
2121
solid-test:skip "wac", "wac-allow-public", "publicagent" ;
22-
solid-test:features "acp-legacy" ;
2322
rdfs:comment "This version of ESS implements ACP for access control instead of WAC. Whilst it does not therefore conform to that aspect of the specification the access control tests are still run in order to assess the equivalent capabilities in this implementation."@en ;
2423
rdfs:comment "Access for anonymous users is not supported nor required by Solid specifications so tests that depend on this are not run."@en.
2524

2625
<ess#test-subject-release>
27-
doap:revision "1.1.6";
28-
doap:created "2021-09-11"^^xsd:date .
29-
30-
<ess-wac>
31-
a earl:Software, earl:TestSubject ;
32-
doap:name "Enterprise Solid Server (Web Access Control version)"@en ;
33-
doap:release <ess-wac#test-subject-release> ;
34-
doap:developer <https://inrupt.com/profile/card/#us> ;
35-
doap:homepage <https://inrupt.com/products/enterprise-solid-server> ;
36-
doap:description "A production-grade Solid server produced and supported by Inrupt."@en ;
37-
doap:programming-language "Java"@en ;
38-
solid-test:skip "acp" .
39-
40-
<ess-wac#test-subject-release>
41-
doap:revision "1.1.6";
42-
doap:created "2021-09-11"^^xsd:date .
26+
doap:revision "2.0";
27+
doap:created "2022-06-07"^^xsd:date .
4328

4429
<css>
4530
a earl:Software, earl:TestSubject ;
4631
doap:name "Community Solid Server"@en ;
4732
doap:release <css#test-subject-release> ;
48-
doap:developer <https://github.com/solid> ;
49-
doap:homepage <https://github.com/solid/community-server> ;
33+
doap:developer <https://solidproject.org> ;
34+
doap:homepage <https://github.com/CommunitySolidServer/CommunitySolidServer> ;
5035
doap:description "An open and modular implementation of the Solid specifications."@en ;
5136
doap:programming-language "TypeScript"@en ;
5237
solid-test:skip "acp", "http-redirect" .
5338

5439
<css#test-subject-release>
55-
doap:revision "3.0.0" ;
56-
doap:created "2022-02-23"^^xsd:date .
40+
doap:revision "5.0.0" ;
41+
doap:created "2022-08-08"^^xsd:date .
5742

5843
<nss>
5944
a earl:Software, earl:TestSubject ;
6045
doap:name "Node Solid Server"@en ;
6146
doap:release <nss#test-subject-release> ;
62-
doap:developer <https://github.com/solid> ;
63-
doap:homepage <https://github.com/solid/node-solid-server> ;
47+
doap:developer <https://solidproject.org> ;
48+
doap:homepage <https://github.com/nodeSolidServer/node-solid-server> ;
6449
doap:description "Solid server on top of the file-system in NodeJS."@en ;
6550
doap:programming-language "JavaScript"@en ;
6651
solid-test:skip "acp" .
6752

6853
<nss#test-subject-release>
69-
doap:revision "5.6.20"@en ;
70-
doap:created "2022-01-29"^^xsd:date .
54+
doap:revision "5.7.1"@en ;
55+
doap:created "2022-03-23"^^xsd:date .
7156

7257
<trinpod>
7358
a earl:Software, earl:TestSubject ;

0 commit comments

Comments
 (0)