Merge branch 'master' into 'master'

Correction of #757 SimplifyBooleanAssertion

See merge request naomod/mde/projet-2019!141

src/main/atl/analysis.atl

@@ -73,8 +73,7 @@ helper def: allMeasures(project : java!Model): Set(smm!Measure) =
 		thisModule.signatureDeclareThrowsException(),
 		thisModule.tooManyFields(),
 		thisModule.tooManyMethods(),
-		-- #FIXME:
-		-- thisModule.SimplifyBooleanAssertion(),
+		thisModule.SimplifyBooleanAssertion(),
 
 		-- Performance rules
 		--
@@ -124,7 +123,7 @@ helper def: allMeasures(project : java!Model): Set(smm!Measure) =
 		thisModule.UseProperClassLoader(),
 		
 		-- Best practices rules
-		thisModule.avoidReassigningParameters(),
+		--thisModule.avoidReassigningParameters(),
 		thisModule.avoidStringBufferField(),
 		thisModule.forLoopVariableCount(),
 		thisModule.switchDensity(),

src/main/atl/design.atl

@@ -135,6 +135,7 @@ helper def: ExcessiveClassLength() : Set(smm!Measure) =
 helper def: SimplifyBooleanAssertion() : Set(java!PrefixExpression) = 
     java!PrefixExpression.allInstances()
 	-> select(i | i.operator.toString() = '!')
+	-> select(i | i.eContainer().oclIsTypeOf(java!MethodInvocation))
 	-> select(i | i.eContainer().method.name = 'assertTrue' or i.eContainer().method.name = 'assertFalse')
 	-> collect(i | thisModule.MeasureSimplifyBooleanAssertion(i));