Merge branch 'strings'

Resolved conflicts in:

    scalding/src/main/scala/sandcrawler/ScorableFeatures.scala

2 files changed, 22 insertions, 0 deletions

diff --git a/scalding/src/test/scala/sandcrawler/ScorableFeaturesTest.scala b/scalding/src/test/scala/sandcrawler/ScorableFeaturesTest.scala
index 8a293fe..5a22ef8 100644
--- a/scalding/src/test/scala/sandcrawler/ScorableFeaturesTest.scala
+++ b/scalding/src/test/scala/sandcrawler/ScorableFeaturesTest.scala
@@ -1,9 +1,30 @@
 package sandcrawler
 
+import java.io.InputStream
+
+import scala.io.Source
+
 import org.scalatest._
 
 // scalastyle:off null
 class ScorableFeaturesTest extends FlatSpec with Matchers {
+
+  // TODO: Remove this when we're convinced that our file-reading code
+  // works. (I'm already convinced. --Ellen)
+  "read slugs" should "work" in {
+    val SlugBlacklist = Set( "abbreviations", "abstract", "acknowledgements",
+      "article", "authorreply", "authorsreply", "bookreview", "bookreviews",
+      "casereport", "commentary", "commentaryon", "commenton", "commentto",
+      "contents", "correspondence", "dedication", "editorialadvisoryboard",
+      "focus", "hypothesis", "inbrief", "introduction", "introductiontotheissue",
+      "lettertotheeditor", "listofabbreviations", "note", "overview", "preface",
+      "references", "results", "review", "reviewarticle", "summary", "title",
+      "name")
+
+    ScorableFeatures.SlugBlacklist.size shouldBe SlugBlacklist.size
+    for (s <- ScorableFeatures.SlugBlacklist) SlugBlacklist should contain (s)
+  }
+
   private def titleToSlug(s : String) : String = {
     ScorableFeatures.create(title = s).toSlug
   }
diff --git a/scalding/src/test/scala/sandcrawler/ScoreJobTest.scala b/scalding/src/test/scala/sandcrawler/ScoreJobTest.scala
index 55ae614..00e4659 100644
--- a/scalding/src/test/scala/sandcrawler/ScoreJobTest.scala
+++ b/scalding/src/test/scala/sandcrawler/ScoreJobTest.scala
@@ -163,6 +163,7 @@ class ScoreJobTest extends FlatSpec with Matchers {
 
   // scalastyle:off null
   // Add example of lines without GROBID data
+  // scalastyle:off null
   val SampleData = SampleDataHead :+ new Tuple(
     new ImmutableBytesWritable(Bytes.toBytes("sha1:35985C3YNNEGH5WAG5ZAA88888888888")), null, null)
   // scalastyle:on null