diff --git a/tests/SConscript b/tests/SConscript index 044245328..27ff59bc7 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -14,7 +14,7 @@ from Buildhelper import createPlugins Import('env core_lib vessel_lib vault_lib test_support guimodule tools config') env = env.Clone() -env.Append(CPPPATH='include') # additional headers for tests +env.Append(CPPPATH='.') # tests/ rootdir (relevant for layer specific test support headers) # test classes of subcomponents linked in shared objects sharedTestLibs = {} @@ -49,7 +49,6 @@ def testCases(env,dir): @note: linking scope chosen based on the name-prefix """ env = env.Clone() - env.Append(CPPPATH=dir) # add subdir to Includepath if dir.startswith('stage'): # additional libs used from GUI tests env.mergeConf(['sigc++-2.0']) @@ -77,7 +76,7 @@ envSuite.Append(LINKFLAGS='-Wl,--no-as-needed') # have to treat some subdirs separately. -specialDirs = ['plugin','tool','include'] +specialDirs = ['plugin','tool'] testSrcDirs = globRootdirs('*') diff --git a/tests/core/DIR_INFO b/tests/core/DIR_INFO deleted file mode 100644 index a01bda331..000000000 --- a/tests/core/DIR_INFO +++ /dev/null @@ -1 +0,0 @@ -core components testsuite diff --git a/tests/core/vault/_WARNING_OBSOLETE_ b/tests/core/vault/_WARNING_OBSOLETE_ deleted file mode 100644 index 526b1e7aa..000000000 --- a/tests/core/vault/_WARNING_OBSOLETE_ +++ /dev/null @@ -1,5 +0,0 @@ -WARNING: This directory is a left-over from the early stages of the Lumiera project. -It holds a test, which logically belongs into the vault-layer, yet must be linked -against the steam-layer to use a 'Testclip' from the session. - -Once file and output handling is actually designed and settled, this should be sorted out diff --git a/tests/include/DIR_INFO b/tests/include/DIR_INFO deleted file mode 100644 index 74ee1bdcb..000000000 --- a/tests/include/DIR_INFO +++ /dev/null @@ -1 +0,0 @@ -test support helpers and interfaces diff --git a/tests/library/DIR_INFO b/tests/lib/DIR_INFO similarity index 100% rename from tests/library/DIR_INFO rename to tests/lib/DIR_INFO diff --git a/tests/library/allocation-cluster-test.cpp b/tests/lib/allocation-cluster-test.cpp similarity index 100% rename from tests/library/allocation-cluster-test.cpp rename to tests/lib/allocation-cluster-test.cpp diff --git a/tests/library/app-config-test.cpp b/tests/lib/app-config-test.cpp similarity index 100% rename from tests/library/app-config-test.cpp rename to tests/lib/app-config-test.cpp diff --git a/tests/library/branch-case-test.cpp b/tests/lib/branch-case-test.cpp similarity index 100% rename from tests/library/branch-case-test.cpp rename to tests/lib/branch-case-test.cpp diff --git a/tests/library/builder-qualifier-support-test.cpp b/tests/lib/builder-qualifier-support-test.cpp similarity index 100% rename from tests/library/builder-qualifier-support-test.cpp rename to tests/lib/builder-qualifier-support-test.cpp diff --git a/tests/library/c-lib/test-errorstate.c b/tests/lib/c-lib/test-errorstate.c similarity index 100% rename from tests/library/c-lib/test-errorstate.c rename to tests/lib/c-lib/test-errorstate.c diff --git a/tests/library/c-lib/test-llist.c b/tests/lib/c-lib/test-llist.c similarity index 100% rename from tests/library/c-lib/test-llist.c rename to tests/lib/c-lib/test-llist.c diff --git a/tests/library/c-lib/test-locking.c b/tests/lib/c-lib/test-locking.c similarity index 100% rename from tests/library/c-lib/test-locking.c rename to tests/lib/c-lib/test-locking.c diff --git a/tests/library/c-lib/test-luid.c b/tests/lib/c-lib/test-luid.c similarity index 100% rename from tests/library/c-lib/test-luid.c rename to tests/lib/c-lib/test-luid.c diff --git a/tests/library/c-lib/test-psplay.c b/tests/lib/c-lib/test-psplay.c similarity index 100% rename from tests/library/c-lib/test-psplay.c rename to tests/lib/c-lib/test-psplay.c diff --git a/tests/library/c-lib/test-safeclib.c b/tests/lib/c-lib/test-safeclib.c similarity index 100% rename from tests/library/c-lib/test-safeclib.c rename to tests/lib/c-lib/test-safeclib.c diff --git a/tests/library/cmdline-wrapper-test.cpp b/tests/lib/cmdline-wrapper-test.cpp similarity index 100% rename from tests/library/cmdline-wrapper-test.cpp rename to tests/lib/cmdline-wrapper-test.cpp diff --git a/tests/library/custom-shared-ptr-test.cpp b/tests/lib/custom-shared-ptr-test.cpp similarity index 100% rename from tests/library/custom-shared-ptr-test.cpp rename to tests/lib/custom-shared-ptr-test.cpp diff --git a/tests/library/del-stash-test.cpp b/tests/lib/del-stash-test.cpp similarity index 100% rename from tests/library/del-stash-test.cpp rename to tests/lib/del-stash-test.cpp diff --git a/tests/library/diff/diff-complex-application-test.cpp b/tests/lib/diff/diff-complex-application-test.cpp similarity index 100% rename from tests/library/diff/diff-complex-application-test.cpp rename to tests/lib/diff/diff-complex-application-test.cpp diff --git a/tests/library/diff/diff-ignore-changes-test.cpp b/tests/lib/diff/diff-ignore-changes-test.cpp similarity index 100% rename from tests/library/diff/diff-ignore-changes-test.cpp rename to tests/lib/diff/diff-ignore-changes-test.cpp diff --git a/tests/library/diff/diff-index-table-test.cpp b/tests/lib/diff/diff-index-table-test.cpp similarity index 100% rename from tests/library/diff/diff-index-table-test.cpp rename to tests/lib/diff/diff-index-table-test.cpp diff --git a/tests/library/diff/diff-list-application-test.cpp b/tests/lib/diff/diff-list-application-test.cpp similarity index 100% rename from tests/library/diff/diff-list-application-test.cpp rename to tests/lib/diff/diff-list-application-test.cpp diff --git a/tests/library/diff/diff-list-generation-test.cpp b/tests/lib/diff/diff-list-generation-test.cpp similarity index 100% rename from tests/library/diff/diff-list-generation-test.cpp rename to tests/lib/diff/diff-list-generation-test.cpp diff --git a/tests/library/diff/diff-tree-application-simple-test.cpp b/tests/lib/diff/diff-tree-application-simple-test.cpp similarity index 100% rename from tests/library/diff/diff-tree-application-simple-test.cpp rename to tests/lib/diff/diff-tree-application-simple-test.cpp diff --git a/tests/library/diff/diff-tree-application-test.cpp b/tests/lib/diff/diff-tree-application-test.cpp similarity index 100% rename from tests/library/diff/diff-tree-application-test.cpp rename to tests/lib/diff/diff-tree-application-test.cpp diff --git a/tests/library/diff/diff-tree-mutation-listener-test.cpp b/tests/lib/diff/diff-tree-mutation-listener-test.cpp similarity index 100% rename from tests/library/diff/diff-tree-mutation-listener-test.cpp rename to tests/lib/diff/diff-tree-mutation-listener-test.cpp diff --git a/tests/library/diff/gen-node-test.cpp b/tests/lib/diff/gen-node-test.cpp similarity index 100% rename from tests/library/diff/gen-node-test.cpp rename to tests/lib/diff/gen-node-test.cpp diff --git a/tests/library/diff/generic-record-test.cpp b/tests/lib/diff/generic-record-test.cpp similarity index 100% rename from tests/library/diff/generic-record-test.cpp rename to tests/lib/diff/generic-record-test.cpp diff --git a/tests/library/diff/mutation-message-test.cpp b/tests/lib/diff/mutation-message-test.cpp similarity index 100% rename from tests/library/diff/mutation-message-test.cpp rename to tests/lib/diff/mutation-message-test.cpp diff --git a/tests/library/diff/tree-mutator-binding-test.cpp b/tests/lib/diff/tree-mutator-binding-test.cpp similarity index 100% rename from tests/library/diff/tree-mutator-binding-test.cpp rename to tests/lib/diff/tree-mutator-binding-test.cpp diff --git a/tests/library/diff/tree-mutator-test.cpp b/tests/lib/diff/tree-mutator-test.cpp similarity index 100% rename from tests/library/diff/tree-mutator-test.cpp rename to tests/lib/diff/tree-mutator-test.cpp diff --git a/tests/library/exception-error-test.cpp b/tests/lib/exception-error-test.cpp similarity index 100% rename from tests/library/exception-error-test.cpp rename to tests/lib/exception-error-test.cpp diff --git a/tests/library/file-support-test.cpp b/tests/lib/file-support-test.cpp similarity index 100% rename from tests/library/file-support-test.cpp rename to tests/lib/file-support-test.cpp diff --git a/tests/library/format-cout-test.cpp b/tests/lib/format-cout-test.cpp similarity index 100% rename from tests/library/format-cout-test.cpp rename to tests/lib/format-cout-test.cpp diff --git a/tests/library/format-helper-test.cpp b/tests/lib/format-helper-test.cpp similarity index 100% rename from tests/library/format-helper-test.cpp rename to tests/lib/format-helper-test.cpp diff --git a/tests/library/format-string-test.cpp b/tests/lib/format-string-test.cpp similarity index 100% rename from tests/library/format-string-test.cpp rename to tests/lib/format-string-test.cpp diff --git a/tests/library/fun-hash-dispatch-test.cpp b/tests/lib/fun-hash-dispatch-test.cpp similarity index 100% rename from tests/library/fun-hash-dispatch-test.cpp rename to tests/lib/fun-hash-dispatch-test.cpp diff --git a/tests/library/gnuplot-gen-test.cpp b/tests/lib/gnuplot-gen-test.cpp similarity index 100% rename from tests/library/gnuplot-gen-test.cpp rename to tests/lib/gnuplot-gen-test.cpp diff --git a/tests/library/hash-generator-test.cpp b/tests/lib/hash-generator-test.cpp similarity index 100% rename from tests/library/hash-generator-test.cpp rename to tests/lib/hash-generator-test.cpp diff --git a/tests/library/hash-indexed-test.cpp b/tests/lib/hash-indexed-test.cpp similarity index 100% rename from tests/library/hash-indexed-test.cpp rename to tests/lib/hash-indexed-test.cpp diff --git a/tests/library/hash-standard-to-boost-bridge-test.cpp b/tests/lib/hash-standard-to-boost-bridge-test.cpp similarity index 100% rename from tests/library/hash-standard-to-boost-bridge-test.cpp rename to tests/lib/hash-standard-to-boost-bridge-test.cpp diff --git a/tests/library/helloworldtest.cpp b/tests/lib/helloworldtest.cpp similarity index 100% rename from tests/library/helloworldtest.cpp rename to tests/lib/helloworldtest.cpp diff --git a/tests/library/hetero-data-test.cpp b/tests/lib/hetero-data-test.cpp similarity index 100% rename from tests/library/hetero-data-test.cpp rename to tests/lib/hetero-data-test.cpp diff --git a/tests/library/idi/generic-id-function-test.cpp b/tests/lib/idi/generic-id-function-test.cpp similarity index 100% rename from tests/library/idi/generic-id-function-test.cpp rename to tests/lib/idi/generic-id-function-test.cpp diff --git a/tests/library/incidence-count-test.cpp b/tests/lib/incidence-count-test.cpp similarity index 100% rename from tests/library/incidence-count-test.cpp rename to tests/lib/incidence-count-test.cpp diff --git a/tests/library/index-iter-test.cpp b/tests/lib/index-iter-test.cpp similarity index 100% rename from tests/library/index-iter-test.cpp rename to tests/lib/index-iter-test.cpp diff --git a/tests/library/ios-savepoint-test.cpp b/tests/lib/ios-savepoint-test.cpp similarity index 100% rename from tests/library/ios-savepoint-test.cpp rename to tests/lib/ios-savepoint-test.cpp diff --git a/tests/library/item-wrapper-test.cpp b/tests/lib/item-wrapper-test.cpp similarity index 100% rename from tests/library/item-wrapper-test.cpp rename to tests/lib/item-wrapper-test.cpp diff --git a/tests/library/iter-adapter-stl-test.cpp b/tests/lib/iter-adapter-stl-test.cpp similarity index 100% rename from tests/library/iter-adapter-stl-test.cpp rename to tests/lib/iter-adapter-stl-test.cpp diff --git a/tests/library/iter-adapter-test.cpp b/tests/lib/iter-adapter-test.cpp similarity index 100% rename from tests/library/iter-adapter-test.cpp rename to tests/lib/iter-adapter-test.cpp diff --git a/tests/library/iter-chain-search-test.cpp b/tests/lib/iter-chain-search-test.cpp similarity index 100% rename from tests/library/iter-chain-search-test.cpp rename to tests/lib/iter-chain-search-test.cpp diff --git a/tests/library/iter-core-adapter-test.cpp b/tests/lib/iter-core-adapter-test.cpp similarity index 100% rename from tests/library/iter-core-adapter-test.cpp rename to tests/lib/iter-core-adapter-test.cpp diff --git a/tests/library/iter-cursor-test.cpp b/tests/lib/iter-cursor-test.cpp similarity index 100% rename from tests/library/iter-cursor-test.cpp rename to tests/lib/iter-cursor-test.cpp diff --git a/tests/library/iter-explorer-test.cpp b/tests/lib/iter-explorer-test.cpp similarity index 100% rename from tests/library/iter-explorer-test.cpp rename to tests/lib/iter-explorer-test.cpp diff --git a/tests/library/iter-queue-test.cpp b/tests/lib/iter-queue-test.cpp similarity index 100% rename from tests/library/iter-queue-test.cpp rename to tests/lib/iter-queue-test.cpp diff --git a/tests/library/iter-source-test.cpp b/tests/lib/iter-source-test.cpp similarity index 100% rename from tests/library/iter-source-test.cpp rename to tests/lib/iter-source-test.cpp diff --git a/tests/library/iter-stack-test.cpp b/tests/lib/iter-stack-test.cpp similarity index 100% rename from tests/library/iter-stack-test.cpp rename to tests/lib/iter-stack-test.cpp diff --git a/tests/library/iter-zip-test.cpp b/tests/lib/iter-zip-test.cpp similarity index 100% rename from tests/library/iter-zip-test.cpp rename to tests/lib/iter-zip-test.cpp diff --git a/tests/library/itertools-test.cpp b/tests/lib/itertools-test.cpp similarity index 100% rename from tests/library/itertools-test.cpp rename to tests/lib/itertools-test.cpp diff --git a/tests/library/lazy-init-test.cpp b/tests/lib/lazy-init-test.cpp similarity index 100% rename from tests/library/lazy-init-test.cpp rename to tests/lib/lazy-init-test.cpp diff --git a/tests/library/life-cycle-test.cpp b/tests/lib/life-cycle-test.cpp similarity index 100% rename from tests/library/life-cycle-test.cpp rename to tests/lib/life-cycle-test.cpp diff --git a/tests/library/linked-elements-test.cpp b/tests/lib/linked-elements-test.cpp similarity index 100% rename from tests/library/linked-elements-test.cpp rename to tests/lib/linked-elements-test.cpp diff --git a/tests/library/meta/access-casted-test.cpp b/tests/lib/meta/access-casted-test.cpp similarity index 100% rename from tests/library/meta/access-casted-test.cpp rename to tests/lib/meta/access-casted-test.cpp diff --git a/tests/library/meta/duck-detector-extension-test.cpp b/tests/lib/meta/duck-detector-extension-test.cpp similarity index 100% rename from tests/library/meta/duck-detector-extension-test.cpp rename to tests/lib/meta/duck-detector-extension-test.cpp diff --git a/tests/library/meta/duck-detector-test.cpp b/tests/lib/meta/duck-detector-test.cpp similarity index 100% rename from tests/library/meta/duck-detector-test.cpp rename to tests/lib/meta/duck-detector-test.cpp diff --git a/tests/library/meta/dummy-functions.hpp b/tests/lib/meta/dummy-functions.hpp similarity index 100% rename from tests/library/meta/dummy-functions.hpp rename to tests/lib/meta/dummy-functions.hpp diff --git a/tests/library/meta/function-closure-test.cpp b/tests/lib/meta/function-closure-test.cpp similarity index 98% rename from tests/library/meta/function-closure-test.cpp rename to tests/lib/meta/function-closure-test.cpp index ca11aedd3..cc8885683 100644 --- a/tests/library/meta/function-closure-test.cpp +++ b/tests/lib/meta/function-closure-test.cpp @@ -32,8 +32,8 @@ #include "lib/meta/typelist-manip.hpp" #include "lib/meta/function.hpp" #include "lib/meta/function-closure.hpp" -#include "meta/typelist-diagnostics.hpp" -#include "meta/tuple-diagnostics.hpp" +#include "lib/meta/typelist-diagnostics.hpp" +#include "lib/meta/tuple-diagnostics.hpp" using std::string; diff --git a/tests/library/meta/function-composition-test.cpp b/tests/lib/meta/function-composition-test.cpp similarity index 99% rename from tests/library/meta/function-composition-test.cpp rename to tests/lib/meta/function-composition-test.cpp index 4f322d0a3..b5ab78210 100644 --- a/tests/library/meta/function-composition-test.cpp +++ b/tests/lib/meta/function-composition-test.cpp @@ -21,7 +21,7 @@ #include "lib/meta/typelist.hpp" #include "lib/meta/function.hpp" #include "lib/meta/function-closure.hpp" -#include "meta/typelist-diagnostics.hpp" +#include "lib/meta/typelist-diagnostics.hpp" #include diff --git a/tests/library/meta/function-erasure-test.cpp b/tests/lib/meta/function-erasure-test.cpp similarity index 99% rename from tests/library/meta/function-erasure-test.cpp rename to tests/lib/meta/function-erasure-test.cpp index d05ba149c..a932bc813 100644 --- a/tests/library/meta/function-erasure-test.cpp +++ b/tests/lib/meta/function-erasure-test.cpp @@ -20,7 +20,7 @@ #include "test/test-helper.hpp" #include "lib/meta/function-erasure.hpp" #include "lib/error.hpp" -#include "meta/dummy-functions.hpp" +#include "lib/meta/dummy-functions.hpp" #include diff --git a/tests/library/meta/function-signature-test.cpp b/tests/lib/meta/function-signature-test.cpp similarity index 100% rename from tests/library/meta/function-signature-test.cpp rename to tests/lib/meta/function-signature-test.cpp diff --git a/tests/library/meta/generator-combinations-test.cpp b/tests/lib/meta/generator-combinations-test.cpp similarity index 98% rename from tests/library/meta/generator-combinations-test.cpp rename to tests/lib/meta/generator-combinations-test.cpp index 182b857b3..97665ce3b 100644 --- a/tests/library/meta/generator-combinations-test.cpp +++ b/tests/lib/meta/generator-combinations-test.cpp @@ -19,7 +19,7 @@ #include "test/run.hpp" #include "lib/meta/generator.hpp" #include "lib/meta/generator-combinations.hpp" -#include "meta/typelist-diagnostics.hpp" +#include "lib/meta/typelist-diagnostics.hpp" #include "lib/format-string.hpp" #include "lib/format-cout.hpp" diff --git a/tests/library/meta/generator-test.cpp b/tests/lib/meta/generator-test.cpp similarity index 100% rename from tests/library/meta/generator-test.cpp rename to tests/lib/meta/generator-test.cpp diff --git a/tests/library/meta/iterable-classification-test.cpp b/tests/lib/meta/iterable-classification-test.cpp similarity index 100% rename from tests/library/meta/iterable-classification-test.cpp rename to tests/lib/meta/iterable-classification-test.cpp diff --git a/tests/library/meta/late-bind-instance-test.cpp b/tests/lib/meta/late-bind-instance-test.cpp similarity index 100% rename from tests/library/meta/late-bind-instance-test.cpp rename to tests/lib/meta/late-bind-instance-test.cpp diff --git a/tests/library/meta/meta-utils-test.cpp b/tests/lib/meta/meta-utils-test.cpp similarity index 100% rename from tests/library/meta/meta-utils-test.cpp rename to tests/lib/meta/meta-utils-test.cpp diff --git a/tests/library/meta/prop-builder-test.cpp b/tests/lib/meta/prop-builder-test.cpp similarity index 100% rename from tests/library/meta/prop-builder-test.cpp rename to tests/lib/meta/prop-builder-test.cpp diff --git a/tests/library/meta/tuple-closure-test.cpp b/tests/lib/meta/tuple-closure-test.cpp similarity index 100% rename from tests/library/meta/tuple-closure-test.cpp rename to tests/lib/meta/tuple-closure-test.cpp diff --git a/tests/library/meta/tuple-diagnostics.hpp b/tests/lib/meta/tuple-diagnostics.hpp similarity index 93% rename from tests/library/meta/tuple-diagnostics.hpp rename to tests/lib/meta/tuple-diagnostics.hpp index cd7a4b2e8..a9882f432 100644 --- a/tests/library/meta/tuple-diagnostics.hpp +++ b/tests/lib/meta/tuple-diagnostics.hpp @@ -26,11 +26,11 @@ */ -#ifndef META_TUPLE_DIAGNOSTICS_H -#define META_TUPLE_DIAGNOSTICS_H +#ifndef LIB_META_TUPLE_DIAGNOSTICS_H +#define LIB_META_TUPLE_DIAGNOSTICS_H -#include "meta/typelist-diagnostics.hpp" +#include "lib/meta/typelist-diagnostics.hpp" #include "lib/meta/tuple-helper.hpp" #include "lib/format-string.hpp" #include "lib/format-obj.hpp" @@ -83,4 +83,4 @@ namespace test { }}} // namespace lib::meta::test -#endif +#endif /*LIB_META_TUPLE_DIAGNOSTICS_H*/ diff --git a/tests/library/meta/tuple-helper-test.cpp b/tests/lib/meta/tuple-helper-test.cpp similarity index 99% rename from tests/library/meta/tuple-helper-test.cpp rename to tests/lib/meta/tuple-helper-test.cpp index aa4ff8a88..5fcc5ecaa 100644 --- a/tests/library/meta/tuple-helper-test.cpp +++ b/tests/lib/meta/tuple-helper-test.cpp @@ -25,8 +25,8 @@ #include "test/run.hpp" #include "test/test-helper.hpp" #include "lib/meta/tuple-helper.hpp" -#include "meta/typelist-diagnostics.hpp" -#include "meta/tuple-diagnostics.hpp" +#include "lib/meta/typelist-diagnostics.hpp" +#include "lib/meta/tuple-diagnostics.hpp" #include "lib/format-string.hpp" #include "lib/format-cout.hpp" #include "lib/hetero-data.hpp" diff --git a/tests/library/meta/tuple-record-init-test.cpp b/tests/lib/meta/tuple-record-init-test.cpp similarity index 100% rename from tests/library/meta/tuple-record-init-test.cpp rename to tests/lib/meta/tuple-record-init-test.cpp diff --git a/tests/library/meta/type-demangling-test.cpp b/tests/lib/meta/type-demangling-test.cpp similarity index 100% rename from tests/library/meta/type-demangling-test.cpp rename to tests/lib/meta/type-demangling-test.cpp diff --git a/tests/library/meta/type-display-test.cpp b/tests/lib/meta/type-display-test.cpp similarity index 100% rename from tests/library/meta/type-display-test.cpp rename to tests/lib/meta/type-display-test.cpp diff --git a/tests/library/meta/typelist-diagnostics.hpp b/tests/lib/meta/typelist-diagnostics.hpp similarity index 97% rename from tests/library/meta/typelist-diagnostics.hpp rename to tests/lib/meta/typelist-diagnostics.hpp index 894006cea..add83ef56 100644 --- a/tests/library/meta/typelist-diagnostics.hpp +++ b/tests/lib/meta/typelist-diagnostics.hpp @@ -26,8 +26,8 @@ ** */ -#ifndef META_TYPELIST_DIAGNOSTICS_H -#define META_TYPELIST_DIAGNOSTICS_H +#ifndef LIB_META_TYPELIST_DIAGNOSTICS_H +#define LIB_META_TYPELIST_DIAGNOSTICS_H #include "test/test-helper.hpp" @@ -207,4 +207,4 @@ namespace meta { }}} // namespace lib::meta::test -#endif +#endif /*LIB_META_TYPELIST_DIAGNOSTICS_H*/ diff --git a/tests/library/meta/typelist-manip-test.cpp b/tests/lib/meta/typelist-manip-test.cpp similarity index 99% rename from tests/library/meta/typelist-manip-test.cpp rename to tests/lib/meta/typelist-manip-test.cpp index f7780ae7e..6631e18d2 100644 --- a/tests/library/meta/typelist-manip-test.cpp +++ b/tests/lib/meta/typelist-manip-test.cpp @@ -32,7 +32,7 @@ #include "test/run.hpp" #include "lib/meta/generator.hpp" #include "lib/meta/typelist-manip.hpp" -#include "meta/typelist-diagnostics.hpp" +#include "lib/meta/typelist-diagnostics.hpp" #include diff --git a/tests/library/meta/typelist-test.cpp b/tests/lib/meta/typelist-test.cpp similarity index 100% rename from tests/library/meta/typelist-test.cpp rename to tests/lib/meta/typelist-test.cpp diff --git a/tests/library/meta/typelist-util-test.cpp b/tests/lib/meta/typelist-util-test.cpp similarity index 100% rename from tests/library/meta/typelist-util-test.cpp rename to tests/lib/meta/typelist-util-test.cpp diff --git a/tests/library/meta/typeseq-manip-test.cpp b/tests/lib/meta/typeseq-manip-test.cpp similarity index 99% rename from tests/library/meta/typeseq-manip-test.cpp rename to tests/lib/meta/typeseq-manip-test.cpp index 3ce709033..cbb2e9a18 100644 --- a/tests/library/meta/typeseq-manip-test.cpp +++ b/tests/lib/meta/typeseq-manip-test.cpp @@ -31,7 +31,7 @@ #include "test/run.hpp" #include "lib/meta/typeseq-util.hpp" #include "lib/meta/typelist-manip.hpp" -#include "meta/typelist-diagnostics.hpp" +#include "lib/meta/typelist-diagnostics.hpp" using std::string; diff --git a/tests/library/meta/value-type-binding-test.cpp b/tests/lib/meta/value-type-binding-test.cpp similarity index 100% rename from tests/library/meta/value-type-binding-test.cpp rename to tests/lib/meta/value-type-binding-test.cpp diff --git a/tests/library/meta/variadic-argument-picker-test.cpp b/tests/lib/meta/variadic-argument-picker-test.cpp similarity index 100% rename from tests/library/meta/variadic-argument-picker-test.cpp rename to tests/lib/meta/variadic-argument-picker-test.cpp diff --git a/tests/library/meta/variadic-helper-test.cpp b/tests/lib/meta/variadic-helper-test.cpp similarity index 100% rename from tests/library/meta/variadic-helper-test.cpp rename to tests/lib/meta/variadic-helper-test.cpp diff --git a/tests/library/meta/virtual-copy-support-test.cpp b/tests/lib/meta/virtual-copy-support-test.cpp similarity index 100% rename from tests/library/meta/virtual-copy-support-test.cpp rename to tests/lib/meta/virtual-copy-support-test.cpp diff --git a/tests/library/multifact-argument-test.cpp b/tests/lib/multifact-argument-test.cpp similarity index 100% rename from tests/library/multifact-argument-test.cpp rename to tests/lib/multifact-argument-test.cpp diff --git a/tests/library/multifact-singleton-test.cpp b/tests/lib/multifact-singleton-test.cpp similarity index 100% rename from tests/library/multifact-singleton-test.cpp rename to tests/lib/multifact-singleton-test.cpp diff --git a/tests/library/multifact-test.cpp b/tests/lib/multifact-test.cpp similarity index 100% rename from tests/library/multifact-test.cpp rename to tests/lib/multifact-test.cpp diff --git a/tests/library/null-value-test.cpp b/tests/lib/null-value-test.cpp similarity index 100% rename from tests/library/null-value-test.cpp rename to tests/lib/null-value-test.cpp diff --git a/tests/library/opaque-holder-test.cpp b/tests/lib/opaque-holder-test.cpp similarity index 100% rename from tests/library/opaque-holder-test.cpp rename to tests/lib/opaque-holder-test.cpp diff --git a/tests/library/opaque-unchecked-buffer-test.cpp b/tests/lib/opaque-unchecked-buffer-test.cpp similarity index 100% rename from tests/library/opaque-unchecked-buffer-test.cpp rename to tests/lib/opaque-unchecked-buffer-test.cpp diff --git a/tests/library/optional-ref-test.cpp b/tests/lib/optional-ref-test.cpp similarity index 100% rename from tests/library/optional-ref-test.cpp rename to tests/lib/optional-ref-test.cpp diff --git a/tests/library/parse-test.cpp b/tests/lib/parse-test.cpp similarity index 100% rename from tests/library/parse-test.cpp rename to tests/lib/parse-test.cpp diff --git a/tests/library/path-array-test.cpp b/tests/lib/path-array-test.cpp similarity index 100% rename from tests/library/path-array-test.cpp rename to tests/lib/path-array-test.cpp diff --git a/tests/library/polymorphic-value-test.cpp b/tests/lib/polymorphic-value-test.cpp similarity index 100% rename from tests/library/polymorphic-value-test.cpp rename to tests/lib/polymorphic-value-test.cpp diff --git a/tests/library/query-text-test.cpp b/tests/lib/query-text-test.cpp similarity index 100% rename from tests/library/query-text-test.cpp rename to tests/lib/query-text-test.cpp diff --git a/tests/library/query/query-utils-test.cpp b/tests/lib/query/query-utils-test.cpp similarity index 100% rename from tests/library/query/query-utils-test.cpp rename to tests/lib/query/query-utils-test.cpp diff --git a/tests/library/random-concurrent-test.cpp b/tests/lib/random-concurrent-test.cpp similarity index 100% rename from tests/library/random-concurrent-test.cpp rename to tests/lib/random-concurrent-test.cpp diff --git a/tests/library/random-draw-test.cpp b/tests/lib/random-draw-test.cpp similarity index 100% rename from tests/library/random-draw-test.cpp rename to tests/lib/random-draw-test.cpp diff --git a/tests/library/random-test.cpp b/tests/lib/random-test.cpp similarity index 100% rename from tests/library/random-test.cpp rename to tests/lib/random-test.cpp diff --git a/tests/library/rational-test.cpp b/tests/lib/rational-test.cpp similarity index 100% rename from tests/library/rational-test.cpp rename to tests/lib/rational-test.cpp diff --git a/tests/library/removefromsettest.cpp b/tests/lib/removefromsettest.cpp similarity index 100% rename from tests/library/removefromsettest.cpp rename to tests/lib/removefromsettest.cpp diff --git a/tests/library/result-test.cpp b/tests/lib/result-test.cpp similarity index 100% rename from tests/library/result-test.cpp rename to tests/lib/result-test.cpp diff --git a/tests/library/scoped-collection-test.cpp b/tests/lib/scoped-collection-test.cpp similarity index 100% rename from tests/library/scoped-collection-test.cpp rename to tests/lib/scoped-collection-test.cpp diff --git a/tests/library/scoped-ptrvect-test.cpp b/tests/lib/scoped-ptrvect-test.cpp similarity index 100% rename from tests/library/scoped-ptrvect-test.cpp rename to tests/lib/scoped-ptrvect-test.cpp diff --git a/tests/library/search-path-splitter-test.cpp b/tests/lib/search-path-splitter-test.cpp similarity index 100% rename from tests/library/search-path-splitter-test.cpp rename to tests/lib/search-path-splitter-test.cpp diff --git a/tests/library/several-builder-test.cpp b/tests/lib/several-builder-test.cpp similarity index 100% rename from tests/library/several-builder-test.cpp rename to tests/lib/several-builder-test.cpp diff --git a/tests/library/split-splice-test.cpp b/tests/lib/split-splice-test.cpp similarity index 100% rename from tests/library/split-splice-test.cpp rename to tests/lib/split-splice-test.cpp diff --git a/tests/library/stat/data-csv-test.cpp b/tests/lib/stat/data-csv-test.cpp similarity index 100% rename from tests/library/stat/data-csv-test.cpp rename to tests/lib/stat/data-csv-test.cpp diff --git a/tests/library/stat/statistic-test.cpp b/tests/lib/stat/statistic-test.cpp similarity index 100% rename from tests/library/stat/statistic-test.cpp rename to tests/lib/stat/statistic-test.cpp diff --git a/tests/library/symbol-hashtable-test.cpp b/tests/lib/symbol-hashtable-test.cpp similarity index 100% rename from tests/library/symbol-hashtable-test.cpp rename to tests/lib/symbol-hashtable-test.cpp diff --git a/tests/library/symbol-test.cpp b/tests/lib/symbol-test.cpp similarity index 100% rename from tests/library/symbol-test.cpp rename to tests/lib/symbol-test.cpp diff --git a/tests/library/sync-barrier-performance-test.cpp b/tests/lib/sync-barrier-performance-test.cpp similarity index 100% rename from tests/library/sync-barrier-performance-test.cpp rename to tests/lib/sync-barrier-performance-test.cpp diff --git a/tests/library/sync-barrier-test.cpp b/tests/lib/sync-barrier-test.cpp similarity index 100% rename from tests/library/sync-barrier-test.cpp rename to tests/lib/sync-barrier-test.cpp diff --git a/tests/library/sync-classlock-test.cpp b/tests/lib/sync-classlock-test.cpp similarity index 100% rename from tests/library/sync-classlock-test.cpp rename to tests/lib/sync-classlock-test.cpp diff --git a/tests/library/sync-locking-test.cpp b/tests/lib/sync-locking-test.cpp similarity index 100% rename from tests/library/sync-locking-test.cpp rename to tests/lib/sync-locking-test.cpp diff --git a/tests/library/sync-timedwait-test.cpp b/tests/lib/sync-timedwait-test.cpp similarity index 100% rename from tests/library/sync-timedwait-test.cpp rename to tests/lib/sync-timedwait-test.cpp diff --git a/tests/library/sync-waiting-test.cpp b/tests/lib/sync-waiting-test.cpp similarity index 100% rename from tests/library/sync-waiting-test.cpp rename to tests/lib/sync-waiting-test.cpp diff --git a/tests/library/test/event-log-test.cpp b/tests/lib/test/event-log-test.cpp similarity index 100% rename from tests/library/test/event-log-test.cpp rename to tests/lib/test/event-log-test.cpp diff --git a/tests/library/test/temp-dir-test.cpp b/tests/lib/test/temp-dir-test.cpp similarity index 100% rename from tests/library/test/temp-dir-test.cpp rename to tests/lib/test/temp-dir-test.cpp diff --git a/tests/library/test/test-helper-test.cpp b/tests/lib/test/test-helper-test.cpp similarity index 100% rename from tests/library/test/test-helper-test.cpp rename to tests/lib/test/test-helper-test.cpp diff --git a/tests/library/test/test-helper-variadic-test.cpp b/tests/lib/test/test-helper-variadic-test.cpp similarity index 100% rename from tests/library/test/test-helper-variadic-test.cpp rename to tests/lib/test/test-helper-variadic-test.cpp diff --git a/tests/library/test/test-option-test.cpp b/tests/lib/test/test-option-test.cpp similarity index 100% rename from tests/library/test/test-option-test.cpp rename to tests/lib/test/test-option-test.cpp diff --git a/tests/library/test/test-tracking-test.cpp b/tests/lib/test/test-tracking-test.cpp similarity index 100% rename from tests/library/test/test-tracking-test.cpp rename to tests/lib/test/test-tracking-test.cpp diff --git a/tests/library/text-template-test.cpp b/tests/lib/text-template-test.cpp similarity index 100% rename from tests/library/text-template-test.cpp rename to tests/lib/text-template-test.cpp diff --git a/tests/library/thread-wrapper-autonomous-test.cpp b/tests/lib/thread-wrapper-autonomous-test.cpp similarity index 100% rename from tests/library/thread-wrapper-autonomous-test.cpp rename to tests/lib/thread-wrapper-autonomous-test.cpp diff --git a/tests/library/thread-wrapper-join-test.cpp b/tests/lib/thread-wrapper-join-test.cpp similarity index 100% rename from tests/library/thread-wrapper-join-test.cpp rename to tests/lib/thread-wrapper-join-test.cpp diff --git a/tests/library/thread-wrapper-lifecycle-test.cpp b/tests/lib/thread-wrapper-lifecycle-test.cpp similarity index 100% rename from tests/library/thread-wrapper-lifecycle-test.cpp rename to tests/lib/thread-wrapper-lifecycle-test.cpp diff --git a/tests/library/thread-wrapper-self-recognition-test.cpp b/tests/lib/thread-wrapper-self-recognition-test.cpp similarity index 100% rename from tests/library/thread-wrapper-self-recognition-test.cpp rename to tests/lib/thread-wrapper-self-recognition-test.cpp diff --git a/tests/library/thread-wrapper-test.cpp b/tests/lib/thread-wrapper-test.cpp similarity index 100% rename from tests/library/thread-wrapper-test.cpp rename to tests/lib/thread-wrapper-test.cpp diff --git a/tests/library/typed-allocation-manager-test.cpp b/tests/lib/typed-allocation-manager-test.cpp similarity index 100% rename from tests/library/typed-allocation-manager-test.cpp rename to tests/lib/typed-allocation-manager-test.cpp diff --git a/tests/library/unique-malloc-owner-test.cpp b/tests/lib/unique-malloc-owner-test.cpp similarity index 100% rename from tests/library/unique-malloc-owner-test.cpp rename to tests/lib/unique-malloc-owner-test.cpp diff --git a/tests/library/util-collection-test.cpp b/tests/lib/util-collection-test.cpp similarity index 100% rename from tests/library/util-collection-test.cpp rename to tests/lib/util-collection-test.cpp diff --git a/tests/library/util-floordiv-test.cpp b/tests/lib/util-floordiv-test.cpp similarity index 100% rename from tests/library/util-floordiv-test.cpp rename to tests/lib/util-floordiv-test.cpp diff --git a/tests/library/util-floorwrap-test.cpp b/tests/lib/util-floorwrap-test.cpp similarity index 100% rename from tests/library/util-floorwrap-test.cpp rename to tests/lib/util-floorwrap-test.cpp diff --git a/tests/library/util-foreach-test.cpp b/tests/lib/util-foreach-test.cpp similarity index 100% rename from tests/library/util-foreach-test.cpp rename to tests/lib/util-foreach-test.cpp diff --git a/tests/library/util-identity-test.cpp b/tests/lib/util-identity-test.cpp similarity index 100% rename from tests/library/util-identity-test.cpp rename to tests/lib/util-identity-test.cpp diff --git a/tests/library/util-parse-bool-test.cpp b/tests/lib/util-parse-bool-test.cpp similarity index 100% rename from tests/library/util-parse-bool-test.cpp rename to tests/lib/util-parse-bool-test.cpp diff --git a/tests/library/util-sanitised-identifier-test.cpp b/tests/lib/util-sanitised-identifier-test.cpp similarity index 100% rename from tests/library/util-sanitised-identifier-test.cpp rename to tests/lib/util-sanitised-identifier-test.cpp diff --git a/tests/library/util-tuple-test.cpp b/tests/lib/util-tuple-test.cpp similarity index 100% rename from tests/library/util-tuple-test.cpp rename to tests/lib/util-tuple-test.cpp diff --git a/tests/library/variant-test.cpp b/tests/lib/variant-test.cpp similarity index 100% rename from tests/library/variant-test.cpp rename to tests/lib/variant-test.cpp diff --git a/tests/library/verb-function-dispatch-test.cpp b/tests/lib/verb-function-dispatch-test.cpp similarity index 100% rename from tests/library/verb-function-dispatch-test.cpp rename to tests/lib/verb-function-dispatch-test.cpp diff --git a/tests/library/verb-visitor-dispatch-test.cpp b/tests/lib/verb-visitor-dispatch-test.cpp similarity index 100% rename from tests/library/verb-visitor-dispatch-test.cpp rename to tests/lib/verb-visitor-dispatch-test.cpp diff --git a/tests/plugin/test-c-plugin/example-plugin.c b/tests/plugin/test-c-plugin/example-plugin.c index bee966be4..fe1eb8fdb 100644 --- a/tests/plugin/test-c-plugin/example-plugin.c +++ b/tests/plugin/test-c-plugin/example-plugin.c @@ -24,7 +24,8 @@ #include "vessel/interface-descriptor.h" #include "vessel/config-interface.h" -#include "interface/say-hello.h" +// Dummy/demonstration plugin-interface +#include "vessel/say-hello.h" LUMIERA_PLUGIN_INTERFACEHANDLE; diff --git a/tests/plugin/test-cpp-plugin/example-plugin.cpp b/tests/plugin/test-cpp-plugin/example-plugin.cpp index a70b8df63..00942e252 100644 --- a/tests/plugin/test-cpp-plugin/example-plugin.cpp +++ b/tests/plugin/test-cpp-plugin/example-plugin.cpp @@ -29,7 +29,8 @@ extern "C" { #include "vessel/interface.h" #include "vessel/interface-descriptor.h" -#include "interface/say-hello.h" +// Dummy/demonstration plugin-interface +#include "vessel/say-hello.h" } #include diff --git a/tests/stage/DIR_INFO b/tests/stage/DIR_INFO new file mode 100644 index 000000000..c6b8a42f3 --- /dev/null +++ b/tests/stage/DIR_INFO @@ -0,0 +1 @@ +GUI infrastructure testsuite diff --git a/tests/stage/interact/ui-coord-resolver-test.cpp b/tests/stage/interact/ui-coord-resolver-test.cpp index 639d46299..674e5d793 100644 --- a/tests/stage/interact/ui-coord-resolver-test.cpp +++ b/tests/stage/interact/ui-coord-resolver-test.cpp @@ -20,7 +20,7 @@ #include "test/test-helper.hpp" #include "stage/interact/ui-coord.hpp" #include "stage/interact/ui-coord-resolver.hpp" -#include "gen-node-location-query.hpp" +#include "stage/gen-node-location-query.hpp" #include "lib/diff/gen-node.hpp" #include "lib/format-util.hpp" #include "lib/util.hpp" diff --git a/tests/stage/interact/ui-location-solver-test.cpp b/tests/stage/interact/ui-location-solver-test.cpp index a2f28b96b..397e89e9f 100644 --- a/tests/stage/interact/ui-location-solver-test.cpp +++ b/tests/stage/interact/ui-location-solver-test.cpp @@ -20,7 +20,7 @@ #include "test/test-helper.hpp" #include "stage/interact/ui-coord.hpp" #include "stage/interact/ui-location-solver.hpp" -#include "gen-node-location-query.hpp" +#include "stage/gen-node-location-query.hpp" #include "lib/format-cout.hpp" #include diff --git a/tests/stage/interact/view-spec-dsl-test.cpp b/tests/stage/interact/view-spec-dsl-test.cpp index 39469a622..884a82bbb 100644 --- a/tests/stage/interact/view-spec-dsl-test.cpp +++ b/tests/stage/interact/view-spec-dsl-test.cpp @@ -21,8 +21,8 @@ #include "stage/interact/ui-coord.hpp" #include "stage/interact/view-locator.hpp" #include "stage/interact/view-spec-dsl.hpp" -#include "gen-node-location-query.hpp" -#include "test/test-element-access.hpp" +#include "stage/gen-node-location-query.hpp" +#include "stage/test/test-element-access.hpp" #include "lib/depend-inject.hpp" #include "lib/format-cout.hpp" ////////////////TODO only while this test is under development //#include "lib/idi/entry-id.hpp" diff --git a/tests/stage/model/element-access-test.cpp b/tests/stage/model/element-access-test.cpp index 095675ebf..ae047fdde 100644 --- a/tests/stage/model/element-access-test.cpp +++ b/tests/stage/model/element-access-test.cpp @@ -19,7 +19,7 @@ #include "test/run.hpp" #include "test/test-helper.hpp" //#include "stage/interact/view-spec-dsl.hpp" -#include "test/test-element-access.hpp" +#include "stage/test/test-element-access.hpp" #include "stage/interact/ui-coord.hpp" //#include "gen-node-location-query.hpp" #include "lib/depend-inject.hpp" diff --git a/tests/stage/test/mock-elm.hpp b/tests/stage/test/mock-elm.hpp index 91b38f3b5..4694424e8 100644 --- a/tests/stage/test/mock-elm.hpp +++ b/tests/stage/test/mock-elm.hpp @@ -57,7 +57,7 @@ #include "stage/model/tangible.hpp" #include "lib/diff/record.hpp" #include "lib/idi/genfunc.hpp" -#include "test/test-nexus.hpp" +#include "stage/test/test-nexus.hpp" #include "lib/diff/test-mutation-target.hpp" ///////////TICKET #1009 -- extract the render(DataCap) function? #include "lib/format-cout.hpp" #include "lib/symbol.hpp" diff --git a/tests/stage/test/test-element-access.hpp b/tests/stage/test/test-element-access.hpp index 603adc7e1..5b37ed79e 100644 --- a/tests/stage/test/test-element-access.hpp +++ b/tests/stage/test/test-element-access.hpp @@ -37,7 +37,7 @@ #include "lib/error.hpp" #include "stage/model/element-access.hpp" #include "stage/interact/ui-coord.hpp" -#include "test/mock-elm.hpp" +#include "stage/test/mock-elm.hpp" #include "lib/symbol.hpp" //#include "lib/util.hpp" diff --git a/tests/stage/test/test-nexus.cpp b/tests/stage/test/test-nexus.cpp index 70cb590bc..703ff5bc6 100644 --- a/tests/stage/test/test-nexus.cpp +++ b/tests/stage/test/test-nexus.cpp @@ -38,7 +38,7 @@ #include "lib/symbol.hpp" #include "lib/itertools.hpp" #include "test/event-log.hpp" -#include "test/test-nexus.hpp" +#include "stage/test/test-nexus.hpp" #include "steam/control/command.hpp" #include "stage/ctrl/nexus.hpp" #include "stage/ctrl/state-recorder.hpp" diff --git a/tests/stage/test/test-nexus.hpp b/tests/stage/test/test-nexus.hpp index 207049fc2..d49bfca2e 100644 --- a/tests/stage/test/test-nexus.hpp +++ b/tests/stage/test/test-nexus.hpp @@ -41,7 +41,7 @@ #include "stage/ctrl/bus-term.hpp" #include "stage/model/tangible.hpp" #include "stage/ctrl/state-manager.hpp" -#include "test/placeholder-command.hpp" +#include "stage/test/placeholder-command.hpp" #include "lib/diff/gen-node.hpp" #include "test/event-log.hpp" diff --git a/tests/steam/DIR_INFO b/tests/steam/DIR_INFO new file mode 100644 index 000000000..67eda1507 --- /dev/null +++ b/tests/steam/DIR_INFO @@ -0,0 +1 @@ +steam-layer testsuite diff --git a/tests/core/steam/asset/asset-category-test.cpp b/tests/steam/asset/asset-category-test.cpp similarity index 100% rename from tests/core/steam/asset/asset-category-test.cpp rename to tests/steam/asset/asset-category-test.cpp diff --git a/tests/core/steam/asset/asset-diagnostics.hpp b/tests/steam/asset/asset-diagnostics.hpp similarity index 100% rename from tests/core/steam/asset/asset-diagnostics.hpp rename to tests/steam/asset/asset-diagnostics.hpp diff --git a/tests/core/steam/asset/basicpipetest.cpp b/tests/steam/asset/basicpipetest.cpp similarity index 100% rename from tests/core/steam/asset/basicpipetest.cpp rename to tests/steam/asset/basicpipetest.cpp diff --git a/tests/core/steam/asset/compoundmediatest.cpp b/tests/steam/asset/compoundmediatest.cpp similarity index 100% rename from tests/core/steam/asset/compoundmediatest.cpp rename to tests/steam/asset/compoundmediatest.cpp diff --git a/tests/core/steam/asset/create-asset-test.cpp b/tests/steam/asset/create-asset-test.cpp similarity index 99% rename from tests/core/steam/asset/create-asset-test.cpp rename to tests/steam/asset/create-asset-test.cpp index bc4b6eb4a..afd2ab1de 100644 --- a/tests/core/steam/asset/create-asset-test.cpp +++ b/tests/steam/asset/create-asset-test.cpp @@ -27,7 +27,7 @@ #include "steam/asset/meta/error-log.hpp" #include "steam/asset/asset-diagnostics.hpp" -#include "vault/media-access-mock.hpp" +#include "steam/test/media-access-mock.hpp" #include "lib/time/timevalue.hpp" #include "lib/depend-inject.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/asset/deleteassettest.cpp b/tests/steam/asset/deleteassettest.cpp similarity index 100% rename from tests/core/steam/asset/deleteassettest.cpp rename to tests/steam/asset/deleteassettest.cpp diff --git a/tests/core/steam/asset/dependent-assets-test.cpp b/tests/steam/asset/dependent-assets-test.cpp similarity index 99% rename from tests/core/steam/asset/dependent-assets-test.cpp rename to tests/steam/asset/dependent-assets-test.cpp index 74f6ba068..51553f837 100644 --- a/tests/core/steam/asset/dependent-assets-test.cpp +++ b/tests/steam/asset/dependent-assets-test.cpp @@ -19,7 +19,7 @@ #include "test/run.hpp" #include "steam/asset/testasset.hpp" #include "steam/asset/asset-diagnostics.hpp" -#include "vault/media-access-mock.hpp" +#include "steam/test/media-access-mock.hpp" #include "lib/depend-inject.hpp" #include "steam/asset/media.hpp" #include "steam/asset/clip.hpp" diff --git a/tests/core/steam/asset/entry-id-test.cpp b/tests/steam/asset/entry-id-test.cpp similarity index 100% rename from tests/core/steam/asset/entry-id-test.cpp rename to tests/steam/asset/entry-id-test.cpp diff --git a/tests/core/steam/asset/identity-of-assets-test.cpp b/tests/steam/asset/identity-of-assets-test.cpp similarity index 98% rename from tests/core/steam/asset/identity-of-assets-test.cpp rename to tests/steam/asset/identity-of-assets-test.cpp index 846a1c8b0..2e3e58d22 100644 --- a/tests/core/steam/asset/identity-of-assets-test.cpp +++ b/tests/steam/asset/identity-of-assets-test.cpp @@ -25,7 +25,7 @@ #include "steam/asset/proc.hpp" #include "steam/asset/asset-diagnostics.hpp" -#include "vault/media-access-mock.hpp" +#include "steam/test/media-access-mock.hpp" #include "lib/depend-inject.hpp" using util::isnil; diff --git a/tests/core/steam/asset/make-clip-test.cpp b/tests/steam/asset/make-clip-test.cpp similarity index 98% rename from tests/core/steam/asset/make-clip-test.cpp rename to tests/steam/asset/make-clip-test.cpp index ab1ab660c..81d2dbfb6 100644 --- a/tests/core/steam/asset/make-clip-test.cpp +++ b/tests/steam/asset/make-clip-test.cpp @@ -25,7 +25,7 @@ #include "steam/asset/media.hpp" #include "steam/mobject/session/clip.hpp" #include "steam/asset/asset-diagnostics.hpp" -#include "vault/media-access-mock.hpp" +#include "steam/test/media-access-mock.hpp" #include "lib/depend-inject.hpp" using util::contains; diff --git a/tests/core/steam/asset/media-structure-query-test.cpp b/tests/steam/asset/media-structure-query-test.cpp similarity index 100% rename from tests/core/steam/asset/media-structure-query-test.cpp rename to tests/steam/asset/media-structure-query-test.cpp diff --git a/tests/core/steam/asset/meta/time-grid-basics-test.cpp b/tests/steam/asset/meta/time-grid-basics-test.cpp similarity index 100% rename from tests/core/steam/asset/meta/time-grid-basics-test.cpp rename to tests/steam/asset/meta/time-grid-basics-test.cpp diff --git a/tests/core/steam/asset/ordering-of-assets-test.cpp b/tests/steam/asset/ordering-of-assets-test.cpp similarity index 98% rename from tests/core/steam/asset/ordering-of-assets-test.cpp rename to tests/steam/asset/ordering-of-assets-test.cpp index 958150ac0..7afb06ee5 100644 --- a/tests/core/steam/asset/ordering-of-assets-test.cpp +++ b/tests/steam/asset/ordering-of-assets-test.cpp @@ -24,7 +24,7 @@ #include "steam/asset/proc.hpp" #include "steam/asset/asset-diagnostics.hpp" -#include "vault/media-access-mock.hpp" +#include "steam/test/media-access-mock.hpp" #include "lib/depend-inject.hpp" using util::isnil; diff --git a/tests/core/steam/asset/testasset.cpp b/tests/steam/asset/testasset.cpp similarity index 100% rename from tests/core/steam/asset/testasset.cpp rename to tests/steam/asset/testasset.cpp diff --git a/tests/core/steam/asset/testasset.hpp b/tests/steam/asset/testasset.hpp similarity index 100% rename from tests/core/steam/asset/testasset.hpp rename to tests/steam/asset/testasset.hpp diff --git a/tests/core/steam/asset/testclipasset.hpp b/tests/steam/asset/testclipasset.hpp similarity index 100% rename from tests/core/steam/asset/testclipasset.hpp rename to tests/steam/asset/testclipasset.hpp diff --git a/tests/core/steam/asset/typed-id-test.cpp b/tests/steam/asset/typed-id-test.cpp similarity index 100% rename from tests/core/steam/asset/typed-id-test.cpp rename to tests/steam/asset/typed-id-test.cpp diff --git a/tests/core/steam/control/argument-tuple-accept-test.cpp b/tests/steam/control/argument-tuple-accept-test.cpp similarity index 100% rename from tests/core/steam/control/argument-tuple-accept-test.cpp rename to tests/steam/control/argument-tuple-accept-test.cpp diff --git a/tests/core/steam/control/command-argument-test.cpp b/tests/steam/control/command-argument-test.cpp similarity index 100% rename from tests/core/steam/control/command-argument-test.cpp rename to tests/steam/control/command-argument-test.cpp diff --git a/tests/core/steam/control/command-basic-test.cpp b/tests/steam/control/command-basic-test.cpp similarity index 100% rename from tests/core/steam/control/command-basic-test.cpp rename to tests/steam/control/command-basic-test.cpp diff --git a/tests/core/steam/control/command-binding-test.cpp b/tests/steam/control/command-binding-test.cpp similarity index 100% rename from tests/core/steam/control/command-binding-test.cpp rename to tests/steam/control/command-binding-test.cpp diff --git a/tests/core/steam/control/command-clone-builder-test.cpp b/tests/steam/control/command-clone-builder-test.cpp similarity index 100% rename from tests/core/steam/control/command-clone-builder-test.cpp rename to tests/steam/control/command-clone-builder-test.cpp diff --git a/tests/core/steam/control/command-equality-test.cpp b/tests/steam/control/command-equality-test.cpp similarity index 100% rename from tests/core/steam/control/command-equality-test.cpp rename to tests/steam/control/command-equality-test.cpp diff --git a/tests/core/steam/control/command-instance-manager-test.cpp b/tests/steam/control/command-instance-manager-test.cpp similarity index 100% rename from tests/core/steam/control/command-instance-manager-test.cpp rename to tests/steam/control/command-instance-manager-test.cpp diff --git a/tests/core/steam/control/command-message-binding-test.cpp b/tests/steam/control/command-message-binding-test.cpp similarity index 100% rename from tests/core/steam/control/command-message-binding-test.cpp rename to tests/steam/control/command-message-binding-test.cpp diff --git a/tests/core/steam/control/command-mutation-test.cpp b/tests/steam/control/command-mutation-test.cpp similarity index 100% rename from tests/core/steam/control/command-mutation-test.cpp rename to tests/steam/control/command-mutation-test.cpp diff --git a/tests/core/steam/control/command-queue-test.cpp b/tests/steam/control/command-queue-test.cpp similarity index 100% rename from tests/core/steam/control/command-queue-test.cpp rename to tests/steam/control/command-queue-test.cpp diff --git a/tests/core/steam/control/command-registry-test.cpp b/tests/steam/control/command-registry-test.cpp similarity index 100% rename from tests/core/steam/control/command-registry-test.cpp rename to tests/steam/control/command-registry-test.cpp diff --git a/tests/core/steam/control/command-setup-test.cpp b/tests/steam/control/command-setup-test.cpp similarity index 100% rename from tests/core/steam/control/command-setup-test.cpp rename to tests/steam/control/command-setup-test.cpp diff --git a/tests/core/steam/control/command-use1-test.cpp b/tests/steam/control/command-use1-test.cpp similarity index 100% rename from tests/core/steam/control/command-use1-test.cpp rename to tests/steam/control/command-use1-test.cpp diff --git a/tests/core/steam/control/command-use2-test.cpp b/tests/steam/control/command-use2-test.cpp similarity index 100% rename from tests/core/steam/control/command-use2-test.cpp rename to tests/steam/control/command-use2-test.cpp diff --git a/tests/core/steam/control/command-use3-test.cpp b/tests/steam/control/command-use3-test.cpp similarity index 100% rename from tests/core/steam/control/command-use3-test.cpp rename to tests/steam/control/command-use3-test.cpp diff --git a/tests/core/steam/control/dispatcher-looper-test.cpp b/tests/steam/control/dispatcher-looper-test.cpp similarity index 100% rename from tests/core/steam/control/dispatcher-looper-test.cpp rename to tests/steam/control/dispatcher-looper-test.cpp diff --git a/tests/core/steam/control/handling-pattern-basics-test.cpp b/tests/steam/control/handling-pattern-basics-test.cpp similarity index 100% rename from tests/core/steam/control/handling-pattern-basics-test.cpp rename to tests/steam/control/handling-pattern-basics-test.cpp diff --git a/tests/core/steam/control/handling-pattern-standard-impl-test.cpp b/tests/steam/control/handling-pattern-standard-impl-test.cpp similarity index 100% rename from tests/core/steam/control/handling-pattern-standard-impl-test.cpp rename to tests/steam/control/handling-pattern-standard-impl-test.cpp diff --git a/tests/core/steam/control/memento-tie-test.cpp b/tests/steam/control/memento-tie-test.cpp similarity index 100% rename from tests/core/steam/control/memento-tie-test.cpp rename to tests/steam/control/memento-tie-test.cpp diff --git a/tests/core/steam/control/session-command-function-test.cpp b/tests/steam/control/session-command-function-test.cpp similarity index 100% rename from tests/core/steam/control/session-command-function-test.cpp rename to tests/steam/control/session-command-function-test.cpp diff --git a/tests/core/steam/control/test-dummy-commands.cpp b/tests/steam/control/test-dummy-commands.cpp similarity index 100% rename from tests/core/steam/control/test-dummy-commands.cpp rename to tests/steam/control/test-dummy-commands.cpp diff --git a/tests/core/steam/control/test-dummy-commands.hpp b/tests/steam/control/test-dummy-commands.hpp similarity index 100% rename from tests/core/steam/control/test-dummy-commands.hpp rename to tests/steam/control/test-dummy-commands.hpp diff --git a/tests/core/steam/engine/buffer-metadata-key-test.cpp b/tests/steam/engine/buffer-metadata-key-test.cpp similarity index 100% rename from tests/core/steam/engine/buffer-metadata-key-test.cpp rename to tests/steam/engine/buffer-metadata-key-test.cpp diff --git a/tests/core/steam/engine/buffer-metadata-test.cpp b/tests/steam/engine/buffer-metadata-test.cpp similarity index 100% rename from tests/core/steam/engine/buffer-metadata-test.cpp rename to tests/steam/engine/buffer-metadata-test.cpp diff --git a/tests/core/steam/engine/buffer-provider-protocol-test.cpp b/tests/steam/engine/buffer-provider-protocol-test.cpp similarity index 100% rename from tests/core/steam/engine/buffer-provider-protocol-test.cpp rename to tests/steam/engine/buffer-provider-protocol-test.cpp diff --git a/tests/core/steam/engine/calc-stream-test.cpp b/tests/steam/engine/calc-stream-test.cpp similarity index 100% rename from tests/core/steam/engine/calc-stream-test.cpp rename to tests/steam/engine/calc-stream-test.cpp diff --git a/tests/core/steam/engine/diagnostic-buffer-provider-test.cpp b/tests/steam/engine/diagnostic-buffer-provider-test.cpp similarity index 100% rename from tests/core/steam/engine/diagnostic-buffer-provider-test.cpp rename to tests/steam/engine/diagnostic-buffer-provider-test.cpp diff --git a/tests/core/steam/engine/dispatcher-interface-test.cpp b/tests/steam/engine/dispatcher-interface-test.cpp similarity index 100% rename from tests/core/steam/engine/dispatcher-interface-test.cpp rename to tests/steam/engine/dispatcher-interface-test.cpp diff --git a/tests/core/steam/engine/engine-ctx-test.cpp b/tests/steam/engine/engine-ctx-test.cpp similarity index 100% rename from tests/core/steam/engine/engine-ctx-test.cpp rename to tests/steam/engine/engine-ctx-test.cpp diff --git a/tests/core/steam/engine/engine-interface-test.cpp b/tests/steam/engine/engine-interface-test.cpp similarity index 100% rename from tests/core/steam/engine/engine-interface-test.cpp rename to tests/steam/engine/engine-interface-test.cpp diff --git a/tests/core/steam/engine/job-hash-test.cpp b/tests/steam/engine/job-hash-test.cpp similarity index 100% rename from tests/core/steam/engine/job-hash-test.cpp rename to tests/steam/engine/job-hash-test.cpp diff --git a/tests/core/steam/engine/job-planning-pipeline-test.cpp b/tests/steam/engine/job-planning-pipeline-test.cpp similarity index 100% rename from tests/core/steam/engine/job-planning-pipeline-test.cpp rename to tests/steam/engine/job-planning-pipeline-test.cpp diff --git a/tests/core/steam/engine/job-planning-test.cpp b/tests/steam/engine/job-planning-test.cpp similarity index 100% rename from tests/core/steam/engine/job-planning-test.cpp rename to tests/steam/engine/job-planning-test.cpp diff --git a/tests/core/steam/engine/mock-dispatcher.cpp b/tests/steam/engine/mock-dispatcher.cpp similarity index 100% rename from tests/core/steam/engine/mock-dispatcher.cpp rename to tests/steam/engine/mock-dispatcher.cpp diff --git a/tests/core/steam/engine/mock-dispatcher.hpp b/tests/steam/engine/mock-dispatcher.hpp similarity index 100% rename from tests/core/steam/engine/mock-dispatcher.hpp rename to tests/steam/engine/mock-dispatcher.hpp diff --git a/tests/core/steam/engine/mock-support-test.cpp b/tests/steam/engine/mock-support-test.cpp similarity index 100% rename from tests/core/steam/engine/mock-support-test.cpp rename to tests/steam/engine/mock-support-test.cpp diff --git a/tests/core/steam/engine/node-base-test.cpp b/tests/steam/engine/node-base-test.cpp similarity index 100% rename from tests/core/steam/engine/node-base-test.cpp rename to tests/steam/engine/node-base-test.cpp diff --git a/tests/core/steam/engine/node-builder-test.cpp b/tests/steam/engine/node-builder-test.cpp similarity index 100% rename from tests/core/steam/engine/node-builder-test.cpp rename to tests/steam/engine/node-builder-test.cpp diff --git a/tests/core/steam/engine/node-devel-test.cpp b/tests/steam/engine/node-devel-test.cpp similarity index 100% rename from tests/core/steam/engine/node-devel-test.cpp rename to tests/steam/engine/node-devel-test.cpp diff --git a/tests/core/steam/engine/node-feed-test.cpp b/tests/steam/engine/node-feed-test.cpp similarity index 100% rename from tests/core/steam/engine/node-feed-test.cpp rename to tests/steam/engine/node-feed-test.cpp diff --git a/tests/core/steam/engine/node-link-test.cpp b/tests/steam/engine/node-link-test.cpp similarity index 100% rename from tests/core/steam/engine/node-link-test.cpp rename to tests/steam/engine/node-link-test.cpp diff --git a/tests/core/steam/engine/node-meta-test.cpp b/tests/steam/engine/node-meta-test.cpp similarity index 100% rename from tests/core/steam/engine/node-meta-test.cpp rename to tests/steam/engine/node-meta-test.cpp diff --git a/tests/core/steam/engine/node-opera-test.cpp b/tests/steam/engine/node-opera-test.cpp similarity index 100% rename from tests/core/steam/engine/node-opera-test.cpp rename to tests/steam/engine/node-opera-test.cpp diff --git a/tests/core/steam/engine/node-storage-test.cpp b/tests/steam/engine/node-storage-test.cpp similarity index 100% rename from tests/core/steam/engine/node-storage-test.cpp rename to tests/steam/engine/node-storage-test.cpp diff --git a/tests/core/steam/engine/output-proxy-provider-test.cpp b/tests/steam/engine/output-proxy-provider-test.cpp similarity index 100% rename from tests/core/steam/engine/output-proxy-provider-test.cpp rename to tests/steam/engine/output-proxy-provider-test.cpp diff --git a/tests/core/steam/engine/scheduler-interface-test.cpp b/tests/steam/engine/scheduler-interface-test.cpp similarity index 100% rename from tests/core/steam/engine/scheduler-interface-test.cpp rename to tests/steam/engine/scheduler-interface-test.cpp diff --git a/tests/core/steam/engine/test-rand-ontology.cpp b/tests/steam/engine/test-rand-ontology.cpp similarity index 100% rename from tests/core/steam/engine/test-rand-ontology.cpp rename to tests/steam/engine/test-rand-ontology.cpp diff --git a/tests/core/steam/engine/test-rand-ontology.hpp b/tests/steam/engine/test-rand-ontology.hpp similarity index 100% rename from tests/core/steam/engine/test-rand-ontology.hpp rename to tests/steam/engine/test-rand-ontology.hpp diff --git a/tests/core/steam/engine/testframe-test.cpp b/tests/steam/engine/testframe-test.cpp similarity index 100% rename from tests/core/steam/engine/testframe-test.cpp rename to tests/steam/engine/testframe-test.cpp diff --git a/tests/core/steam/engine/testframe.cpp b/tests/steam/engine/testframe.cpp similarity index 100% rename from tests/core/steam/engine/testframe.cpp rename to tests/steam/engine/testframe.cpp diff --git a/tests/core/steam/engine/testframe.hpp b/tests/steam/engine/testframe.hpp similarity index 100% rename from tests/core/steam/engine/testframe.hpp rename to tests/steam/engine/testframe.hpp diff --git a/tests/core/steam/engine/timings-test.cpp b/tests/steam/engine/timings-test.cpp similarity index 100% rename from tests/core/steam/engine/timings-test.cpp rename to tests/steam/engine/timings-test.cpp diff --git a/tests/core/steam/fixture/fixture-change-detector-test.cpp b/tests/steam/fixture/fixture-change-detector-test.cpp similarity index 100% rename from tests/core/steam/fixture/fixture-change-detector-test.cpp rename to tests/steam/fixture/fixture-change-detector-test.cpp diff --git a/tests/core/steam/fixture/fixture-segment-test.cpp b/tests/steam/fixture/fixture-segment-test.cpp similarity index 100% rename from tests/core/steam/fixture/fixture-segment-test.cpp rename to tests/steam/fixture/fixture-segment-test.cpp diff --git a/tests/core/steam/fixture/model-port-registry-test.cpp b/tests/steam/fixture/model-port-registry-test.cpp similarity index 100% rename from tests/core/steam/fixture/model-port-registry-test.cpp rename to tests/steam/fixture/model-port-registry-test.cpp diff --git a/tests/core/steam/fixture/node-graph-attachment-test.cpp b/tests/steam/fixture/node-graph-attachment-test.cpp similarity index 100% rename from tests/core/steam/fixture/node-graph-attachment-test.cpp rename to tests/steam/fixture/node-graph-attachment-test.cpp diff --git a/tests/core/steam/fixture/segmentation-integration-test.cpp b/tests/steam/fixture/segmentation-integration-test.cpp similarity index 100% rename from tests/core/steam/fixture/segmentation-integration-test.cpp rename to tests/steam/fixture/segmentation-integration-test.cpp diff --git a/tests/core/steam/mobject/builder/build-segment-test.cpp b/tests/steam/mobject/builder/build-segment-test.cpp similarity index 100% rename from tests/core/steam/mobject/builder/build-segment-test.cpp rename to tests/steam/mobject/builder/build-segment-test.cpp diff --git a/tests/core/steam/mobject/builder/builder-tool-test.cpp b/tests/steam/mobject/builder/builder-tool-test.cpp similarity index 99% rename from tests/core/steam/mobject/builder/builder-tool-test.cpp rename to tests/steam/mobject/builder/builder-tool-test.cpp index b9b1ace9d..ac2dfecf9 100644 --- a/tests/core/steam/mobject/builder/builder-tool-test.cpp +++ b/tests/steam/mobject/builder/builder-tool-test.cpp @@ -24,7 +24,7 @@ #include "steam/asset/media.hpp" #include "steam/mobject/session/clip.hpp" #include "steam/mobject/test-dummy-mobject.hpp" -#include "vault/media-access-mock.hpp" +#include "steam/test/media-access-mock.hpp" #include "lib/depend-inject.hpp" #include "lib/format-cout.hpp" #include "lib/util.hpp" diff --git a/tests/core/steam/mobject/mobject-interface-test.cpp b/tests/steam/mobject/mobject-interface-test.cpp similarity index 98% rename from tests/core/steam/mobject/mobject-interface-test.cpp rename to tests/steam/mobject/mobject-interface-test.cpp index a470c8676..b4c955a82 100644 --- a/tests/core/steam/mobject/mobject-interface-test.cpp +++ b/tests/steam/mobject/mobject-interface-test.cpp @@ -30,7 +30,7 @@ //#include "steam/mobject/session/clip.hpp" //#include "steam/mobject/explicitplacement.hpp" #include "steam/mobject/test-dummy-mobject.hpp" -#include "vault/media-access-mock.hpp" +#include "steam/test/media-access-mock.hpp" #include "lib/depend-inject.hpp" #include "lib/time/timevalue.hpp" #include "lib/format-cout.hpp" diff --git a/tests/core/steam/mobject/mobject-ref-test.cpp b/tests/steam/mobject/mobject-ref-test.cpp similarity index 99% rename from tests/core/steam/mobject/mobject-ref-test.cpp rename to tests/steam/mobject/mobject-ref-test.cpp index 6a08aa743..ec3141f69 100644 --- a/tests/core/steam/mobject/mobject-ref-test.cpp +++ b/tests/steam/mobject/mobject-ref-test.cpp @@ -27,7 +27,7 @@ #include "steam/mobject/session/clip.hpp" #include "steam/mobject/explicitplacement.hpp" #include "steam/mobject/test-dummy-mobject.hpp" -#include "vault/media-access-mock.hpp" +#include "steam/test/media-access-mock.hpp" #include "lib/depend-inject.hpp" #include "test/test-helper.hpp" #include "lib/time/timevalue.hpp" diff --git a/tests/core/steam/mobject/placement-basic-test.cpp b/tests/steam/mobject/placement-basic-test.cpp similarity index 100% rename from tests/core/steam/mobject/placement-basic-test.cpp rename to tests/steam/mobject/placement-basic-test.cpp diff --git a/tests/core/steam/mobject/placement-hierarchy-test.cpp b/tests/steam/mobject/placement-hierarchy-test.cpp similarity index 99% rename from tests/core/steam/mobject/placement-hierarchy-test.cpp rename to tests/steam/mobject/placement-hierarchy-test.cpp index d7f0041ea..6769559ae 100644 --- a/tests/core/steam/mobject/placement-hierarchy-test.cpp +++ b/tests/steam/mobject/placement-hierarchy-test.cpp @@ -19,7 +19,7 @@ #include "test/run.hpp" #include "test/test-helper.hpp" #include "lib/depend-inject.hpp" -#include "vault/media-access-mock.hpp" +#include "steam/test/media-access-mock.hpp" #include "steam/mobject/test-dummy-mobject.hpp" #include "steam/mobject/session/clip.hpp" #include "steam/mobject/placement.hpp" diff --git a/tests/core/steam/mobject/placement-object-identity-test.cpp b/tests/steam/mobject/placement-object-identity-test.cpp similarity index 100% rename from tests/core/steam/mobject/placement-object-identity-test.cpp rename to tests/steam/mobject/placement-object-identity-test.cpp diff --git a/tests/core/steam/mobject/placement-ref-test.cpp b/tests/steam/mobject/placement-ref-test.cpp similarity index 100% rename from tests/core/steam/mobject/placement-ref-test.cpp rename to tests/steam/mobject/placement-ref-test.cpp diff --git a/tests/core/steam/mobject/session/add-clip-test.cpp b/tests/steam/mobject/session/add-clip-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/add-clip-test.cpp rename to tests/steam/mobject/session/add-clip-test.cpp diff --git a/tests/core/steam/mobject/session/defs-manager-impl-test.cpp b/tests/steam/mobject/session/defs-manager-impl-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/defs-manager-impl-test.cpp rename to tests/steam/mobject/session/defs-manager-impl-test.cpp diff --git a/tests/core/steam/mobject/session/defs-manager-test.cpp b/tests/steam/mobject/session/defs-manager-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/defs-manager-test.cpp rename to tests/steam/mobject/session/defs-manager-test.cpp diff --git a/tests/core/steam/mobject/session/defs-registry-impl-test.cpp b/tests/steam/mobject/session/defs-registry-impl-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/defs-registry-impl-test.cpp rename to tests/steam/mobject/session/defs-registry-impl-test.cpp diff --git a/tests/core/steam/mobject/session/deletecliptest.cpp b/tests/steam/mobject/session/deletecliptest.cpp similarity index 100% rename from tests/core/steam/mobject/session/deletecliptest.cpp rename to tests/steam/mobject/session/deletecliptest.cpp diff --git a/tests/core/steam/mobject/session/output-mapping-test.cpp b/tests/steam/mobject/session/output-mapping-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/output-mapping-test.cpp rename to tests/steam/mobject/session/output-mapping-test.cpp diff --git a/tests/core/steam/mobject/session/placement-index-query-test.cpp b/tests/steam/mobject/session/placement-index-query-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/placement-index-query-test.cpp rename to tests/steam/mobject/session/placement-index-query-test.cpp diff --git a/tests/core/steam/mobject/session/placement-index-test.cpp b/tests/steam/mobject/session/placement-index-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/placement-index-test.cpp rename to tests/steam/mobject/session/placement-index-test.cpp diff --git a/tests/core/steam/mobject/session/placement-scope-test.cpp b/tests/steam/mobject/session/placement-scope-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/placement-scope-test.cpp rename to tests/steam/mobject/session/placement-scope-test.cpp diff --git a/tests/core/steam/mobject/session/query-focus-stack-test.cpp b/tests/steam/mobject/session/query-focus-stack-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/query-focus-stack-test.cpp rename to tests/steam/mobject/session/query-focus-stack-test.cpp diff --git a/tests/core/steam/mobject/session/query-focus-test.cpp b/tests/steam/mobject/session/query-focus-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/query-focus-test.cpp rename to tests/steam/mobject/session/query-focus-test.cpp diff --git a/tests/core/steam/mobject/session/query-resolver-test.cpp b/tests/steam/mobject/session/query-resolver-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/query-resolver-test.cpp rename to tests/steam/mobject/session/query-resolver-test.cpp diff --git a/tests/core/steam/mobject/session/rebuildfixturetest.cpp b/tests/steam/mobject/session/rebuildfixturetest.cpp similarity index 100% rename from tests/core/steam/mobject/session/rebuildfixturetest.cpp rename to tests/steam/mobject/session/rebuildfixturetest.cpp diff --git a/tests/core/steam/mobject/session/scope-path-test.cpp b/tests/steam/mobject/session/scope-path-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/scope-path-test.cpp rename to tests/steam/mobject/session/scope-path-test.cpp diff --git a/tests/core/steam/mobject/session/scope-query-test.cpp b/tests/steam/mobject/session/scope-query-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/scope-query-test.cpp rename to tests/steam/mobject/session/scope-query-test.cpp diff --git a/tests/core/steam/mobject/session/session-element-query-test.cpp b/tests/steam/mobject/session/session-element-query-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/session-element-query-test.cpp rename to tests/steam/mobject/session/session-element-query-test.cpp diff --git a/tests/core/steam/mobject/session/session-element-tracker-test.cpp b/tests/steam/mobject/session/session-element-tracker-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/session-element-tracker-test.cpp rename to tests/steam/mobject/session/session-element-tracker-test.cpp diff --git a/tests/core/steam/mobject/session/session-manager-test.cpp b/tests/steam/mobject/session/session-manager-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/session-manager-test.cpp rename to tests/steam/mobject/session/session-manager-test.cpp diff --git a/tests/core/steam/mobject/session/session-modify-parts-test.cpp b/tests/steam/mobject/session/session-modify-parts-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/session-modify-parts-test.cpp rename to tests/steam/mobject/session/session-modify-parts-test.cpp diff --git a/tests/core/steam/mobject/session/session-service-access-test.cpp b/tests/steam/mobject/session/session-service-access-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/session-service-access-test.cpp rename to tests/steam/mobject/session/session-service-access-test.cpp diff --git a/tests/core/steam/mobject/session/session-structure-test.cpp b/tests/steam/mobject/session/session-structure-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/session-structure-test.cpp rename to tests/steam/mobject/session/session-structure-test.cpp diff --git a/tests/core/steam/mobject/session/test-scope-invalid.hpp b/tests/steam/mobject/session/test-scope-invalid.hpp similarity index 100% rename from tests/core/steam/mobject/session/test-scope-invalid.hpp rename to tests/steam/mobject/session/test-scope-invalid.hpp diff --git a/tests/core/steam/mobject/session/test-scopes.cpp b/tests/steam/mobject/session/test-scopes.cpp similarity index 100% rename from tests/core/steam/mobject/session/test-scopes.cpp rename to tests/steam/mobject/session/test-scopes.cpp diff --git a/tests/core/steam/mobject/session/test-scopes.hpp b/tests/steam/mobject/session/test-scopes.hpp similarity index 100% rename from tests/core/steam/mobject/session/test-scopes.hpp rename to tests/steam/mobject/session/test-scopes.hpp diff --git a/tests/core/steam/mobject/session/testclip.cpp b/tests/steam/mobject/session/testclip.cpp similarity index 98% rename from tests/core/steam/mobject/session/testclip.cpp rename to tests/steam/mobject/session/testclip.cpp index e382956a3..e77b0fa75 100644 --- a/tests/core/steam/mobject/session/testclip.cpp +++ b/tests/steam/mobject/session/testclip.cpp @@ -18,7 +18,7 @@ #include "steam/mobject/session/testclip.hpp" #include "vault/media-access-facade.hpp" -#include "vault/media-access-mock.hpp" +#include "steam/test/media-access-mock.hpp" #include "lib/depend-inject.hpp" #include "steam/asset/media.hpp" #include "steam/asset/clip.hpp" diff --git a/tests/core/steam/mobject/session/testclip.hpp b/tests/steam/mobject/session/testclip.hpp similarity index 100% rename from tests/core/steam/mobject/session/testclip.hpp rename to tests/steam/mobject/session/testclip.hpp diff --git a/tests/core/steam/mobject/session/testroot.hpp b/tests/steam/mobject/session/testroot.hpp similarity index 100% rename from tests/core/steam/mobject/session/testroot.hpp rename to tests/steam/mobject/session/testroot.hpp diff --git a/tests/core/steam/mobject/session/testsession1.hpp b/tests/steam/mobject/session/testsession1.hpp similarity index 100% rename from tests/core/steam/mobject/session/testsession1.hpp rename to tests/steam/mobject/session/testsession1.hpp diff --git a/tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp b/tests/steam/mobject/session/timeline-sequence-handling-test.cpp similarity index 100% rename from tests/core/steam/mobject/session/timeline-sequence-handling-test.cpp rename to tests/steam/mobject/session/timeline-sequence-handling-test.cpp diff --git a/tests/core/steam/play/diagnostic-output-slot.hpp b/tests/steam/play/diagnostic-output-slot.hpp similarity index 100% rename from tests/core/steam/play/diagnostic-output-slot.hpp rename to tests/steam/play/diagnostic-output-slot.hpp diff --git a/tests/core/steam/play/dummy-builder-context.hpp b/tests/steam/play/dummy-builder-context.hpp similarity index 100% rename from tests/core/steam/play/dummy-builder-context.hpp rename to tests/steam/play/dummy-builder-context.hpp diff --git a/tests/core/steam/play/dummy-play-connection-test.cpp b/tests/steam/play/dummy-play-connection-test.cpp similarity index 100% rename from tests/core/steam/play/dummy-play-connection-test.cpp rename to tests/steam/play/dummy-play-connection-test.cpp diff --git a/tests/core/steam/play/dummy-play-connection.cpp b/tests/steam/play/dummy-play-connection.cpp similarity index 100% rename from tests/core/steam/play/dummy-play-connection.cpp rename to tests/steam/play/dummy-play-connection.cpp diff --git a/tests/core/steam/play/dummy-play-connection.hpp b/tests/steam/play/dummy-play-connection.hpp similarity index 100% rename from tests/core/steam/play/dummy-play-connection.hpp rename to tests/steam/play/dummy-play-connection.hpp diff --git a/tests/core/steam/play/output-slot-protocol-test.cpp b/tests/steam/play/output-slot-protocol-test.cpp similarity index 100% rename from tests/core/steam/play/output-slot-protocol-test.cpp rename to tests/steam/play/output-slot-protocol-test.cpp diff --git a/tests/core/steam/play/timing-constraints-test.cpp b/tests/steam/play/timing-constraints-test.cpp similarity index 100% rename from tests/core/steam/play/timing-constraints-test.cpp rename to tests/steam/play/timing-constraints-test.cpp diff --git a/tests/core/steam/render-segment-test.cpp b/tests/steam/render-segment-test.cpp similarity index 100% rename from tests/core/steam/render-segment-test.cpp rename to tests/steam/render-segment-test.cpp diff --git a/tests/core/vault/media-access-mock-test.cpp b/tests/steam/test/media-access-mock-test.cpp similarity index 93% rename from tests/core/vault/media-access-mock-test.cpp rename to tests/steam/test/media-access-mock-test.cpp index c5e96c767..0d63fb868 100644 --- a/tests/core/vault/media-access-mock-test.cpp +++ b/tests/steam/test/media-access-mock-test.cpp @@ -17,11 +17,13 @@ ** @todo this test must be linked against the Core (including Steam), ** yet conceptually it belongs into the Vault, indicating a design mismatch. ** The test support facility drafted here was not used much since then. + ** @deprecated 2026 left in-tree as reference -- expected to be superseded + ** with the »Load Clip« vertical slice */ #include "vault/media-access-facade.hpp" -#include "vault/media-access-mock.hpp" +#include "steam/test/media-access-mock.hpp" #include "lib/depend-inject.hpp" #include "lib/format-cout.hpp" diff --git a/tests/core/vault/media-access-mock.cpp b/tests/steam/test/media-access-mock.cpp similarity index 96% rename from tests/core/vault/media-access-mock.cpp rename to tests/steam/test/media-access-mock.cpp index 403231ce0..bf0b6d6d8 100644 --- a/tests/core/vault/media-access-mock.cpp +++ b/tests/steam/test/media-access-mock.cpp @@ -18,6 +18,8 @@ ** a map of fixed response which will be delivered when querying some magic ** filenames. ** @todo this facility was occasionally used until 2011, yet never really completed + ** @deprecated 2026 left in-tree as reference -- expected to be superseded + ** with the »Load Clip« vertical slice ** ** @see mediaaccessmocktest.cpp validating the Mock ** @see MediaAccessFactory the real thing @@ -25,7 +27,7 @@ */ -#include "vault/media-access-mock.hpp" +#include "steam/test/media-access-mock.hpp" #include "steam/mobject/session/testclip.hpp" #include "lib/util.hpp" diff --git a/tests/core/vault/media-access-mock.hpp b/tests/steam/test/media-access-mock.hpp similarity index 88% rename from tests/core/vault/media-access-mock.hpp rename to tests/steam/test/media-access-mock.hpp index 4d1c649cf..b9a762461 100644 --- a/tests/core/vault/media-access-mock.hpp +++ b/tests/steam/test/media-access-mock.hpp @@ -21,11 +21,13 @@ ** from 'steam/mobject/session/testclip.hpp' — which highlights an conceptual ** ambiguity underlying this whole concept; at inception time, there was no ** clear notion pertaining the kind of structures related to the vault. + ** @deprecated 2026 left in-tree as reference -- expected to be superseded + ** with the »Load Clip« vertical slice */ -#ifndef VAULT_TEST_MEDIA_ACCESS_MOCK_H -#define VAULT_TEST_MEDIA_ACCESS_MOCK_H +#ifndef STEAM_TEST_MEDIA_ACCESS_MOCK_H +#define STEAM_TEST_MEDIA_ACCESS_MOCK_H #include "vault/media-access-facade.hpp" diff --git a/tests/vessel/DIR_INFO b/tests/vessel/DIR_INFO new file mode 100644 index 000000000..e2de0d954 --- /dev/null +++ b/tests/vessel/DIR_INFO @@ -0,0 +1 @@ +tests for application-level facilities diff --git a/tests/core/vessel/advice/advice-basics-test.cpp b/tests/vessel/advice/advice-basics-test.cpp similarity index 100% rename from tests/core/vessel/advice/advice-basics-test.cpp rename to tests/vessel/advice/advice-basics-test.cpp diff --git a/tests/core/vessel/advice/advice-binding-pattern-test.cpp b/tests/vessel/advice/advice-binding-pattern-test.cpp similarity index 100% rename from tests/core/vessel/advice/advice-binding-pattern-test.cpp rename to tests/vessel/advice/advice-binding-pattern-test.cpp diff --git a/tests/core/vessel/advice/advice-configuration-test.cpp b/tests/vessel/advice/advice-configuration-test.cpp similarity index 100% rename from tests/core/vessel/advice/advice-configuration-test.cpp rename to tests/vessel/advice/advice-configuration-test.cpp diff --git a/tests/core/vessel/advice/advice-index-test.cpp b/tests/vessel/advice/advice-index-test.cpp similarity index 100% rename from tests/core/vessel/advice/advice-index-test.cpp rename to tests/vessel/advice/advice-index-test.cpp diff --git a/tests/core/vessel/advice/advice-multiplicity-test.cpp b/tests/vessel/advice/advice-multiplicity-test.cpp similarity index 100% rename from tests/core/vessel/advice/advice-multiplicity-test.cpp rename to tests/vessel/advice/advice-multiplicity-test.cpp diff --git a/tests/core/vessel/advice/advice-situations-test.cpp b/tests/vessel/advice/advice-situations-test.cpp similarity index 100% rename from tests/core/vessel/advice/advice-situations-test.cpp rename to tests/vessel/advice/advice-situations-test.cpp diff --git a/tests/include/interface/say-hello.h b/tests/vessel/say-hello.h similarity index 100% rename from tests/include/interface/say-hello.h rename to tests/vessel/say-hello.h diff --git a/tests/core/vessel/subsystem-runner-test.cpp b/tests/vessel/subsystem-runner-test.cpp similarity index 100% rename from tests/core/vessel/subsystem-runner-test.cpp rename to tests/vessel/subsystem-runner-test.cpp diff --git a/tests/core/vessel/test-configloader.c b/tests/vessel/test-configloader.c similarity index 100% rename from tests/core/vessel/test-configloader.c rename to tests/vessel/test-configloader.c diff --git a/tests/core/vessel/test-interfaces.c b/tests/vessel/test-interfaces.c similarity index 99% rename from tests/core/vessel/test-interfaces.c rename to tests/vessel/test-interfaces.c index ce36da56b..84252da96 100644 --- a/tests/core/vessel/test-interfaces.c +++ b/tests/vessel/test-interfaces.c @@ -25,7 +25,8 @@ #include "vessel/config.h" #include "vessel/config-interface.h" -#include "interface/say-hello.h" +// Dummy/demonstration plugin-interface +#include "vessel/say-hello.h" /* define 2 example interfaces diff --git a/wiki/thinkPad.ichthyo.mm b/wiki/thinkPad.ichthyo.mm index 86c55cbfc..3927a97d9 100644 --- a/wiki/thinkPad.ichthyo.mm +++ b/wiki/thinkPad.ichthyo.mm @@ -115255,6 +115255,10 @@ StM_bind(Builder<R1> b1, Extension<R1,R2> extension) + + + + @@ -115267,7 +115271,7 @@ StM_bind(Builder<R1> b1, Extension<R1,R2> extension) - + @@ -115289,9 +115293,155 @@ StM_bind(Builder<R1> b1, Extension<R1,R2> extension) - - - + + + + + + + + + +

