minor unit test improvements. deferring overhaul to #5

CANVE · Nov 16, 2015 · 74653f1 · 74653f1
1 parent 751ce54
commit 74653f1
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 21 deletions.
diff --git a/compiler-plugin/src/main/scala/org/canve/compilerPlugin/QualiferID.scala b/compiler-plugin/src/main/scala/org/canve/compilerPlugin/QualiferID.scala
@@ -0,0 +1,14 @@
+package org.canve.compilerPlugin
+
+/*
+ * Unique Symbol QualiferID, serializable
+ */
+case class KindAndName(kind: String, name: String)
+
+case class QualifiedID(value: List[KindAndName]) {  
+  def pickle = value.map(kindAndName => "(" + kindAndName.kind + "|" + kindAndName.name + ")").mkString(".")
+}
+object QualifiedID {
+  def unpickle(s: String) = 
+    QualifiedID(s.split('.').toList.map(pair => KindAndName(pair.takeWhile(_!='|').drop(1), pair.dropWhile(_!='|').drop(1).dropRight(1))))
+}
diff --git a/compiler-plugin/src/main/scala/org/canve/compilerPlugin/Serialization.scala b/compiler-plugin/src/main/scala/org/canve/compilerPlugin/Serialization.scala
@@ -1,17 +1,5 @@
 package org.canve.compilerPlugin
 
-/*
- * Serializable QualiferID
- */
-case class KindAndName(kind: String, name: String)
-case class QualifiedID(value: List[KindAndName]) {  
-  def pickle = value.map(qualifiedId => "(" + qualifiedId.kind + "|" + qualifiedId.name + ")").mkString(".")
-}
-object QualifiedID {
-  def unpickle(s: String) = 
-    QualifiedID(s.split('.').toList.map(pair => KindAndName(pair.takeWhile(_!='|').drop(1), pair.dropWhile(_!='|').drop(1).dropRight(1))))
-}
-
 /*
  * helper for writing node data to csv 
  */

diff --git a/compiler-plugin/src/test/scala/Instantiaion.scala b/compiler-plugin/src/test/scala/Instantiaion.scala
@@ -50,6 +50,7 @@ trait NodeSearch {
  * does some testing with its output
  */
 object InstantiationTester extends TraversalExtractionTester with NodeSearch {
+
   override def apply(global: Global)(body: global.Tree) = {
 
     val graph: ExtractedGraph = TraversalExtraction(global)(body)(new ExtractedGraph)
@@ -66,10 +67,7 @@ object InstantiationTester extends TraversalExtractionTester with NodeSearch {
       (filterFuncArgs: FilterFuncArguments[ManagedGraphNode, ManagedGraphEdge]) => 
           (filterFuncArgs.direction == Egress && filterFuncArgs.edge.data == "declares member")) 
 
-    println(s"Tracing all acceptable paths from node id ${origin.key} to node id ${target.key}")
-    println(s"origin node: $origin")
-    println(s"target node: $target")
-    println
+    print(s"Tracing all acceptable paths from ${shortDescription(origin)} to ${shortDescription(target)}...")
 
     def voidFilter(filterFuncArgs: FilterFuncArguments[ManagedGraphNode, ManagedGraphEdge]): Boolean = true
     def walkFilter(filterFuncArgs: FilterFuncArguments[ManagedGraphNode, ManagedGraphEdge]): Boolean = {      
@@ -86,15 +84,29 @@ object InstantiationTester extends TraversalExtractionTester with NodeSearch {
     paths match {
       case None => throw new Exception("relationsnip not found")
       case Some(paths) => { 
-        println(s"${paths.size} paths found:")
+        println(s" ${paths.size} paths found:")
         paths.foreach { path => 
-          println 
-          path.map(id => println(simpleGraph.vertex(id).get))
-          println(target)
+          println("Path:")
+          path.map(id => println("  " + shortDescription(simpleGraph.vertex(id).get)))
+          println("  " + shortDescription(target))
         }
       }
     }
-  }  
+  }
+
+  /* 
+   * utility function for compact printing of symbols qualified id
+   */
+  def shortDescription(node: ManagedGraphNode) = {
+    val symbol: ExtractedSymbol = node.data
+    val shortenedQualifiedId = (symbol.qualifiedId.value.head.name match {
+      case "<empty>" => symbol.qualifiedId.value.drop(1)
+      case _ => symbol.qualifiedId.value
+    }).map(_.name).mkString(".")
+
+    s"${symbol.kind} $shortenedQualifiedId (${symbol.id})"      
+  }
+
 }
 
 object MyTestSuite extends TestSuite {