Fix format of fapi2 test cases

Refactoring some tests now so it follows what
the other cases are doing. Note: I am pulling in some code
from an abandoned commit in for toString test so it looks
like new code is being added but really things are just moving
around

Change-Id: I7706c304f3ef3369e56516ac81f88dc91d059bf2
RTC:150514
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/22692
Tested-by: Jenkins Server
Tested-by: FSP CI Jenkins
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

1 files changed, 20 insertions, 0 deletions

diff --git a/src/usr/fapi2/test/fapi2TestUtils.H b/src/usr/fapi2/test/fapi2TestUtils.H
index 2fafc296b..c2f6d2649 100644
--- a/src/usr/fapi2/test/fapi2TestUtils.H
+++ b/src/usr/fapi2/test/fapi2TestUtils.H
@@ -118,6 +118,26 @@ enum PERVASIVE_RANGE {
 void generateTargets(TARGETING::Target* i_pMasterProcChip,
                                     TARGETING::Target* o_targetList[]);
 
+/**
+*  @brief Helper to get the parent pervasive of the given target
+*
+*  @tparam K Input target's FAPI2 type
+*  @tparam V Platform target handle type
+*
+*  @param[in] i_pTarget Targeting target
+*
+*  @return Platform target handle giving the pervasive of the input target
+*  @retval NULL No parent found
+*  @retval !NULL Parent found, equal to the retval
+ */
+template< TargetType K, typename V = plat_target_handle_t >
+inline V getPervasiveParent(V i_pTarget)
+{
+    Target<K,V> fapi2_target(i_pTarget);
+    return static_cast<V>(
+        fapi2_target.template getParent<TARGET_TYPE_PERV>());
+}
+
 } // End namespace fapi2
 
 #endif