Update deviations tests, which copy A0-1-2

Author: MichaelRFairhurst

cpp/common/test/deviations/deviation_permits_basic_test/UnusedReturnValue.ql

@@ -1,5 +1,5 @@
 /**
- * @id cpp/autosar/unused-return-value
+ * @id cpp/autosar/unused-return-value-autosar
  * @name A0-1-2: Unused return value
  * @description The value returned by a function having a non-void return type that is not an
  *              overloaded operator shall be used.
@@ -17,31 +17,11 @@
 import cpp
 import codingstandards.cpp.CodingStandards
 import codingstandards.cpp.exclusions.cpp.RuleMetadata
+import codingstandards.cpp.rules.unusedreturnvalue.UnusedReturnValue
 
 /* This is a copy of an AUTOSAR rule, which we are using for testing purposes. */
-/*
- * This query performs a simple syntactic check to ensure that the return value of the function is
- * not completely ignored. This matches the examples given in the rule, although the text itself is
- * not entirely clear. This means it will not find cases where something is done with the return
- * value, but it is not meaningfully read. For example: `int ret_val = f();`, with no subsequent
- * access of `ret_val`. However, such a case _would_ be flagged by A0-1-1 - Useless assignment.
- */
+module UnusedReturnValueAutosarConfig implements UnusedReturnValueConfigSig {
+  Query getQuery() { result = DeadCodePackage::unusedReturnValueAutosarQuery() }
+}
 
-from FunctionCall fc, Function f
-where
-  not isExcluded(fc, DeadCodePackage::unusedReturnValueQuery()) and
-  // Find function calls in `ExprStmt`s, which indicate the return value is ignored
-  fc.getParent() instanceof ExprStmt and
-  // Ignore calls to void functions, which don't return values
-  not fc.getType() instanceof VoidType and
-  // Get the function target
-  f = fc.getTarget() and
-  // Overloaded (i.e. user defined) operators should behave in the same way as built-in operators,
-  // so the rule does not require the use of the return value
-  not f instanceof Operator and
-  // Exclude cases where the function call is generated within a macro, as the user of the macro is
-  // not necessarily able to address thoes results
-  not fc.isAffectedByMacro() and
-  // Rule allows disabling this rule where a static_cast<void> is applied
-  not fc.getExplicitlyConverted().(StaticCast).getActualType() instanceof VoidType
-select fc, "Return value from call to $@ is unused.", f, f.getName()
+import UnusedReturnValue<UnusedReturnValueAutosarConfig>

cpp/common/test/deviations/deviations_basic_test/UnusedReturnValue.ql

@@ -1,5 +1,5 @@
 /**
- * @id cpp/autosar/unused-return-value
+ * @id cpp/autosar/unused-return-value-autosar
  * @name A0-1-2: Unused return value
  * @description The value returned by a function having a non-void return type that is not an
  *              overloaded operator shall be used.
@@ -17,31 +17,11 @@
 import cpp
 import codingstandards.cpp.CodingStandards
 import codingstandards.cpp.exclusions.cpp.RuleMetadata
+import codingstandards.cpp.rules.unusedreturnvalue.UnusedReturnValue
 
 /* This is a copy of an AUTOSAR rule, which we are using for testing purposes. */
-/*
- * This query performs a simple syntactic check to ensure that the return value of the function is
- * not completely ignored. This matches the examples given in the rule, although the text itself is
- * not entirely clear. This means it will not find cases where something is done with the return
- * value, but it is not meaningfully read. For example: `int ret_val = f();`, with no subsequent
- * access of `ret_val`. However, such a case _would_ be flagged by A0-1-1 - Useless assignment.
- */
+module UnusedReturnValueAutosarConfig implements UnusedReturnValueConfigSig {
+  Query getQuery() { result = DeadCodePackage::unusedReturnValueAutosarQuery() }
+}
 
-from FunctionCall fc, Function f
-where
-  not isExcluded(fc, DeadCodePackage::unusedReturnValueQuery()) and
-  // Find function calls in `ExprStmt`s, which indicate the return value is ignored
-  fc.getParent() instanceof ExprStmt and
-  // Ignore calls to void functions, which don't return values
-  not fc.getType() instanceof VoidType and
-  // Get the function target
-  f = fc.getTarget() and
-  // Overloaded (i.e. user defined) operators should behave in the same way as built-in operators,
-  // so the rule does not require the use of the return value
-  not f instanceof Operator and
-  // Exclude cases where the function call is generated within a macro, as the user of the macro is
-  // not necessarily able to address thoes results
-  not fc.isAffectedByMacro() and
-  // Rule allows disabling this rule where a static_cast<void> is applied
-  not fc.getExplicitlyConverted().(StaticCast).getActualType() instanceof VoidType
-select fc, "Return value from call to $@ is unused.", f, f.getName()
+import UnusedReturnValue<UnusedReturnValueAutosarConfig>

cpp/common/test/deviations/deviations_report_deviated/UnusedReturnValue.ql

@@ -1,5 +1,5 @@
 /**
- * @id cpp/autosar/unused-return-value
+ * @id cpp/autosar/unused-return-value-autosar
  * @name A0-1-2: Unused return value
  * @description The value returned by a function having a non-void return type that is not an
  *              overloaded operator shall be used.
@@ -17,31 +17,11 @@
 import cpp
 import codingstandards.cpp.CodingStandards
 import codingstandards.cpp.exclusions.cpp.RuleMetadata
+import codingstandards.cpp.rules.unusedreturnvalue.UnusedReturnValue
 
 /* This is a copy of an AUTOSAR rule, which we are using for testing purposes. */
-/*
- * This query performs a simple syntactic check to ensure that the return value of the function is
- * not completely ignored. This matches the examples given in the rule, although the text itself is
- * not entirely clear. This means it will not find cases where something is done with the return
- * value, but it is not meaningfully read. For example: `int ret_val = f();`, with no subsequent
- * access of `ret_val`. However, such a case _would_ be flagged by A0-1-1 - Useless assignment.
- */
+module UnusedReturnValueAutosarConfig implements UnusedReturnValueConfigSig {
+  Query getQuery() { result = DeadCodePackage::unusedReturnValueAutosarQuery() }
+}
 
-from FunctionCall fc, Function f
-where
-  not isExcluded(fc, DeadCodePackage::unusedReturnValueQuery()) and
-  // Find function calls in `ExprStmt`s, which indicate the return value is ignored
-  fc.getParent() instanceof ExprStmt and
-  // Ignore calls to void functions, which don't return values
-  not fc.getType() instanceof VoidType and
-  // Get the function target
-  f = fc.getTarget() and
-  // Overloaded (i.e. user defined) operators should behave in the same way as built-in operators,
-  // so the rule does not require the use of the return value
-  not f instanceof Operator and
-  // Exclude cases where the function call is generated within a macro, as the user of the macro is
-  // not necessarily able to address thoes results
-  not fc.isAffectedByMacro() and
-  // Rule allows disabling this rule where a static_cast<void> is applied
-  not fc.getExplicitlyConverted().(StaticCast).getActualType() instanceof VoidType
-select fc, "Return value from call to $@ is unused.", f, f.getName()
+import UnusedReturnValue<UnusedReturnValueAutosarConfig>