assert to log.error when wrong input

twitter · Jul 24, 2014 · 9586575 · 9586575
1 parent 966071b
commit 9586575
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/cassovary-core/src/main/scala/com/twitter/cassovary/util/MapNodeNumberer.scala b/cassovary-core/src/main/scala/com/twitter/cassovary/util/MapNodeNumberer.scala
@@ -16,6 +16,7 @@ package com.twitter.cassovary.util
 
 import scala.collection.mutable
 import scala.io.Source
+import com.twitter.logging.Logger
 
 class MapNodeNumberer[T](externalToInternalMap: collection.Map[T, Int],
                          internalToExternalMap: collection.Map[Int, T])
@@ -27,6 +28,8 @@ class MapNodeNumberer[T](externalToInternalMap: collection.Map[T, Int],
 
 object MapNodeNumberer {
 
+  private lazy val log = Logger.get()
+
   /**
    * Reads map numberer from file in the following format:
    * {{{
@@ -50,9 +53,11 @@ object MapNodeNumberer {
         val lineAsArray = line.split(" ")
         val name = lineAsArray(0)
         val id = lineAsArray(1).toInt
-        assert(!internalToExternal.contains(id), "Duplicate id found: " + id)
+        if (internalToExternal.contains(id))
+          log.error("Duplicate id found: " + id)
         internalToExternal += ((id, name))
-        assert(!externalToInternal.contains(name), "Duplicate name found: " + name)
+        if (externalToInternal.contains(name))
+          log.error("Duplicate name found: " + name)
         externalToInternal += ((name, id))
     }
 

diff --git a/cassovary-core/src/test/scala/com/twitter/cassovary/util/MapNodeNumbererSpec.scala b/cassovary-core/src/test/scala/com/twitter/cassovary/util/MapNodeNumbererSpec.scala
@@ -42,13 +42,11 @@ class MapNodeNumbererSpec extends WordSpec with ShouldMatchers with ClassicMatch
     }
 
     "find duplicated names" in {
-      evaluating (MapNodeNumberer.forStringsFromFile(directory + "numbering-duplicatedId.txt")) should
-        produce [AssertionError]
+      MapNodeNumberer.forStringsFromFile(directory + "numbering-duplicatedId.txt")
     }
 
     "find duplicated ids" in {
-      evaluating (MapNodeNumberer.forStringsFromFile(directory + "numbering-duplicatedName.txt")) should
-        produce [AssertionError]
+      MapNodeNumberer.forStringsFromFile(directory + "numbering-duplicatedName.txt")
     }
   }
 }