potentially fix failing Windows catch test (arangodb#7079)

jsteemann · web-flow · commit 78af18dfd2cd · 2018-10-26T10:10:53.000+02:00
* potentially fix failing Windows catch test * added lines suggested by @KVS85
diff --git a/arangod/ClusterEngine/ClusterEngine.cpp b/arangod/ClusterEngine/ClusterEngine.cpp
@@ -82,30 +82,31 @@ ClusterEngine::ClusterEngine(application_features::ApplicationServer& server)
 ClusterEngine::~ClusterEngine() { }
 
 bool ClusterEngine::isRocksDB() const {
-  return _actualEngine && _actualEngine->name() == RocksDBEngine::FeatureName;
+  return !ClusterEngine::Mocking && _actualEngine && _actualEngine->name() == RocksDBEngine::FeatureName;
 }
 
 bool ClusterEngine::isMMFiles() const {
-  return _actualEngine && _actualEngine->name() == MMFilesEngine::FeatureName;
+  return !ClusterEngine::Mocking && _actualEngine && _actualEngine->name() == MMFilesEngine::FeatureName;
 }
 
 bool ClusterEngine::isMock() const {
   return ClusterEngine::Mocking || (_actualEngine && _actualEngine->name() == "Mock");
 }
 
 ClusterEngineType ClusterEngine::engineType() const {
+  if (isMock()) {
+    return ClusterEngineType::MockEngine;
+  }
   TRI_ASSERT(_actualEngine != nullptr);
 
   if (isMMFiles()) {
     return ClusterEngineType::MMFilesEngine;
   } else if (isRocksDB()) {
     return ClusterEngineType::RocksDBEngine;
-  } else if (isMock()) {
-    return ClusterEngineType::MockEngine;
   }
 
   TRI_ASSERT(false);
-  THROW_ARANGO_EXCEPTION(TRI_ERROR_INTERNAL);
+  THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "invalid engine type");
 }
 
 // inherited from ApplicationFeature
@@ -390,6 +391,7 @@ void ClusterEngine::addOptimizerRules() {
   } else if (engineType() == ClusterEngineType::RocksDBEngine) {
     RocksDBOptimizerRules::registerResources();
   } else if (engineType() != ClusterEngineType::MockEngine) {
+    // invalid engine type...
     TRI_ASSERT(false);
   }
 }
diff --git a/tests/IResearch/common.cpp b/tests/IResearch/common.cpp
@@ -32,6 +32,7 @@
 #include "Aql/ExpressionContext.h"
 #include "Aql/Ast.h"
 #include "ClusterEngine/ClusterEngine.h"
+#include "Random/RandomGenerator.h"
 #include "Basics/files.h"
 #include "RestServer/DatabasePathFeature.h"
 #include "V8/v8-utils.h"
@@ -132,6 +133,7 @@ namespace tests {
 void init(bool withICU /*= false*/) {
   arangodb::transaction::Methods::clearDataSourceRegistrationCallbacks();
   ClusterEngine::Mocking = true;
+  arangodb::RandomGenerator::initialize(arangodb::RandomGenerator::RandomType::MERSENNE);
 }
 
 // @Note: once V8 is initialized all 'CATCH' errors will result in SIGILL

Original file line number	Diff line number	Diff line change
`@@ -82,30 +82,31 @@ ClusterEngine::ClusterEngine(application_features::ApplicationServer& server)`
`82`	`82`	`ClusterEngine::~ClusterEngine() { }`
`83`	`83`
`84`	`84`	`bool ClusterEngine::isRocksDB() const {`
`85`		`- return _actualEngine && _actualEngine->name() == RocksDBEngine::FeatureName;`
	`85`	`+ return !ClusterEngine::Mocking && _actualEngine && _actualEngine->name() == RocksDBEngine::FeatureName;`
`86`	`86`	`}`
`87`	`87`
`88`	`88`	`bool ClusterEngine::isMMFiles() const {`
`89`		`- return _actualEngine && _actualEngine->name() == MMFilesEngine::FeatureName;`
	`89`	`+ return !ClusterEngine::Mocking && _actualEngine && _actualEngine->name() == MMFilesEngine::FeatureName;`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`bool ClusterEngine::isMock() const {`
`93`	`93`	`return ClusterEngine::Mocking \|\| (_actualEngine && _actualEngine->name() == "Mock");`
`94`	`94`	`}`
`95`	`95`
`96`	`96`	`ClusterEngineType ClusterEngine::engineType() const {`
	`97`	`+ if (isMock()) {`
	`98`	`+ return ClusterEngineType::MockEngine;`
	`99`	`+ }`
`97`	`100`	`TRI_ASSERT(_actualEngine != nullptr);`
`98`	`101`
`99`	`102`	`if (isMMFiles()) {`
`100`	`103`	`return ClusterEngineType::MMFilesEngine;`
`101`	`104`	`} else if (isRocksDB()) {`
`102`	`105`	`return ClusterEngineType::RocksDBEngine;`
`103`		`- } else if (isMock()) {`
`104`		`- return ClusterEngineType::MockEngine;`
`105`	`106`	`}`
`106`	`107`
`107`	`108`	`TRI_ASSERT(false);`
`108`		`- THROW_ARANGO_EXCEPTION(TRI_ERROR_INTERNAL);`
	`109`	`+ THROW_ARANGO_EXCEPTION_MESSAGE(TRI_ERROR_INTERNAL, "invalid engine type");`
`109`	`110`	`}`
`110`	`111`
`111`	`112`	`// inherited from ApplicationFeature`
`@@ -390,6 +391,7 @@ void ClusterEngine::addOptimizerRules() {`
`390`	`391`	`} else if (engineType() == ClusterEngineType::RocksDBEngine) {`
`391`	`392`	`RocksDBOptimizerRules::registerResources();`
`392`	`393`	`} else if (engineType() != ClusterEngineType::MockEngine) {`
	`394`	`+ // invalid engine type...`
`393`	`395`	`TRI_ASSERT(false);`
`394`	`396`	`}`
`395`	`397`	`}`