+ ...wo es gewollt war, daß jedermann jederzeit irgendwelche »Interfaces« sich ausdenken kann, auf die dann jederzeit jedermann mit irgendwelchen Plug-ins zugreifen kann +

+ + + + + + + + + + + + +

+ wo es konzeptionell auch hingehören würde (wenn man erst mal zuläßt, daß es Grenzen gibt, und eine Applikation, die diese umfaßt) +

+ + + + + + + + + + +

+ ....was ich wieder einmal als eine Bestätigung meiner Intuition verbuche... +

+
    +
  • + Christian hat seinerzeit meinen Ansatz für SCons abgelehnt, weil man dafür eine globale Struktur in die Codebasis einziehen muß +
    • +
  • + Chrisitan hat gesagt, nur der Code selber sollte Maßstab für alles sein +
    • +
  • + Christiian war ganz strikt dagegen, daß man in source-Trees denkt; er wollte jederzeit immer alle Möglichkeiten offen haben, und hat dafür in Kauf genommen, daß jede Datei explizit in Autotools reingehängt werden muß, mit Flags und Includes wie man grade lustig ist +
    • +
  • + das paßt konzeptionell exakt auf seine Vorstellung für die Plug-in-Architektur: er wollte diese (negativ) unbeschränkte Freiheit für Jedermann haben, und zwar, damit alles maximal einfach wird, und dadurch die gestaltenden Kräfte "der community" freigesetzt werden. +
    • +
  • + dem entsprechend war Christian's Basis-Implementierung für die Plugins „ganz einfach“ — und er hat sich strikt geweigert, sich auf irgendeinen meiner Vorschläge für Konventionen einzulassen. Seine Standard-Antwort war immer: „wenn Du es Dir kompliziert machen willst, dann ist das Dein Problem!“ +
    • +
  • + wenn irgend etwas in seinen mehrfachen Anläufen für den Plug-in-Loader nicht aufgegangen ist, hat er stets den vorherigen Entwurf verworfen und etwas neues erfunden um das jeweilge Problem auszuhebeln. +
    • +
  • + das ist aber keine Arroganz, sondern es ist sein Ansatz, eine Lösung schrittweise und inkrementell zu finden; dem entsprechend erwartet Chistian auch, daß »die Community« genauso vorgeht und dadurch von selber eine gesunde Ordnung entsteht. +
    • +
