zio2-rc6 (#118)

zio · Jun 9, 2022 · cc3fe3f · cc3fe3f
1 parent 58c5a9d
commit cc3fe3f
Show file tree

Hide file tree

Showing 9 changed files with 31 additions and 32 deletions.
diff --git a/build.sbt b/build.sbt
@@ -54,9 +54,9 @@ def copyJarSetting(dir: String) =
     }
   )
 
-val zioVersion       = "2.0.0-RC5"
-val zioAwsVersion    = "5.17.170.1"
-val zioSchemaVersion = "0.2.0-RC5"
+val zioVersion       = "2.0.0-RC6"
+val zioAwsVersion    = "5.17.202.1"
+val zioSchemaVersion = "0.2.0-RC6"
 
 lazy val root =
   project

diff --git a/dynamodb/src/it/scala/zio/dynamodb/LiveSpec.scala b/dynamodb/src/it/scala/zio/dynamodb/LiveSpec.scala
@@ -156,7 +156,7 @@ object LiveSpec extends ZIOSpecDefault {
     ConditionExpression.Operand.ValueOperand(AttributeValue(id))
   )
 
-  override def spec: ZSpec[TestEnvironment, Any] =
+  override def spec: Spec[TestEnvironment, Any] =
     suite("live test")(
       suite("basic usage")(
         test("put and get item") {
@@ -234,7 +234,7 @@ object LiveSpec extends ZIOSpecDefault {
               key = pk(avi3Item),
               tableName = TableName(tableName)
             ).where($("firstName").beginsWith("noOne"))
-            assertM(deleteItem.execute.exit)(fails(assertDynamoDbException("The conditional request failed")))
+            assertZIO(deleteItem.execute.exit)(fails(assertDynamoDbException("The conditional request failed")))
           }
         },
         test("put item with false where clause") {
@@ -244,7 +244,7 @@ object LiveSpec extends ZIOSpecDefault {
               item = Item(id -> "nothing", number -> 900)
             ).where($("id").beginsWith("false"))
 
-            assertM(putItem.execute.exit)(fails(assertDynamoDbException("The conditional request failed")))
+            assertZIO(putItem.execute.exit)(fails(assertDynamoDbException("The conditional request failed")))
           }
         },
         test("batch get item") {
@@ -782,7 +782,7 @@ object LiveSpec extends ZIOSpecDefault {
                   tableName = TableName(tableName)
                 )
 
-                assertM(
+                assertZIO(
                   conditionCheck.zip(putItem).transaction.execute.exit
                 )(
                   fails(
@@ -865,7 +865,7 @@ object LiveSpec extends ZIOSpecDefault {
                   updateExpression = UpdateExpression($(name).setValue("shouldFail"))
                 )
 
-                assertM(updateItem1.zip(updateItem2).transaction.execute.exit)(
+                assertZIO(updateItem1.zip(updateItem2).transaction.execute.exit)(
                   fails(assertDynamoDbException("Transaction request cannot include multiple operations on one item"))
                 )
             }
@@ -890,7 +890,7 @@ object LiveSpec extends ZIOSpecDefault {
                   _ <- updateItem2.execute
                 } yield ()
 
-                assertM(program.exit)(
+                assertZIO(program.exit)(
                   fails(isSubtype[IdempotentParameterMismatchException](Assertion.anything))
                 )
             }

diff --git a/dynamodb/src/test/scala/zio/dynamodb/AliasMapRenderSpec.scala b/dynamodb/src/test/scala/zio/dynamodb/AliasMapRenderSpec.scala
@@ -46,7 +46,7 @@ object AliasMapRenderSpec extends ZIOSpecDefault {
   val setOperandValueTwo   = UpdateExpression.SetOperand.ValueOperand(two)
   val setOperandValueThree = UpdateExpression.SetOperand.ValueOperand(three)
 
-  override def spec: ZSpec[_root_.zio.test.TestEnvironment, Any] =
+  override def spec: Spec[_root_.zio.test.TestEnvironment, Any] =
     suite("AliasMapRender")(
       suite("ConditionExpression")(
         suite("basic renders")(

diff --git a/dynamodb/src/test/scala/zio/dynamodb/FromAttributeValueSpec.scala b/dynamodb/src/test/scala/zio/dynamodb/FromAttributeValueSpec.scala
@@ -5,7 +5,7 @@ import zio.test.{ ZIOSpecDefault, _ }
 
 object FromAttributeValueSpec extends ZIOSpecDefault {
 
-  override def spec: Spec[Any, TestFailure[Nothing], TestSuccess] = suite("AttrMap suite")(fromAttributeValueSuite)
+  override def spec: Spec[Any, Nothing] = suite("AttrMap suite")(fromAttributeValueSuite)
 
   val fromAttributeValueSuite = suite("FromAttributeValueSuite")(
     test("get[String] should return a Right of String when it exists") {

diff --git a/dynamodb/src/test/scala/zio/dynamodb/ProjectionExpressionParserSpec.scala b/dynamodb/src/test/scala/zio/dynamodb/ProjectionExpressionParserSpec.scala
@@ -40,7 +40,7 @@ object ProjectionExpressionParserSpec extends ZIOSpecDefault {
 
   override def spec = mainSuite
 
-  private val mainSuite: Spec[Sized with TestConfig, TestFailure[Any], TestSuccess] =
+  private val mainSuite: Spec[Sized with TestConfig, Nothing] =
     suite("ProjectionExpression Parser")(
       test("$ function compiles") {
         val _ = $("name").beginsWith("Avi")

diff --git a/dynamodb/src/test/scala/zio/dynamodb/TransactionModelSpec.scala b/dynamodb/src/test/scala/zio/dynamodb/TransactionModelSpec.scala
@@ -147,7 +147,7 @@ object TransactionModelSpec extends ZIOSpecDefault {
 
         val getItem = GetItem(tableName, item)
 
-        assertM(updateItem.zip(getItem).transaction.execute.exit)(
+        assertZIO(updateItem.zip(getItem).transaction.execute.exit)(
           fails(isSubtype[MixedTransactionTypes](Assertion.anything))
         )
       }
@@ -160,42 +160,42 @@ object TransactionModelSpec extends ZIOSpecDefault {
           attributeDefinitions = NonEmptySet(AttributeDefinition.attrDefnString("name")),
           billingMode = BillingMode.PayPerRequest
         )
-        assertM(createTable.transaction.execute.exit)(fails(invalidTransactionActionsContains(createTable)))
+        assertZIO(createTable.transaction.execute.exit)(fails(invalidTransactionActionsContains(createTable)))
       },
       test("delete table") {
         val deleteTable = DeleteTable(tableName)
-        assertM(deleteTable.transaction.execute.exit)(fails(invalidTransactionActionsContains(deleteTable)))
+        assertZIO(deleteTable.transaction.execute.exit)(fails(invalidTransactionActionsContains(deleteTable)))
       },
       test("scan all") {
         val scanAll = ScanAll(tableName)
-        assertM(scanAll.transaction.execute.exit)(fails(invalidTransactionActionsContains(scanAll)))
+        assertZIO(scanAll.transaction.execute.exit)(fails(invalidTransactionActionsContains(scanAll)))
       },
       test("scan some") {
         val scanSome = ScanSome(tableName, 4)
-        assertM(scanSome.transaction.execute.exit)(fails(invalidTransactionActionsContains(scanSome)))
+        assertZIO(scanSome.transaction.execute.exit)(fails(invalidTransactionActionsContains(scanSome)))
       },
       test("describe table") {
         val describeTable = DescribeTable(tableName)
-        assertM(describeTable.transaction.execute.exit)(fails(invalidTransactionActionsContains(describeTable)))
+        assertZIO(describeTable.transaction.execute.exit)(fails(invalidTransactionActionsContains(describeTable)))
       },
       test("query some") {
         val querySome = QuerySome(tableName, 4)
-        assertM(querySome.transaction.execute.exit)(fails(invalidTransactionActionsContains(querySome)))
+        assertZIO(querySome.transaction.execute.exit)(fails(invalidTransactionActionsContains(querySome)))
       },
       test("query all") {
         val queryAll = QueryAll(tableName)
-        assertM(queryAll.transaction.execute.exit)(fails(invalidTransactionActionsContains(queryAll)))
+        assertZIO(queryAll.transaction.execute.exit)(fails(invalidTransactionActionsContains(queryAll)))
       }
     )
   )
 
   val successfulSuite = suite("transaction construction successes")(
     suite("transact get items")(
       test("get item") {
-        assertM(simpleGetItem.transaction.execute)(equalTo(Some(item)))
+        assertZIO(simpleGetItem.transaction.execute)(equalTo(Some(item)))
       },
       test("batch get item") {
-        assertM(simpleBatchGet.transaction.execute)(
+        assertZIO(simpleBatchGet.transaction.execute)(
           equalTo(
             BatchGetItem.Response(responses =
               MapOfSet.empty[TableName, Item].addAll((tableName, item), (tableName, item2))
@@ -204,7 +204,7 @@ object TransactionModelSpec extends ZIOSpecDefault {
         )
       },
       test("multi table batch get item") {
-        assertM(multiTableGet.transaction.execute)(
+        assertZIO(multiTableGet.transaction.execute)(
           equalTo(
             BatchGetItem.Response(responses =
               MapOfSet.empty[TableName, Item].addAll((tableName, item), (tableName2, item3), (tableName, item2))
@@ -215,16 +215,16 @@ object TransactionModelSpec extends ZIOSpecDefault {
     ),
     suite("transact write items")(
       test("update item") {
-        assertM(simpleUpdateItem.transaction.execute)(equalTo(None))
+        assertZIO(simpleUpdateItem.transaction.execute)(equalTo(None))
       },
       test("delete item") {
-        assertM(simpleDeleteItem.transaction.execute)(equalTo(()))
+        assertZIO(simpleDeleteItem.transaction.execute)(equalTo(()))
       },
       test("put item") {
-        assertM(simplePutItem.transaction.execute)(equalTo(()))
+        assertZIO(simplePutItem.transaction.execute)(equalTo(()))
       },
       test("batch write item") {
-        assertM(simpleBatchWrite.transaction.execute)(equalTo(BatchWriteItem.Response(None)))
+        assertZIO(simpleBatchWrite.transaction.execute)(equalTo(BatchWriteItem.Response(None)))
       }
     )
   )

diff --git a/dynamodb/src/test/scala/zio/dynamodb/codec/MapCodecSpec.scala b/dynamodb/src/test/scala/zio/dynamodb/codec/MapCodecSpec.scala
@@ -19,7 +19,7 @@ object MapCodecSpec extends ZIOSpecDefault {
     implicit val schema: Schema[HasMapWithNonStringKey] = DeriveSchema.gen[HasMapWithNonStringKey]
   }
 
-  override def spec: ZSpec[zio.test.TestEnvironment, Any] =
+  override def spec: Spec[zio.test.TestEnvironment, Any] =
     suite("Map codecs")(
       suite("when encoding")(
         test("encodes map with string key natively") {

diff --git a/dynamodb/src/test/scala/zio/dynamodb/codec/SchemaAssertions.scala b/dynamodb/src/test/scala/zio/dynamodb/codec/SchemaAssertions.scala
@@ -3,15 +3,14 @@ package zio.dynamodb.codec
 import zio.Chunk
 import zio.schema._
 import zio.test.Assertion
-import zio.test.AssertionM.Render.param
 
 object SchemaAssertions {
 
   def hasSameSchema[A](expected: Schema[A]): Assertion[Schema[A]] =
-    Assertion.assertion("hasSameSchema")(param(expected))(actual => equalsSchema(expected, actual))
+    Assertion.assertion("hasSameSchema")(actual => equalsSchema(expected, actual))
 
   def hasSameAst(expected: Schema[_]): Assertion[Schema[_]] =
-    Assertion.assertion("hasSameAst")(param(expected))(actual => equalsAst(expected, actual))
+    Assertion.assertion("hasSameAst")(actual => equalsAst(expected, actual))
 
   private def equalsAst(expected: Schema[_], actual: Schema[_], depth: Int = 0): Boolean =
     (expected, actual) match {

diff --git a/dynamodb/src/test/scala/zio/dynamodb/codec/SetCodecSpec.scala b/dynamodb/src/test/scala/zio/dynamodb/codec/SetCodecSpec.scala
@@ -31,7 +31,7 @@ object SetCodecSpec extends ZIOSpecDefault {
     implicit val schema: Schema[HasSetWithNonNativeType] = DeriveSchema.gen[HasSetWithNonNativeType]
   }
 
-  override def spec: ZSpec[zio.test.TestEnvironment, Any] =
+  override def spec: Spec[zio.test.TestEnvironment, Any] =
     suite("Set codecs")(
       suite("when encoding")(
         test("encodes set of BigDecimal natively") {