Merge pull request #110 from geirolz/remove-scalatic-from-prod

Remove scalactic from production code.
geirolz · Aug 28, 2020 · 0f80aa4 · 0f80aa4
2 parents 349e698 + 5e29d66
commit 0f80aa4
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 83 deletions.
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -11,10 +11,10 @@ object Dependencies {
   lazy val all: Seq[ModuleID] = Seq(
     //SCALA
     "org.typelevel" %% "cats-core" % "2.1.1" cross CrossVersion.binary,
-    "org.scalactic" %% "scalactic" % "3.2.2" cross CrossVersion.binary,
     //XML
     "org.scala-lang.modules" %% "scala-xml" % "2.0.0-M1" cross CrossVersion.binary,
     //TEST
+    "org.scalactic" %% "scalactic" % "3.2.2" % Test cross CrossVersion.binary,
     "org.typelevel" %% "discipline-scalatest" % "2.0.1" % Test,
     "org.typelevel" %% "cats-laws" % "2.1.1" % Test cross CrossVersion.binary,
     "org.scalatest" %% "scalatest" % "3.2.2" % Test cross CrossVersion.binary,

diff --git a/src/main/scala/advxml/syntax/XmlNormalizerSyntax.scala b/src/main/scala/advxml/syntax/XmlNormalizerSyntax.scala
@@ -1,19 +1,11 @@
 package advxml.syntax
 
 import advxml.core.XmlNormalizer
-import org.scalactic.Equality
 
-import scala.util.Try
 import scala.xml.NodeSeq
 
 private[syntax] trait XmlNormalizerSyntax {
 
-  implicit def streamlinedXmlNormalizedEquality[T <: NodeSeq]: Equality[T] =
-    (a: T, b: Any) =>
-      Try(
-        XmlNormalizer.normalizedEquals(a, b.asInstanceOf[NodeSeq])
-      ).getOrElse(false)
-
   implicit class NodeSeqNormalizationAndEqualityOps(ns: NodeSeq) {
 
     def normalize: NodeSeq =

diff --git a/src/test/scala/advxml/instances/XmlPredicateTest.scala b/src/test/scala/advxml/instances/XmlPredicateTest.scala
@@ -20,7 +20,7 @@ class XmlPredicateTest extends AnyFunSuite {
 
     val result: NodeSeq = data \ "Person" filter text(_ == "Simone")
 
-    assert(result === <Person>Simone</Person>)
+    assert(result |==| <Person>Simone</Person>)
   }
 
   test("Filter by label") {
@@ -34,7 +34,7 @@ class XmlPredicateTest extends AnyFunSuite {
 
     val result: NodeSeq = data.child filter label(_ == "Person3")
 
-    assert(result === <Person3>Simone</Person3>)
+    assert(result |==| <Person3>Simone</Person3>)
   }
 
   test("Filter by attrs") {
@@ -51,7 +51,7 @@ class XmlPredicateTest extends AnyFunSuite {
         "B" -> (_ == "C")
       )
 
-    assert(result === <Person A="3" B="C">Simone</Person>)
+    assert(result |==| <Person A="3" B="C">Simone</Person>)
   }
 
   test("Filter by strict equality") {
@@ -65,7 +65,7 @@ class XmlPredicateTest extends AnyFunSuite {
 
     val result: NodeSeq = data \ "Person" filter strictEqualsTo(<Person A="3"></Person>)
 
-    assert(result === <Person A="3"></Person>)
+    assert(result |==| <Person A="3"></Person>)
   }
 
   test("Filter by strict equality - minimized empty") {
@@ -79,6 +79,6 @@ class XmlPredicateTest extends AnyFunSuite {
 
     val result: NodeSeq = data \ "Person" filter strictEqualsTo(<Person A="3"/>)
 
-    assert(result === <Person A="3"></Person>)
+    assert(result |==| <Person A="3"></Person>)
   }
 }
diff --git a/src/test/scala/advxml/syntax/XmlTransformerSyntaxTest.scala b/src/test/scala/advxml/syntax/XmlTransformerSyntaxTest.scala
@@ -39,20 +39,20 @@ class XmlTransformerSyntaxTest extends AnyFunSuite {
           <test Id="1"><newNode value="x"/></test>
         </bar>
       </data>
-        ===
-          <data>
+      |==|
+      <data>
           <foo>
             <test Id="1"/>
           </foo>
           <bar>
             <test Id="1"/>
           </bar>
         </data>
-            .transform(
-              (root \ "bar" \ "test" filter attrs("Id" -> (_ == "1")))
-              ==> Append(<newNode value="x"/>)
-            )
-            .get
+        .transform(
+          (root \ "bar" \ "test" filter attrs("Id" -> (_ == "1")))
+          ==> Append(<newNode value="x"/>)
+        )
+        .get
     )
   }
 
@@ -66,19 +66,19 @@ class XmlTransformerSyntaxTest extends AnyFunSuite {
           <OrderLine PrimeLineNo="4"/>
         </OrderLines>
       </Order>
-        ===
-          <Order>
+      |==|
+      <Order>
           <OrderLines>
             <OrderLine PrimeLineNo="4"/>
           </OrderLines>
         </Order>
-            .transform(
-              (root \ "OrderLines")
-              ==> Prepend(<OrderLine PrimeLineNo="3"/>)
-              ==> Prepend(<OrderLine PrimeLineNo="2"/>)
-              ==> Prepend(<OrderLine PrimeLineNo="1"/>)
-            )
-            .get
+        .transform(
+          (root \ "OrderLines")
+          ==> Prepend(<OrderLine PrimeLineNo="3"/>)
+          ==> Prepend(<OrderLine PrimeLineNo="2"/>)
+          ==> Prepend(<OrderLine PrimeLineNo="1"/>)
+        )
+        .get
     )
   }
 
@@ -92,19 +92,19 @@ class XmlTransformerSyntaxTest extends AnyFunSuite {
           <OrderLine PrimeLineNo="4"/>
         </OrderLines>
       </Order>
-        ===
-          <Order>
+      |==|
+      <Order>
           <OrderLines>
             <OrderLine PrimeLineNo="1"/>
           </OrderLines>
         </Order>
-            .transform(
-              (root \ "OrderLines")
-              ==> Append(<OrderLine PrimeLineNo="2"/>)
-              ==> Append(<OrderLine PrimeLineNo="3"/>)
-              ==> Append(<OrderLine PrimeLineNo="4"/>)
-            )
-            .get
+        .transform(
+          (root \ "OrderLines")
+          ==> Append(<OrderLine PrimeLineNo="2"/>)
+          ==> Append(<OrderLine PrimeLineNo="3"/>)
+          ==> Append(<OrderLine PrimeLineNo="4"/>)
+        )
+        .get
     )
   }
 
@@ -117,19 +117,19 @@ class XmlTransformerSyntaxTest extends AnyFunSuite {
           <OrderLine PrimeLineNo="3" />
         </OrderLines>
       </Order>
-        ===
-          <Order>
+      |==|
+      <Order>
           <OrderLines>
             <OrderLine PrimeLineNo="1"/>
             <OrderLine PrimeLineNo="2"/>
             <OrderLine PrimeLineNo="3"/>
           </OrderLines>
         </Order>
-            .transform(
-              (root \ "OrderLines" \ "OrderLine" | attrs("PrimeLineNo" -> (_ == "1")))
-              ==> Replace(_ => <OrderLine PrimeLineNo="3"/>)
-            )
-            .get
+        .transform(
+          (root \ "OrderLines" \ "OrderLine" | attrs("PrimeLineNo" -> (_ == "1")))
+          ==> Replace(_ => <OrderLine PrimeLineNo="3"/>)
+        )
+        .get
     )
   }
 
@@ -139,7 +139,7 @@ class XmlTransformerSyntaxTest extends AnyFunSuite {
       (root \ "B") ==> Replace(_ => <B>1</B>)
     )
 
-    assert(result.get === <A><B>1</B></A>)
+    assert(result.get |==| <A><B>1</B></A>)
   }
 
   test("RemoveNode") {
@@ -149,18 +149,18 @@ class XmlTransformerSyntaxTest extends AnyFunSuite {
           <OrderLine PrimeLineNo="1" />
         </OrderLines>
       </Order>
-        ===
-          <Order>
+      |==|
+      <Order>
           <OrderLines>
             <OrderLine PrimeLineNo="1"/>
             <OrderLine PrimeLineNo="2"/>
           </OrderLines>
         </Order>
-            .transform(
-              (root \ "OrderLines" \ "OrderLine" | attrs("PrimeLineNo" -> (_ == "2")))
-              ==> Remove
-            )
-            .get
+        .transform(
+          (root \ "OrderLines" \ "OrderLine" | attrs("PrimeLineNo" -> (_ == "2")))
+          ==> Remove
+        )
+        .get
     )
   }
 
@@ -180,12 +180,12 @@ class XmlTransformerSyntaxTest extends AnyFunSuite {
       <OrderLines>
         <OrderLine PrimeLineNo="1"/>
       </OrderLines>
-        ===
-          <OrderLines/>
-            .transform[Try](
-              root ==> Append(<OrderLine PrimeLineNo="1"/>)
-            )
-            .get
+      |==|
+      <OrderLines/>
+        .transform[Try](
+          root ==> Append(<OrderLine PrimeLineNo="1"/>)
+        )
+        .get
     )
   }
 
