From e4c4d2a7817a923f6c9724df4ac06ce8bda3466b Mon Sep 17 00:00:00 2001 From: Ruben Verborgh Date: Mon, 21 Dec 2020 23:58:47 +0100 Subject: [PATCH] test: Move configuration into integration folder. --- test/integration/AuthenticatedLdpHandler.test.ts | 2 +- test/integration/Authorization.test.ts | 2 +- test/{configs/Util.ts => integration/Config.ts} | 0 test/integration/FullConfig.acl.test.ts | 2 +- test/integration/FullConfig.noAuth.test.ts | 2 +- test/integration/LockingResourceStore.test.ts | 2 +- test/integration/Middleware.test.ts | 2 +- test/integration/PodCreation.test.ts | 2 +- test/integration/SparqlStorage.test.ts | 2 +- test/integration/WebSocketsProtocol.test.ts | 2 +- test/{configs => integration}/auth-allow-all.json | 0 test/{configs => integration}/auth-ldp-handler.json | 0 test/{configs => integration}/middleware.json | 0 13 files changed, 9 insertions(+), 9 deletions(-) rename test/{configs/Util.ts => integration/Config.ts} (100%) rename test/{configs => integration}/auth-allow-all.json (100%) rename test/{configs => integration}/auth-ldp-handler.json (100%) rename test/{configs => integration}/middleware.json (100%) diff --git a/test/integration/AuthenticatedLdpHandler.test.ts b/test/integration/AuthenticatedLdpHandler.test.ts index defb26379..513e85194 100644 --- a/test/integration/AuthenticatedLdpHandler.test.ts +++ b/test/integration/AuthenticatedLdpHandler.test.ts @@ -5,8 +5,8 @@ import { Parser } from 'n3'; import type { MockResponse } from 'node-mocks-http'; import type { HttpHandler } from '../../src/server/HttpHandler'; import { LDP } from '../../src/util/UriConstants'; -import { BASE, instantiateFromConfig } from '../configs/Util'; import { call } from '../util/Util'; +import { BASE, instantiateFromConfig } from './Config'; describe('An integrated AuthenticatedLdpHandler', (): void => { let handler: HttpHandler; diff --git a/test/integration/Authorization.test.ts b/test/integration/Authorization.test.ts index 73f787761..84f059df8 100644 --- a/test/integration/Authorization.test.ts +++ b/test/integration/Authorization.test.ts @@ -1,8 +1,8 @@ import type { MockResponse } from 'node-mocks-http'; import type { HttpHandler, Initializer, ResourceStore } from '../../src/'; -import { BASE, instantiateFromConfig } from '../configs/Util'; import { AclTestHelper } from '../util/TestHelpers'; import { call } from '../util/Util'; +import { BASE, instantiateFromConfig } from './Config'; describe('A server with authorization', (): void => { let handler: HttpHandler; diff --git a/test/configs/Util.ts b/test/integration/Config.ts similarity index 100% rename from test/configs/Util.ts rename to test/integration/Config.ts diff --git a/test/integration/FullConfig.acl.test.ts b/test/integration/FullConfig.acl.test.ts index 91e38aa62..8a8b8d234 100644 --- a/test/integration/FullConfig.acl.test.ts +++ b/test/integration/FullConfig.acl.test.ts @@ -5,8 +5,8 @@ import type { HttpHandler, Initializer, ResourceStore } from '../../src/'; import { RepresentationMetadata } from '../../src/ldp/representation/RepresentationMetadata'; import { guardStream } from '../../src/util/GuardedStream'; import { CONTENT_TYPE, LDP } from '../../src/util/UriConstants'; -import { BASE, getRootFilePath, instantiateFromConfig } from '../configs/Util'; import { AclTestHelper, FileTestHelper } from '../util/TestHelpers'; +import { BASE, getRootFilePath, instantiateFromConfig } from './Config'; const rootFilePath = getRootFilePath('full-config-acl'); const stores: [string, any][] = [ diff --git a/test/integration/FullConfig.noAuth.test.ts b/test/integration/FullConfig.noAuth.test.ts index 757be451c..0166c833a 100644 --- a/test/integration/FullConfig.noAuth.test.ts +++ b/test/integration/FullConfig.noAuth.test.ts @@ -2,8 +2,8 @@ import { mkdirSync } from 'fs'; import * as rimraf from 'rimraf'; import type { HttpHandler, Initializer, ResourceStore } from '../../src/'; import { LDP } from '../../src/util/UriConstants'; -import { BASE, getRootFilePath, instantiateFromConfig } from '../configs/Util'; import { FileTestHelper } from '../util/TestHelpers'; +import { BASE, getRootFilePath, instantiateFromConfig } from './Config'; const rootFilePath = getRootFilePath('full-config-no-auth'); const stores: [string, any][] = [ diff --git a/test/integration/LockingResourceStore.test.ts b/test/integration/LockingResourceStore.test.ts index f60ae002e..5e61fbb60 100644 --- a/test/integration/LockingResourceStore.test.ts +++ b/test/integration/LockingResourceStore.test.ts @@ -14,7 +14,7 @@ import { SingleThreadedResourceLocker } from '../../src/util/locking/SingleThrea import { WrappedExpiringResourceLocker } from '../../src/util/locking/WrappedExpiringResourceLocker'; import { guardedStreamFrom } from '../../src/util/StreamUtil'; import { CONTENT_TYPE } from '../../src/util/UriConstants'; -import { BASE } from '../configs/Util'; +import { BASE } from './Config'; describe('A LockingResourceStore', (): void => { let path: string; diff --git a/test/integration/Middleware.test.ts b/test/integration/Middleware.test.ts index c60085552..2732861b0 100644 --- a/test/integration/Middleware.test.ts +++ b/test/integration/Middleware.test.ts @@ -4,8 +4,8 @@ import type { ExpressHttpServerFactory } from '../../src/server/ExpressHttpServe import { HttpHandler } from '../../src/server/HttpHandler'; import type { HttpRequest } from '../../src/server/HttpRequest'; import type { HttpResponse } from '../../src/server/HttpResponse'; -import { instantiateFromConfig } from '../configs/Util'; import { StaticAsyncHandler } from '../util/StaticAsyncHandler'; +import { instantiateFromConfig } from './Config'; const port = 6002; diff --git a/test/integration/PodCreation.test.ts b/test/integration/PodCreation.test.ts index f6737f384..84cd8407e 100644 --- a/test/integration/PodCreation.test.ts +++ b/test/integration/PodCreation.test.ts @@ -3,7 +3,7 @@ import { join } from 'path'; import fetch from 'cross-fetch'; import type { HttpServerFactory } from '../../src/server/HttpServerFactory'; import { readableToString } from '../../src/util/StreamUtil'; -import { instantiateFromConfig } from '../configs/Util'; +import { instantiateFromConfig } from './Config'; const port = 6003; const baseUrl = `http://localhost:${port}/`; diff --git a/test/integration/SparqlStorage.test.ts b/test/integration/SparqlStorage.test.ts index 5e62378ef..23cf7a955 100644 --- a/test/integration/SparqlStorage.test.ts +++ b/test/integration/SparqlStorage.test.ts @@ -1,6 +1,6 @@ import type { HttpHandler, Initializer, ResourceStore } from '../../src/'; -import { BASE, instantiateFromConfig } from '../configs/Util'; import { describeIf, FileTestHelper } from '../util/TestHelpers'; +import { BASE, instantiateFromConfig } from './Config'; describeIf('docker', 'a server with a SPARQL endpoint as storage', (): void => { describe('without acl', (): void => { diff --git a/test/integration/WebSocketsProtocol.test.ts b/test/integration/WebSocketsProtocol.test.ts index a118c9ce1..cabee57f4 100644 --- a/test/integration/WebSocketsProtocol.test.ts +++ b/test/integration/WebSocketsProtocol.test.ts @@ -2,7 +2,7 @@ import type { Server } from 'http'; import fetch from 'cross-fetch'; import WebSocket from 'ws'; import type { HttpServerFactory } from '../../src/server/HttpServerFactory'; -import { instantiateFromConfig } from '../configs/Util'; +import { instantiateFromConfig } from './Config'; const port = 6001; const serverUrl = `http://localhost:${port}/`; diff --git a/test/configs/auth-allow-all.json b/test/integration/auth-allow-all.json similarity index 100% rename from test/configs/auth-allow-all.json rename to test/integration/auth-allow-all.json diff --git a/test/configs/auth-ldp-handler.json b/test/integration/auth-ldp-handler.json similarity index 100% rename from test/configs/auth-ldp-handler.json rename to test/integration/auth-ldp-handler.json diff --git a/test/configs/middleware.json b/test/integration/middleware.json similarity index 100% rename from test/configs/middleware.json rename to test/integration/middleware.json