Renable tests and refactor compiler flags

tabdulradi · Apr 5, 2021 · 17d4393 · 17d4393
1 parent ba01875
commit 17d4393
Show file tree

Hide file tree

Showing 5 changed files with 392 additions and 374 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 lib_managed
 project/project
-target
+target
+.bsp
diff --git a/build.sbt b/build.sbt
@@ -1,45 +1,15 @@
 inThisBuild(Seq(
-  organization     := "com.abdulradi",
   organizationName := "nullable",
   description      := "Makes nullable values as easy to deal with as scala.Option without the allocation cost",
-  licenses         := List("Apache 2" -> new URL("http://www.apache.org/licenses/LICENSE-2.0.txt")),
   homepage         := Some(url("https://github.com/tabdulradi/nullable")),
   scmInfo          := Some(ScmInfo(url("https://github.com/tabdulradi/nullable"), "scm:[email protected]:tabdulradi/nullable.git")),
-  developers       := List(
-    Developer(
-      id    = "tabdulradi",
-      name  = "Tamer Abdulradi",
-      email = "[email protected]",
-      url   = url("http://abdulradi.com")
-    )
-  ),
-
-  githubWorkflowTargetTags ++= Seq("v*"),
-  githubWorkflowPublishTargetBranches := Seq(RefPredicate.StartsWith(Ref.Tag("v"))),
-  githubWorkflowPublish := Seq(WorkflowStep.Sbt(List("ci-release"))),
-  githubWorkflowPublish := Seq(
-    WorkflowStep.Sbt(
-      List("ci-release"),
-      env = Map(
-        "PGP_PASSPHRASE" -> "${{ secrets.PGP_PASSPHRASE }}",
-        "PGP_SECRET" -> "${{ secrets.PGP_SECRET }}",
-        "SONATYPE_PASSWORD" -> "${{ secrets.SONATYPE_PASSWORD }}",
-        "SONATYPE_USERNAME" -> "${{ secrets.SONATYPE_USERNAME }}"
-      )
-    )
-  ),
 
   scalaVersion := "3.0.0-RC2",
-  scalacOptions ++= Seq(
-      "-Ykind-projector",
-      "-Yexplicit-nulls",
-      "-source", "future",
+
+  libraryDependencies ++= Seq(
+    "org.scalatest" %% "scalatest" % "3.2.7" % Test,
+    "org.scalacheck" %% "scalacheck" % "1.15.3" % Test
   ),
-  // Scala Test isn't released yet to Scala3 RC2, but the tests pass on RC1, I promise!
-  // libraryDependencies ++= Seq(
-  //   "org.scalatest" %% "scalatest" % "3.2.6" % Test,
-  //   "org.scalacheck" %% "scalacheck" % "1.15.3" % Test
-  // ),
 ))
 
 lazy val core = (project in file("core"))

diff --git a/core/src/test/scala/com/abdulradi/nullable/NullableSpec.scala b/core/src/test/scala/com/abdulradi/nullable/NullableSpec.scala
@@ -1,160 +1,160 @@
-// /*
-//  * Copyright 2019-2021 Tamer Abdulradi
-//  *
-//  * Licensed under the Apache License, Version 2.0 (the "License");
-//  * you may not use a file except in compliance with the License.
-//  * You may obtain a copy of the License at
-//  *
-//  *     http://www.apache.org/licenses/LICENSE-2.0
-//  *
-//  * Unless required by applicable law or agreed to in writing, software
-//  * distributed under the License is distributed on an "AS IS" BASIS,
-//  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-//  * See the License for the specific language governing permissions and
-//  * limitations under the License.
-//  */
-// package com.abdulradi.nullable
-
-// import org.scalatest.funsuite.AnyFunSuite
-// import syntax.*
-
-// class NullableSpec extends AnyFunSuite:
-//   def assertEquals[A](a1: A, a2: A) = assert(a1 == a2)
-
-//   test("ForComprehensionMapNull"){ 
-//     val maybeA: Int | Null = null
-//     assertEquals(
-//       for a <- maybeA yield a + 1,
-//       null
-//     )
-//   }
-
-//   test("ForComprehensionFlatMap"){ 
-//     val maybeA: Int | Null = 4
-//     val maybeB: Int | Null = 6
-//     assertEquals(
-//       for 
-//         a <- maybeA
-//         b <- maybeB
-//       yield a + b,
-//       10
-//     )
-//   }
-
-//   test("ForComprehensionFlatMapNull"){ 
-//     val maybeA: Int | Null = 4
-//     val maybeB: Int | Null = null
-//     assertEquals(
-//       for 
-//         a <- maybeA
-//         b <- maybeB
-//       yield a + b,
-//       null
-//     )
-//   }
-
-//   test("ForComprehensionFilter"){ 
-//     val maybeA: Int | Null = 4
-//     val maybeB: Int | Null = 6
-//     assertEquals(
-//       for 
-//         a <- maybeA
-//         b <- maybeB
-//         res = a + b
-//         if (res % 2) == 0
-//       yield res,
-//       10
-//     )
-//   }
-
-//   test("ForComprehensionFilter2") { 
-//     val maybeA: Int | Null = 4 
-//     val maybeB: Int | Null = 6
-//     assertEquals(
-//       for 
-//         a <- maybeA
-//         b <- maybeB
-//         res = a + b
-//         if (res % 2) != 0
-//       yield res,
-//       null
-//     )
-//   }
-
-//   test("GenericsMap"){ 
-//     val maybeInt: Int | Null = 4
+/*
+ * Copyright 2019-2021 Tamer Abdulradi
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use a file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.abdulradi.nullable
+
+import org.scalatest.funsuite.AnyFunSuite
+import syntax.*
+
+class NullableSpec extends AnyFunSuite:
+  def assertEquals[A](a1: A, a2: A) = assert(a1 == a2)
+
+  test("ForComprehensionMapNull"){ 
+    val maybeA: Int | Null = null
+    assertEquals(
+      for a <- maybeA yield a + 1,
+      null
+    )
+  }
+
+  test("ForComprehensionFlatMap"){ 
+    val maybeA: Int | Null = 4
+    val maybeB: Int | Null = 6
+    assertEquals(
+      for 
+        a <- maybeA
+        b <- maybeB
+      yield a + b,
+      10
+    )
+  }
+
+  test("ForComprehensionFlatMapNull"){ 
+    val maybeA: Int | Null = 4
+    val maybeB: Int | Null = null
+    assertEquals(
+      for 
+        a <- maybeA
+        b <- maybeB
+      yield a + b,
+      null
+    )
+  }
+
+  test("ForComprehensionFilter"){ 
+    val maybeA: Int | Null = 4
+    val maybeB: Int | Null = 6
+    assertEquals(
+      for 
+        a <- maybeA
+        b <- maybeB
+        res = a + b
+        if (res % 2) == 0
+      yield res,
+      10
+    )
+  }
+
+  test("ForComprehensionFilter2") { 
+    val maybeA: Int | Null = 4 
+    val maybeB: Int | Null = 6
+    assertEquals(
+      for 
+        a <- maybeA
+        b <- maybeB
+        res = a + b
+        if (res % 2) != 0
+      yield res,
+      null
+    )
+  }
+
+  test("GenericsMap"){ 
+    val maybeInt: Int | Null = 4
 
-//     def useMap[A: NotNull](f: Int => A): A | Null = 
-//       maybeInt.map(f)
+    def useMap[A: NotNull](f: Int => A): A | Null = 
+      maybeInt.map(f)
 
-//     useMap(_ => "")
-//   }
-
-//   test("GenericsFlatMap"){ 
-//     val maybeInt: Int | Null = 4
-
-//     def useFlatMap[A: Nullable](f: Int => A): A | Null = 
-//       maybeInt.flatMap(f)
-
-//     useFlatMap(_ => null)
-//   }
-
-//   test("OpaqueMap") {
-//     object Foo {
-//       opaque type Foo = Int
-//       private val notNullInstance = summon[NotNull[Foo]] // Must be defined outside Foo's companion to avoid self reference
-//       object Foo {
-//         given fooIsNotNull: NotNull[Foo] = notNullInstance // won't compile without this, otherwise we can't proof opaque types isn't a Null or a union type involving Null
-//       }
-//       val get: Foo = 42
-//     }
-
-//     Nullable("").map(_ => Foo.get) 
-//   }
-
-//   test("OpaqueFlatMap") {
-//     object Foo {
-//       opaque type Foo = Int | Null
-//       private val nullableInstance = summon[Nullable[Foo]] // Must be defined outside Foo's companion to avoid self reference
-//       object Foo {
-//         given fooIsNullable: Nullable[Foo] = nullableInstance // won't compile without this, otherwise we can't proof opaque types isn't a Null or a union type involving Null
-//       }
-//       val get: Foo = 42
-//     }
-
-//     Nullable("").flatMap(_ => Foo.get) 
-//   }
-
-//   test("NullableZipNullable"){ 
-//     assertEquals(Nullable("foo") zip Nullable("bar"), Nullable(("foo", "bar")))
-//   }
-//   test("NullableZipNullable.empty"){   
-//     assertEquals(Nullable("foo") zip Nullable.empty[String], null)
-//   }
-//   test("Nullable.emptyZipNullable"){ 
-//     assertEquals(Nullable.empty zip Nullable("bar"), null)
-//   }
-//   test("Nullable.emptyZipNullable.empty"){ 
-//     assertEquals(Nullable.empty zip Nullable.empty, null)
-//   }
-
-//   test("NullableUnzipToNullablePair"){ 
-//     assertEquals(Nullable(("foo", "bar")).unzip, (Nullable("foo"), Nullable("bar")))
-//   }
-//   test("NullableUnzipToNullableNullable.empty"){ 
-//     assertEquals(Nullable(("foo", null)).unzip, (Nullable("foo"), Nullable(null)))
-//   }
-//   test("Nullable.emptyUnzipToNullable.emptyPair"){ 
-//     assertEquals(Nullable.empty[(String, String)].unzip, (Nullable.empty, Nullable.empty))
-//   }
-
-//   test("NullableUnzip3ToNullableTriple"){ 
-//     assertEquals(Nullable(("foo", "bar", "z")).unzip3, (Nullable("foo"), Nullable("bar"), Nullable("z")))
-//   }
-//   test("NullableUnzip3ToNullableNullable.empty"){ 
-//     assertEquals(Nullable(("foo", null, null)).unzip3, (Nullable("foo"), Nullable(null), Nullable(null)))
-//   }
-//   test("Nullable.emptyUnzip3ToNullable.emptyTriple"){ 
-//     assertEquals(Nullable.empty.unzip3, (Nullable.empty, Nullable.empty, Nullable.empty))
-//   }
+    useMap(_ => "")
+  }
+
+  test("GenericsFlatMap"){ 
+    val maybeInt: Int | Null = 4
+
+    def useFlatMap[A: Nullable](f: Int => A): A | Null = 
+      maybeInt.flatMap(f)
+
+    useFlatMap(_ => null)
+  }
+
+  test("OpaqueMap") {
+    object Foo {
+      opaque type Foo = Int
+      private val notNullInstance = summon[NotNull[Foo]] // Must be defined outside Foo's companion to avoid self reference
+      object Foo {
+        given fooIsNotNull: NotNull[Foo] = notNullInstance // won't compile without this, otherwise we can't proof opaque types isn't a Null or a union type involving Null
+      }
+      val get: Foo = 42
+    }
+
+    Nullable("").map(_ => Foo.get) 
+  }
+
+  test("OpaqueFlatMap") {
+    object Foo {
+      opaque type Foo = Int | Null
+      private val nullableInstance = summon[Nullable[Foo]] // Must be defined outside Foo's companion to avoid self reference
+      object Foo {
+        given fooIsNullable: Nullable[Foo] = nullableInstance // won't compile without this, otherwise we can't proof opaque types isn't a Null or a union type involving Null
+      }
+      val get: Foo = 42
+    }
+
+    Nullable("").flatMap(_ => Foo.get) 
+  }
+
+  test("NullableZipNullable"){ 
+    assertEquals(Nullable("foo") zip Nullable("bar"), Nullable(("foo", "bar")))
+  }
+  test("NullableZipNullable.empty"){   
+    assertEquals(Nullable("foo") zip Nullable.empty[String], null)
+  }
+  test("Nullable.emptyZipNullable"){ 
+    assertEquals(Nullable.empty zip Nullable("bar"), null)
+  }
+  test("Nullable.emptyZipNullable.empty"){ 
+    assertEquals(Nullable.empty zip Nullable.empty, null)
+  }
+
+  test("NullableUnzipToNullablePair"){ 
+    assertEquals(Nullable(("foo", "bar")).unzip, (Nullable("foo"), Nullable("bar")))
+  }
+  test("NullableUnzipToNullableNullable.empty"){ 
+    assertEquals(Nullable(("foo", null)).unzip, (Nullable("foo"), Nullable(null)))
+  }
+  test("Nullable.emptyUnzipToNullable.emptyPair"){ 
+    assertEquals(Nullable.empty[(String, String)].unzip, (Nullable.empty, Nullable.empty))
+  }
+
+  test("NullableUnzip3ToNullableTriple"){ 
+    assertEquals(Nullable(("foo", "bar", "z")).unzip3, (Nullable("foo"), Nullable("bar"), Nullable("z")))
+  }
+  test("NullableUnzip3ToNullableNullable.empty"){ 
+    assertEquals(Nullable(("foo", null, null)).unzip3, (Nullable("foo"), Nullable(null), Nullable(null)))
+  }
+  test("Nullable.emptyUnzip3ToNullable.emptyTriple"){ 
+    assertEquals(Nullable.empty.unzip3, (Nullable.empty, Nullable.empty, Nullable.empty))
+  }