@@ -194,24 +194,24 @@ class XmlTransformerSyntaxTest extends AnyFunSuite {
       <Order>
         <OrderLines A1="1" A2="2" A3="3"/>
       </Order>
-        ===
-          <Order>
+      |==|
+      <Order>
           <OrderLines/>
         </Order>
-            .transform(
-              root \ "OrderLines" ==> SetAttrs("A1" := "1", "A2" := "2", "A3" := "3")
-            )
-            .get
+        .transform(
+          root \ "OrderLines" ==> SetAttrs("A1" := "1", "A2" := "2", "A3" := "3")
+        )
+        .get
     )
   }
 
   test("SetAttribute to root") {
     assert(
-      <Order A1="1" A2="2" A3="3"/> === <Order/>
-          .transform(
-            root ==> SetAttrs("A1" := "1", "A2" := "2", "A3" := "3")
-          )
-          .get
+      <Order A1="1" A2="2" A3="3"/> |==| <Order/>
+        .transform(
+          root ==> SetAttrs("A1" := "1", "A2" := "2", "A3" := "3")
+        )
+        .get
     )
   }
 
@@ -222,16 +222,16 @@ class XmlTransformerSyntaxTest extends AnyFunSuite {
           <OrderLine PrimeLineNo="1"></OrderLine>
         </OrderLines>
       </Order>
-        ===
-          <Order>
+      |==|
+      <Order>
           <OrderLines T1="1">
             <OrderLine PrimeLineNo="1"></OrderLine>
           </OrderLines>
         </Order>
-            .transform(
-              root \ "OrderLines" ==> SetAttrs("T1" := "EDITED")
-            )
-            .get
+        .transform(
+          root \ "OrderLines" ==> SetAttrs("T1" := "EDITED")
+        )
+        .get
     )
   }
 
@@ -242,16 +242,16 @@ class XmlTransformerSyntaxTest extends AnyFunSuite {
           <OrderLine PrimeLineNo="1"></OrderLine>
         </OrderLines>
       </Order>
-        ===
-          <Order>
+      |==|
+      <Order>
           <OrderLines T1="1">
             <OrderLine PrimeLineNo="1"></OrderLine>
           </OrderLines>
         </Order>
-            .transform(
-              root \ "OrderLines" ==> RemoveAttrs(_.key == "T1")
-            )
-            .get
+        .transform(
+          root \ "OrderLines" ==> RemoveAttrs(_.key == "T1")
+        )
+        .get
     )
   }
 }