Merge pull request #252 from ashawley/fix-fail-empty-string

Fix failure for empty string match

Author: ashawley

shared/src/main/scala/scala/xml/NodeSeq.scala

@@ -140,8 +140,10 @@ abstract class NodeSeq extends AbstractSeq[Node] with immutable.Seq[Node] with S
    *  The document order is preserved.
    */
   def \\(that: String): NodeSeq = {
+    def fail = throw new IllegalArgumentException(that)
     def filt(cond: (Node) => Boolean) = this flatMap (_.descendant_or_self) filter cond
     that match {
+      case ""                  => fail
       case "_"                 => filt(!_.isAtom)
       case _ if that(0) == '@' => filt(!_.isAtom) flatMap (_ \ that)
       case _                   => filt(x => !x.isAtom && x.label == that)

shared/src/test/scala/scala/xml/XMLTest.scala

@@ -145,6 +145,16 @@ class XMLTest {
     assertEquals(expected, actual)
   }
 
+  @UnitTest(expected=classOf[IllegalArgumentException])
+  def failEmptyStringChildren: Unit = {
+    <x/> \ ""
+  }
+
+  @UnitTest(expected=classOf[IllegalArgumentException])
+  def failEmptyStringDescendants: Unit = {
+    <x/> \\ ""
+  }
+
   @UnitTest
   def namespaces: Unit = {
     val cuckoo = <cuckoo xmlns="http://cuckoo.com">