+

+ +

+

+ Ich dagegen kann in einem solchen Umfeld nicht arbeiten, weil ich strukturierend vorgehe, und Abstraktionen schaffen möchte, um die Spannweite meines Ausgriffs zu erweitern. Im Besonderen bin ich ganz am Anfang von dem Builder ausgegangen, und hab den als einen Compiler angelegt. Damit bin ich sehr schnell in eine schwierige Situation gekommen, in der ich systematisch, methodisch und langsam vorgehe, und einmal geregelde Sachen verbindlich sein müssen. Das heißt, anders als Christian, arbeite ich explorativ auf der Ebene von Konzepten, nicht auf der Ebene von konkretem Code. +

+

+ +

+

+ Ich weiß noch, daß ich erst mal einige Zeit Christian's Plugin-Loader gar nicht in den CSons-Build integriert hatte, und dann nur oberflächlich. Nachdem dann von Christian nichts mehr kam, habe ich seinen Entwurf ganz unauffällig etwas refactort, und konnte ihn damit auf ein Schema bringen, das allerdings ziemlich komplex und gar nicht intuitiv ist. +

+

+ +

+

+ Insofern können siche beide Seiten jeweils in ihrem Urteil bestätigt sehen. +

+ + + + + + + + + + + +

+ nachdem das nun abgeräumt ist, wird die Umstellung des Test-Builds tatsächlich einfach +

+ + + + + + + +

+ Die Hilfsfunktion hatte ich seinerzeit ja nur eingeführt, weil ich mit einem Haufen von Unterverzeichnissen konfontiert war, die keiner übergreifenden Struktur folgen. Und dazu war die Erwartung gesetzt, daß jede Menge weitere solche ad-hoc-Strukturen dazukommen. Ich wollte aber nicht für jede neue Idee von Christian wieder ein neues separates SConscript pflegen, denn dann wäre ich effektiv auf dem gleichen Level von Explizitiheit, den ich bei Autotools abgelehnt habe. +

+

+ +

+

+ Zwar behalte ich jetzt die Hilfsfunktionen noch bei, denn sie tragen in der nun ausgearbeiteten Form zur Lesbarkeit bei, und unterstreichen die systematische Natur der Layer-Linkage. Aber die ich kann nun den Code so anordnen, daß die Wurzel des Teilbaums (in der auch das SConscript liegt), selber der Include-root wird. +

+ + + + + + + + + + + + + + +

+ ...damit ich noch eine Chance habe, später zu entziffern, was ich mir seinerzeit gedacht habe +

+ + + + + + + + + + + + + + + + + + + + +