typos
This commit is contained in:
parent
75bdc877dc
commit
7a2bbefb1d
7 changed files with 45 additions and 47 deletions
|
|
@ -83,7 +83,7 @@ namespace asset
|
|||
|
||||
/** Factory method for Structural Asset instances.
|
||||
* First tries to relove the asset by issuing an capability query.
|
||||
* If unsuccessfull, use some internally specialized ctor call.
|
||||
* If unsuccessful, use some internally specialised ctor call.
|
||||
* @todo work out the struct asset naming scheme!
|
||||
* @return an Struct smart ptr linked to the internally registered smart ptr
|
||||
* created as a side effect of calling the concrete Struct subclass ctor.
|
||||
|
|
@ -109,7 +109,7 @@ namespace asset
|
|||
|
||||
|
||||
/** Factory method for creating Pipes explicitly.
|
||||
* Normalizes pipe- and streamID, then retrieves the
|
||||
* Normalises pipe- and streamID, then retrieves the
|
||||
* default processing pattern (ProcPatt) for this streamID.
|
||||
* The Pipe ctor will fill out the shortDesc and longDesc
|
||||
* automatically, based on pipeID and streamID (and they
|
||||
|
|
|
|||
|
|
@ -44,8 +44,8 @@ namespace mobject {
|
|||
|
||||
|
||||
/**
|
||||
* Organize a collection of preconfigured default objects.
|
||||
* For various kinds of objects we can tweek the default parametrisation
|
||||
* Organise a collection of preconfigured default objects.
|
||||
* For various kinds of objects we can tweak the default parametrisation
|
||||
* as part of the general session configuration. A ref to an instance of
|
||||
* this class is accessible through the current session and can be used
|
||||
* to fill in parts of the configuration of new objects, if the user
|
||||
|
|
@ -88,10 +88,10 @@ namespace mobject {
|
|||
template<class TAR>
|
||||
P<TAR> create (const lumiera::Query<TAR>&);
|
||||
|
||||
/** register the given object as default, after ensuring it fulfills the
|
||||
/** register the given object as default, after ensuring it fulfils the
|
||||
* query. The latter may cause some properties of the object to be set,
|
||||
* trigger creation of additional objects, and may fail altogether.
|
||||
* @return true if query was successfull and object is registered as default
|
||||
* @return true if query was successful and object is registered as default
|
||||
* @note only a weak ref to the object is stored
|
||||
*/
|
||||
template<class TAR>
|
||||
|
|
|
|||
|
|
@ -180,38 +180,38 @@ END
|
|||
|
||||
|
||||
TEST "Factory_test" Factory_test 5 <<END
|
||||
out: ctor TargetObj(5) successfull
|
||||
out: ctor TargetObj(5) successful
|
||||
out: now the smart-ptr has refcount=3
|
||||
out: .....TargetObj(5): data="*****", array[5]={0,1,2,3,4,}
|
||||
out: dtor ~TargetObj(5) successfull
|
||||
out: dtor ~TargetObj(5) successful
|
||||
END
|
||||
|
||||
|
||||
TEST "Factory_special_test" Factory_special_test 5 <<END
|
||||
out: checkPlacement--------
|
||||
out: ctor TargetObj(5) successfull
|
||||
out: ctor TargetObj(5) successful
|
||||
out: created 3 shared_ptrs to Object placed in static buffer.
|
||||
out: .....TargetObj(5): data="*****", array[5]={0,1,2,3,4,}
|
||||
out: dtor ~TargetObj(5) successfull
|
||||
out: ctor TargetObj(6) successfull
|
||||
out: dtor ~TargetObj(5) successful
|
||||
out: ctor TargetObj(6) successful
|
||||
out: created 4 shared_ptrs to Object placed in static buffer.
|
||||
out: dtor ~TargetObj(6) successfull
|
||||
out: dtor ~TargetObj(6) successful
|
||||
out: checkPrivate--------
|
||||
out: ctor TargetObj(5) successfull
|
||||
out: ctor TargetObj(5) successful
|
||||
out: created 3 shared_ptrs to paranoid Object.
|
||||
out: .....TargetObj(5): data="*****", array[5]={0,1,2,3,4,}
|
||||
out: dtor ~TargetObj(5) successfull
|
||||
out: dtor ~TargetObj(5) successful
|
||||
out: checkMalloc--------
|
||||
out: ctor TargetObj(7) successfull
|
||||
out: ctor TargetObj(7) successful
|
||||
out: created auto_ptr to malloc-ed Object.
|
||||
out: .....TargetObj(7): data="*******", array[7]={0,1,2,3,4,5,6,}
|
||||
out: dtor ~TargetObj(7) successfull
|
||||
out: dtor ~TargetObj(7) successful
|
||||
out: checkPImpl--------
|
||||
out: ctor TargetObj(12) successfull
|
||||
out: ctor TargetObj(12) successful
|
||||
out: created auto_ptr to Interface Object.
|
||||
out: .....ImplObj::funky() called
|
||||
out: .....TargetObj(12): data="************", array[12]={0,1,2,3,4,5,6,7,8,9,10,11,}
|
||||
out: dtor ~TargetObj(12) successfull
|
||||
out: dtor ~TargetObj(12) successful
|
||||
END
|
||||
|
||||
|
||||
|
|
@ -251,10 +251,10 @@ END
|
|||
|
||||
TEST "SingletonSubclass_test" SingletonSubclass_test 13 <<END
|
||||
out: using the Singleton should create TargetObj(13)...
|
||||
out: ctor TargetObj(13) successfull
|
||||
out: ctor TargetObj(13) successful
|
||||
out: calling a non-static method on the Singleton-Implementation
|
||||
out: .....TargetObj(13): data="*************", array[13]={0,1,2,3,4,5,6,7,8,9,10,11,12,}
|
||||
out: dtor ~TargetObj(13) successfull
|
||||
out: dtor ~TargetObj(13) successful
|
||||
END
|
||||
|
||||
|
||||
|
|
@ -297,15 +297,15 @@ END
|
|||
|
||||
TEST "Singleton_test" Singleton_test 23 <<END
|
||||
out: testing TargetObj(23) as Singleton(statically allocated)
|
||||
out: ctor TargetObj(23) successfull
|
||||
out: ctor TargetObj(23) successful
|
||||
out: calling a non-static method on the Singleton instance
|
||||
out: .....TargetObj(23): data="***********************", array[23]={0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,}
|
||||
out: testing TargetObj(24) as Singleton(heap allocated)
|
||||
out: ctor TargetObj(24) successfull
|
||||
out: ctor TargetObj(24) successful
|
||||
out: calling a non-static method on the Singleton instance
|
||||
out: .....TargetObj(24): data="************************", array[24]={0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,}
|
||||
out: dtor ~TargetObj(23) successfull
|
||||
out: dtor ~TargetObj(24) successfull
|
||||
out: dtor ~TargetObj(23) successful
|
||||
out: dtor ~TargetObj(24) successful
|
||||
END
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ END
|
|||
|
||||
TEST "QueryUtils_test" QueryUtils_test normalizeID <<END
|
||||
out: ..original : a A AA dufte 1a _1 A_A BÄH White space §&Ω%€GΩ%€ar Ω baäääääge!!!!! :
|
||||
out: normalized : a a aA dufte o1a o_1 a_A bH o white_space gar_bage :
|
||||
out: normalised : a a aA dufte o1a o_1 a_A bH o white_space gar_bage :
|
||||
END
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -91,17 +91,17 @@ namespace lumiera
|
|||
|
||||
|
||||
/** @test simply throw some exception and pass context info */
|
||||
void throwSpecial (string _) { throw SpecificError(); }
|
||||
void throwDerived (string _) { throw DerivedError(); }
|
||||
void throwSpecial (string ) { throw SpecificError(); }
|
||||
void throwDerived (string ) { throw DerivedError(); }
|
||||
void throwFatal (string _) { throw error::Fatal(_); }
|
||||
void throwInvalid (string _) { throw error::Invalid(_); }
|
||||
void throwExternal(string _) { throw error::External(_); }
|
||||
void throwRuntime (string _) { throw std::runtime_error(_); }
|
||||
void throwExceptn (string _) { throw std::exception(); }
|
||||
void throwExceptn (string ) { throw std::exception(); }
|
||||
|
||||
|
||||
/** @test catching, repackaging and rethrowing of errors.
|
||||
* This feature is important for passing exceptions transparentely
|
||||
* This feature is important for passing exceptions transparently
|
||||
* over several layers. The nested operation will throw an error::External,
|
||||
* which we are able to catch because it is derived from std::exception.
|
||||
* We don't need to know the exact type, but we can classify the error situation
|
||||
|
|
@ -178,9 +178,9 @@ namespace lumiera
|
|||
}
|
||||
|
||||
|
||||
/** @test terminate the Application by throwing an undclared exception.
|
||||
/** @test terminate the Application by throwing an undeclared exception.
|
||||
* this should result in the global unknown() handler to be called,
|
||||
* so usually it will terminate the testrun.
|
||||
* so usually it will terminate the test run.
|
||||
* @note inside error.hpp, an initialisation hook has been installed into
|
||||
* AppState, causing our own unknown() handler to be installed and
|
||||
* invoked, which gives additional diagnostics.*/
|
||||
|
|
|
|||
|
|
@ -44,12 +44,10 @@ using std::cout;
|
|||
|
||||
|
||||
|
||||
namespace lumiera
|
||||
{
|
||||
namespace query
|
||||
{
|
||||
namespace test
|
||||
{
|
||||
namespace lumiera {
|
||||
namespace query {
|
||||
namespace test{
|
||||
|
||||
|
||||
struct Thing
|
||||
{
|
||||
|
|
@ -59,7 +57,7 @@ namespace lumiera
|
|||
|
||||
|
||||
/************************************************************************
|
||||
* @test check the various small helpers and utilities we utilize
|
||||
* @test check the various small helpers and utilities we utilise
|
||||
* for dealing with ConfigQuery
|
||||
*/
|
||||
class QueryUtils_test : public Test
|
||||
|
|
@ -88,7 +86,7 @@ namespace lumiera
|
|||
|
||||
|
||||
|
||||
/** @test sanitizing and normalizing various tokens */
|
||||
/** @test sanitising and normalising various tokens */
|
||||
void
|
||||
check_normalizeID ()
|
||||
{
|
||||
|
|
@ -101,7 +99,7 @@ namespace lumiera
|
|||
|
||||
for_each (tokens, bind ( &normalizeID, _1 ));
|
||||
|
||||
cout << "normalized : " << tokens << " :\n";
|
||||
cout << "normalised : " << tokens << " :\n";
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -115,7 +113,7 @@ namespace lumiera
|
|||
ASSERT ("tok" == extractID ("pred", "pred(tok), pred(tux)." ));
|
||||
ASSERT ("tok" == extractID ("pred", "other(xyz) pred(tok) pred(tux)" ));
|
||||
ASSERT ("tok" == extractID ("pred", "some( pred(tok)" ));
|
||||
|
||||
|
||||
ASSERT (isnil (extractID ("pred", "pred (tok)")));
|
||||
ASSERT (isnil (extractID ("pred", "pred tok)" )));
|
||||
ASSERT (isnil (extractID ("pred", "pred(tok " )));
|
||||
|
|
@ -127,14 +125,14 @@ namespace lumiera
|
|||
void
|
||||
check_removeTerm ()
|
||||
{
|
||||
// successfull-----Symbol---input-string----------------------extracted------remaining-------------
|
||||
// successful------Symbol---input-string----------------------extracted------remaining-------------
|
||||
ASSERT_removeTerm ("pred", "pred(tok).", "pred(tok)", "." );
|
||||
ASSERT_removeTerm ("pred", " pred( tok )", "pred(tok)", " " );
|
||||
ASSERT_removeTerm ("pred", "pred(tok), pred(tux).", "pred(tok)", "pred(tux)." );
|
||||
ASSERT_removeTerm ("pred", "other(xyz) pred(tok) pred(tux)", "pred(tok)", "other(xyz) pred(tux)" );
|
||||
ASSERT_removeTerm ("pred", "some( pred(tok)", "pred(tok)", "some( " );
|
||||
|
||||
// not successfull
|
||||
// not successful
|
||||
ASSERT_removeTerm ("pred", "pred (tok", "", "pred (tok" );
|
||||
ASSERT_removeTerm ("pred", "pred tok)", "", "pred tok)" );
|
||||
ASSERT_removeTerm ("pred", "pred(tok", "", "pred(tok" );
|
||||
|
|
@ -149,7 +147,7 @@ namespace lumiera
|
|||
|
||||
|
||||
|
||||
/** @test counting of predicates in a quiery
|
||||
/** @test counting of predicates in a query
|
||||
* (currently 4/08 regexp based...)
|
||||
*/
|
||||
void
|
||||
|
|
@ -167,7 +165,7 @@ namespace lumiera
|
|||
|
||||
|
||||
} // namespace test
|
||||
|
||||
|
||||
} // namespace query
|
||||
|
||||
} // namespace lumiera
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ namespace lumiera
|
|||
{
|
||||
for (uint i=0; i<cnt_; ++i)
|
||||
heapArray_[i] = lexical_cast<string>(i);
|
||||
cout << format("ctor TargetObj(%i) successfull\n") % cnt_;
|
||||
cout << format("ctor TargetObj(%i) successful\n") % cnt_;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -82,7 +82,7 @@ namespace lumiera
|
|||
{
|
||||
delete heapData_;
|
||||
delete[] heapArray_;
|
||||
cout << format("dtor ~TargetObj(%i) successfull\n") % cnt_;
|
||||
cout << format("dtor ~TargetObj(%i) successful\n") % cnt_;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue