Now uses default location for test scripts when test is invoked with …

…no cmdline args - this is to faciltate use of windows debugger
openhome · Apr 1, 2014 · ac7ed2e · ac7ed2e
1 parent 160f9be
commit ac7ed2e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 13 deletions.
diff --git a/OpenHome/Tests/TestScriptHttpReader.h b/OpenHome/Tests/TestScriptHttpReader.h
@@ -15,7 +15,7 @@ namespace OpenHome {
 class TestScriptHttpReader : public HttpReader
 {
 public:
-    TestScriptHttpReader(Environment& aEnv, const std::vector<Brn>& aArgs)
+    TestScriptHttpReader(Environment& aEnv, std::vector<Brn>& aArgs)
         :HttpReader(aEnv)
     {
         OptionParser parser;

diff --git a/OpenHome/Tests/TestTopology1.cpp b/OpenHome/Tests/TestTopology1.cpp
@@ -161,15 +161,14 @@ void SuiteTopology1::ScheduleCallback(void* aObj)
 
 ////////////////////////////////////////////
 
-void TestTopology1(Environment& aEnv, const std::vector<Brn>& aArgs)
+void TestTopology1(Environment& aEnv, std::vector<Brn>& aArgs)
 {
-/*
-    if(aArgs.size()==0)
+    if(aArgs.size()<2)
     {
-        Log::Print("NO ARGUMENTS SUPPLIED!!!");
-        ASSERTS();
+        aArgs.push_back(Brn("--path"));
+        aArgs.push_back(Brn("~eamonnb/Topology1TestScript.txt"));
     }
-*/
+
     TestScriptHttpReader reader(aEnv, aArgs);
 
     Runner runner("Topology1 tests\n");

diff --git a/OpenHome/Tests/TestTopology1Main.cpp b/OpenHome/Tests/TestTopology1Main.cpp
@@ -4,7 +4,7 @@
 
 using namespace OpenHome;
 
-extern void TestTopology1(OpenHome::Environment& aEnv, const std::vector<Brn>& aArgs);
+extern void TestTopology1(OpenHome::Environment& aEnv, std::vector<Brn>& aArgs);
 
 void OpenHome::TestFramework::Runner::Main(TInt aArgc, TChar* aArgv[], Net::InitialisationParams* aInitParams)
 {

diff --git a/OpenHome/Tests/TestTopology2.cpp b/OpenHome/Tests/TestTopology2.cpp
@@ -298,9 +298,14 @@ void SuiteTopology2::ScheduleCallback(void* aObj)
 
 ////////////////////////////////////////////
 
-void TestTopology2(Environment& aEnv, const std::vector<Brn>& aArgs)
+void TestTopology2(Environment& aEnv, std::vector<Brn>& aArgs)
 {
-    //Debug::SetLevel(Debug::kTrace);
+    if(aArgs.size()<2)
+    {
+        aArgs.push_back(Brn("--path"));
+        aArgs.push_back(Brn("~eamonnb/Topology2TestScript.txt"));
+    }
+
     TestScriptHttpReader reader(aEnv, aArgs);
 
     Runner runner("Topology2 tests\n");

diff --git a/OpenHome/Tests/TestTopology2Main.cpp b/OpenHome/Tests/TestTopology2Main.cpp
@@ -4,7 +4,7 @@
 
 using namespace OpenHome;
 
-extern void TestTopology2(OpenHome::Environment& aEnv, const std::vector<Brn>& aArgs);
+extern void TestTopology2(OpenHome::Environment& aEnv, std::vector<Brn>& aArgs);
 
 void OpenHome::TestFramework::Runner::Main(TInt aArgc, TChar* aArgv[], Net::InitialisationParams* aInitParams)
 {

diff --git a/OpenHome/Tests/TestTopologym.cpp b/OpenHome/Tests/TestTopologym.cpp
@@ -201,8 +201,13 @@ void SuiteTopologym::ScheduleCallback(void* aObj)
 
 ////////////////////////////////////////////
 
-void TestTopologym(Environment& aEnv, const std::vector<Brn>& aArgs)
+void TestTopologym(Environment& aEnv, std::vector<Brn>& aArgs)
 {
+    if(aArgs.size()<2)
+    {
+        aArgs.push_back(Brn("--path"));
+        aArgs.push_back(Brn("~eamonnb/TopologymTestScript.txt"));
+    }
     TestScriptHttpReader reader(aEnv, aArgs);
     Runner runner("Topologym tests\n");
     runner.Add(new SuiteTopologym(reader));

diff --git a/OpenHome/Tests/TestTopologymMain.cpp b/OpenHome/Tests/TestTopologymMain.cpp
@@ -4,7 +4,7 @@
 
 using namespace OpenHome;
 
-extern void TestTopologym(OpenHome::Environment& aEnv, const std::vector<Brn>& aArgs);
+extern void TestTopologym(OpenHome::Environment& aEnv, std::vector<Brn>& aArgs);
 
 void OpenHome::TestFramework::Runner::Main(TInt aArgc, TChar* aArgv[], Net::InitialisationParams* aInitParams)
 {