Merge pull request #5719 from btriller/CFE-2930

getindices() now returns positional index from a list

Author: larsewi

libpromises/evalfunction.c

@@ -3121,7 +3121,7 @@ static FnCallResult FnCallGetIndices(EvalContext *ctx, ARG_UNUSED const Policy *
         EvalContextVariableGet(ctx, ref, &type);
 
         /* A variable holding a data container. */
-        if (type == CF_DATA_TYPE_CONTAINER)
+        if (DataTypeToRvalType(type) == RVAL_TYPE_CONTAINER || DataTypeToRvalType(type) == RVAL_TYPE_LIST)
         {
             json = VarRefValueToJson(ctx, fp, ref, NULL, 0, true, &allocated);
         }

tests/acceptance/02_classes/02_functions/getindices_returns_correct_indices_from_list.cf

@@ -0,0 +1,35 @@
+body common control
+{
+        inputs => { "../../default.cf.sub" };
+        bundlesequence  => { default("$(this.promise_filename)") };
+        version => "1.0";
+}
+
+#######################################################
+
+bundle agent test
+{
+
+  meta:
+      "description" -> { "CFE-2930" }
+        string => "Test that getindices() returns the correct indices from a list";
+
+  vars:
+      "list" slist => { "beta", "alpha", "gamma" };
+      "getindices_list" slist => getindices( list );
+}
+
+#######################################################
+bundle agent check
+{
+  vars:
+      "expected_value" string => "beta";
+      "first_index"    string => nth( "test.getindices_list", 0 );
+
+  reports:
+      "$(this.promise_filename) Pass"
+        if => and( strcmp( $(first_index), 0 ), strcmp( nth( "test.list", $(first_index) ), $(expected_value) ) );
+
+      "$(this.promise_filename) FAIL"
+        unless => and( strcmp( $(first_index), 0 ), strcmp( nth( "test.list", $(first_index) ), $(expected_value) ) );
+}

tests/acceptance/02_classes/02_functions/getindices_returns_positonal_indices_from_list.cf

@@ -14,10 +14,6 @@ bundle agent test
       "description" -> { "CFE-2930" }
         string => "Test that getindices() returns the positional indices from a list";
 
-      "test_soft_fail"
-        string => "any",
-        meta => { "CFE-2930" };
-
   vars:
       "list" slist => { "beta", "alpha", "gamma" };
       "getindices_list" slist => getindices( list );