git.iko.soy/typeable/openapi3
on master help sign in
Use only strict JSON check in tests
e07b402Nickolay Kudasov
test/Data/Swagger/SchemaSpec.hs+1−1
compare with master
unifiedsplit
@@ -23,7 +23,7 @@ import SpecCommon
23import Test.Hspec
23import Test.Hspec
24
24
25checkToSchema :: ToSchema a => Proxy a -> Value -> Spec
25checkToSchema :: ToSchema a => Proxy a -> Value -> Spec
26−checkToSchema proxy js = toSchema proxy <~> js
26+checkToSchema proxy js = toSchema proxy <=> js
27
27
28checkSchemaName :: ToSchema a => Maybe String -> Proxy a -> Spec
28checkSchemaName :: ToSchema a => Maybe String -> Proxy a -> Spec
29checkSchemaName sname proxy =
29checkSchemaName sname proxy =
test/Data/SwaggerSpec.hs+10−10
@@ -21,18 +21,18 @@ spec = do
21 describe "License Object" $ licenseExample <=> licenseExampleJSON
21 describe "License Object" $ licenseExample <=> licenseExampleJSON
22 describe "Contact Object" $ contactExample <=> contactExampleJSON
22 describe "Contact Object" $ contactExample <=> contactExampleJSON
23 describe "Info Object" $ infoExample <=> infoExampleJSON
23 describe "Info Object" $ infoExample <=> infoExampleJSON
24− describe "Operation Object" $ operationExample <~> operationExampleJSON
24+ describe "Operation Object" $ operationExample <=> operationExampleJSON
25 describe "Schema Object" $ do
25 describe "Schema Object" $ do
26− context "Primitive Sample" $ schemaPrimitiveExample <~> schemaPrimitiveExampleJSON
26+ context "Primitive Sample" $ schemaPrimitiveExample <=> schemaPrimitiveExampleJSON
27− context "Simple Model" $ schemaSimpleModelExample <~> schemaSimpleModelExampleJSON
27+ context "Simple Model" $ schemaSimpleModelExample <=> schemaSimpleModelExampleJSON
28− context "Model with Map/Dictionary Properties" $ schemaModelDictExample <~> schemaModelDictExampleJSON
28+ context "Model with Map/Dictionary Properties" $ schemaModelDictExample <=> schemaModelDictExampleJSON
29− context "Model with Example" $ schemaWithExampleExample <~> schemaWithExampleExampleJSON
29+ context "Model with Example" $ schemaWithExampleExample <=> schemaWithExampleExampleJSON
30− describe "Definitions Object" $ definitionsExample <~> definitionsExampleJSON
30+ describe "Definitions Object" $ definitionsExample <=> definitionsExampleJSON
31− describe "Parameters Definition Object" $ paramsDefinitionExample <~> paramsDefinitionExampleJSON
31+ describe "Parameters Definition Object" $ paramsDefinitionExample <=> paramsDefinitionExampleJSON
32− describe "Responses Definition Object" $ responsesDefinitionExample <~> responsesDefinitionExampleJSON
32+ describe "Responses Definition Object" $ responsesDefinitionExample <=> responsesDefinitionExampleJSON
33− describe "Security Definitions Object" $ securityDefinitionsExample <~> securityDefinitionsExampleJSON
33+ describe "Security Definitions Object" $ securityDefinitionsExample <=> securityDefinitionsExampleJSON
34 describe "Swagger Object" $ do
34 describe "Swagger Object" $ do
35− context "Todo Example" $ swaggerExample <~> swaggerExampleJSON
35+ context "Todo Example" $ swaggerExample <=> swaggerExampleJSON
36 context "PetStore Example" $
36 context "PetStore Example" $
37 it "decodes successfully" $ do
37 it "decodes successfully" $ do
38 fromJSON petstoreExampleJSON `shouldSatisfy` (\x -> case x of Success (_ :: Swagger) -> True; _ -> False)
38 fromJSON petstoreExampleJSON `shouldSatisfy` (\x -> case x of Success (_ :: Swagger) -> True; _ -> False)
test/SpecCommon.hs−7
@@ -15,13 +15,6 @@ isSubJSON (Object x) (Object y) = HashMap.keys x == HashMap.keys i && F.and i
15isSubJSON (Array xs) (Array ys) = Vector.length xs == Vector.length ys && F.and (Vector.zipWith isSubJSON xs ys)
15isSubJSON (Array xs) (Array ys) = Vector.length xs == Vector.length ys && F.and (Vector.zipWith isSubJSON xs ys)
16isSubJSON x y = x == y
16isSubJSON x y = x == y
17
17
18−(<~>) :: (Eq a, Show a, ToJSON a, FromJSON a) => a -> Value -> Spec
19−x <~> js = do
20− it "encodes correctly (probably with extra properties)" $ do
21− toJSON x `shouldSatisfy` (js `isSubJSON`)
22− it "decodes correctly" $ do
23− fromJSON js `shouldBe` Success x
24−
25(<=>) :: (Eq a, Show a, ToJSON a, FromJSON a) => a -> Value -> Spec
18(<=>) :: (Eq a, Show a, ToJSON a, FromJSON a) => a -> Value -> Spec
26x <=> js = do
19x <=> js = do
27 it "encodes correctly" $ do
20 it "encodes correctly" $ do