Merge branch 'v0.16.x_bugfix' into v0.16.x

integrity-tf · Jul 12, 2017 · 31eed45 · 31eed45
2 parents a9ba475 + fac3e87
commit 31eed45
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 10 deletions.
diff --git a/de.gebit.integrity.runner/src/de/gebit/integrity/runner/DefaultTestRunner.java b/de.gebit.integrity.runner/src/de/gebit/integrity/runner/DefaultTestRunner.java
@@ -1702,7 +1702,7 @@ protected void defineVariable(final VariableOrConstantEntity anEntity, Object an
 		// We need to send variable updates to forks in the main phase here
 		// This fixes issue #140: Constant defined within suite and then provided as suite parameter to a suite on a
 		// fork is nulled out (https://github.com/integrity-tf/integrity/issues/140)
-		setVariableValue(anEntity, tempInitialValue, !(isFork() && shouldExecuteFixtures()));
+		setVariableValue(anEntity, tempInitialValue, (!isFork()) && shouldExecuteFixtures());
 
 		if (currentCallback != null) {
 			Runnable tempRunnable = new Runnable() {

diff --git a/de.gebit.integrity.runner/src/de/gebit/integrity/runner/TestModel.java b/de.gebit.integrity.runner/src/de/gebit/integrity/runner/TestModel.java
@@ -249,14 +249,6 @@ public void addIntegrityScriptModel(Model aModel) {
 				tempFullyQualifiedName = IntegrityDSLUtil.getQualifiedSuiteName(tempSuite);
 				suiteMap.put(tempFullyQualifiedName, tempSuite);
 				tempType = "suite";
-
-				// // Suite params are technically variable definitions
-				// for (SuiteParameterDefinition tempParam : tempSuite.getParameters()) {
-				// VariableEntity tempEntity = tempParam.getName();
-				// tempFullyQualifiedName = IntegrityDSLUtil.getQualifiedVariableEntityName(tempEntity, true);
-				// variableAndConstantMap.put(tempFullyQualifiedName, tempEntity);
-				// variableAndConstantReverseMap.put(tempEntity, tempFullyQualifiedName);
-				// }
 			} else if (tempObject instanceof SuiteParameterDefinition) {
 				// Suite params are technically variable definitions
 				SuiteParameterDefinition tempDefinition = (SuiteParameterDefinition) tempObject;

diff --git a/...ebit.integrity.runner/src/de/gebit/integrity/runner/variables/DefaultVariableManager.java b/...ebit.integrity.runner/src/de/gebit/integrity/runner/variables/DefaultVariableManager.java
@@ -172,7 +172,8 @@ public boolean isDefined(Variable aVariable) {
 	public void set(VariableOrConstantEntity anEntity, Object aValue) {
 		if (anEntity instanceof ConstantEntity) {
 			if (variableMap.containsKey(anEntity)) {
-				throw new RuntimeException("Illegal attempt to redefine a constant: " + anEntity.getName());
+				throw new RuntimeException("Illegal attempt to redefine a constant: "
+						+ IntegrityDSLUtil.getQualifiedVariableEntityName(anEntity, true));
 			}
 		}
 		variableMap.put(anEntity, makeNull(aValue));