[hama] branch componentization updated: Switch BSPMasterSpec to use Logging for test case.

[chl501]

This is an automated email from the ASF dual-hosted git repository.

chl501 pushed a commit to branch componentization
in repository https://gitbox.apache.org/repos/asf/hama.git


The following commit(s) were added to refs/heads/componentization by this push:
     new 47efc7c  Switch BSPMasterSpec to use Logging for test case.
47efc7c is described below

commit 47efc7cdf3190376f3f5be0d559c8619fd76bf9e
Author: Chiahung Lin <chl...@apache.org>
AuthorDate: Thu May 2 17:03:58 2019 +0200

    Switch BSPMasterSpec to use Logging for test case.
---
 .../scala/org/apache/hama/logging/Logging.scala    | 31 +++++++++++-----------
 .../org/apache/hama/membership/BSPMasterSpec.scala | 11 +++++---
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/commons.v2/src/main/scala/org/apache/hama/logging/Logging.scala 
b/commons.v2/src/main/scala/org/apache/hama/logging/Logging.scala
index e322e4a..172e1d2 100644
--- a/commons.v2/src/main/scala/org/apache/hama/logging/Logging.scala
+++ b/commons.v2/src/main/scala/org/apache/hama/logging/Logging.scala
@@ -19,6 +19,8 @@ package org.apache.hama.logging
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
+import scala.reflect.ClassTag
+import scala.reflect.runtime.universe._
 
 trait Logging[T] {
 
@@ -35,26 +37,25 @@ trait Logging[T] {
 
 object Logging {
 
-  def apply[T](implicit log: Logging[T]) = log
+  def slf4j[T: ClassTag: TypeTag](clazz: Class[T]): Logging[Logger] = 
+    new Logging[Logger] {
 
-  implicit def sl4fjLog: Logging[Logger] = new Logging[Logger] {
+      lazy val log = LoggerFactory.getLogger(clazz)
 
-    lazy val log = LoggerFactory.getLogger(getClass)
+      override def info(message: String) = if(log.isInfoEnabled)
+         log.info(message)
 
-    override def info(message: String) = if(log.isInfoEnabled)
-      log.info(message)
+      override def debug(message: String) = if(log.isDebugEnabled)
+        log.debug(message)
 
-    override def debug(message: String) = if(log.isDebugEnabled)
-      log.debug(message)
+      override def warn(message: String) = if(log.isWarnEnabled)
+        log.warn(message)
 
-    override def warn(message: String) = if(log.isWarnEnabled)
-      log.warn(message)
+      override def trace(message: String) = if(log.isTraceEnabled)
+        log.trace(message)
 
-    override def trace(message: String) = if(log.isTraceEnabled)
-      log.trace(message)
-
-    override def error(message: String) = if(log.isErrorEnabled)
-      log.error(message)
+      override def error(message: String) = if(log.isErrorEnabled)
+        log.error(message)
     
-  }
+    }
 }
diff --git 
a/membership/src/test/scala/org/apache/hama/membership/BSPMasterSpec.scala 
b/membership/src/test/scala/org/apache/hama/membership/BSPMasterSpec.scala
index 93d6109..0514f5f 100644
--- a/membership/src/test/scala/org/apache/hama/membership/BSPMasterSpec.scala
+++ b/membership/src/test/scala/org/apache/hama/membership/BSPMasterSpec.scala
@@ -18,9 +18,12 @@
 package org.apache.hama.membership
 
 import org.scalatest._
+import org.apache.hama.logging.Logging
 
 class BSPMasterSpec extends FlatSpec with Matchers {
 
+  val log = Logging.slf4j(getClass)
+
   import BSPMaster._
   import BSPMaster.State._
   import BSPMaster.Event._
@@ -30,28 +33,28 @@ class BSPMasterSpec extends FlatSpec with Matchers {
       s <- stopped2Starting
     } yield s
     val startingState = starting.run(Right(Stopped)).value._1
-    println(s"Actual BSPMaster state: $startingState")
+    log.info(s"Actual BSPMaster state: $startingState")
     assert(Right(Starting).equals(startingState))
 
     val running = for {
       r <- starting2Running(ready)
     } yield r
     val runningState = running.run(startingState).value._1
-    println(s"Actual BSPMaster state: $runningState")
+    log.info(s"Actual BSPMaster state: $runningState")
     assert(Right(Running).equals(runningState))
 
     val shuttingdown = for {
       sd <- running2ShuttingDown(Set(CommunicatorShuttingDown))
     } yield sd
     val shuttingDownState = shuttingdown.run(runningState).value._1
-    println(s"Actual BSPMaster state: $shuttingDownState")
+    log.info(s"Actual BSPMaster state: $shuttingDownState")
     assert(Right(ShuttingDown).equals(shuttingDownState))
 
     val _stopped_ = for {
       s <- shuttingDown2Stopped(stopped)
     } yield s
     val stoppedState = _stopped_.run(shuttingDownState).value._1
-    println(s"Actual BSPMaster state: $stoppedState")
+    log.info(s"Actual BSPMaster state: $stoppedState")
     assert(Right(Stopped).equals(stoppedState))
       
   }