Skip to content

Different representation of data #86

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wallymathieu wants to merge 5 commits into
base: master
Choose a base branch
from
Draft

Different representation of data #86

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a21e426
Trying different representation of json values
wallymathieu May 24, 2020
336aff1
Should serialize to correct value
wallymathieu May 24, 2020
24228e0
Fix after code review
wallymathieu May 24, 2020
4080f74
Merge branch 'master' into different-representation-of-data-2
wallymathieu Jun 3, 2020
a09b036
Faulty merge
wallymathieu Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 59 additions & 4 deletions test/Tests/Tests.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,38 @@ type Person with
"children" .= x.Children
]

type Person2 = {
Name: string
Age: int
Gender: Gender
}

type Person2 with
static member Create name age gender = { Person2.Name = name; Age = age; Gender = gender; }

static member OfJson json =
match json with
| JObject o ->
let name = o .@ "name"
let age = o .@ "age"
let cgender = o .@ "gender"
let gender =
match cgender with
| Ok 0 -> Decode.Success Gender.Male
| Ok 1 -> Decode.Success Gender.Female
| Ok x -> Decode.Fail.invalidValue (JString <| string x ) "Unexpected value"
| Error y -> Error y

Person2.Create <!> name <*> age <*> gender
| x -> Decode.Fail.objExpected x

static member ToJson (x: Person2) =
jobj [
"name" .= x.Name
"age" .= x.Age
"gender" .= (match x.Gender with |Gender.Male -> 0 | Gender.Female -> 1)
]

type Attribute = {
Name: string
Value: string
Expand Down Expand Up @@ -247,6 +279,14 @@ let tests = [
] }
Assert.Equal("Person", Some expectedPerson, Option.ofResult actual)
}
test "Person2 different representation" {
let actual : Person2 ParseResult = parseJson """{"name": "John", "age": 44, "gender": 0}"""
let expectedPerson =
{ Person2.Name = "John"
Age = 44
Gender = Gender.Male }
Assert.Equal("Person", Some expectedPerson, Option.ofResult actual)
}
#if SYSTEMJSON
test "DateTime with milliseconds" {
let actual : DateTime ParseResult = ofJson (JsonPrimitive "2014-09-05T04:38:07.862Z")
Expand Down Expand Up @@ -388,22 +428,37 @@ let tests = [
] }
#if NEWTONSOFT
let expected = """{"name":"John","age":44,"gender":"Male","dob":"1975-01-01T00:00:00.000Z","children":[{"name":"Katy","age":5,"gender":"Female","dob":"1975-01-01T00:00:00.000Z","children":[]},{"name":"Johnny","age":7,"gender":"Male","dob":"1975-01-01T00:00:00.000Z","children":[]}]}"""
Assert.JSON(expected, p)
#endif
#if FSHARPDATA
let expected = """{"name":"John","age":44,"gender":"Male","dob":"1975-01-01T00:00:00.000Z","children":[{"name":"Katy","age":5,"gender":"Female","dob":"1975-01-01T00:00:00.000Z","children":[]},{"name":"Johnny","age":7,"gender":"Male","dob":"1975-01-01T00:00:00.000Z","children":[]}]}"""
Assert.JSON(expected, p)
#endif
#if SYSTEMJSON
let expected = """{"age":44,"children":[{"age":5,"children":[],"dob":"1975-01-01T00:00:00.000Z","gender":"Female","name":"Katy"},{"age":7,"children":[],"dob":"1975-01-01T00:00:00.000Z","gender":"Male","name":"Johnny"}],"dob":"1975-01-01T00:00:00.000Z","gender":"Male","name":"John"}"""
Assert.JSON(expected, p)
#endif
#if SYSTEMTEXTJSON
let expected = """{"name":"John","age":44,"gender":"Male","dob":"1975-01-01T00:00:00.000Z","children":[{"name":"Katy","age":5,"gender":"Female","dob":"1975-01-01T00:00:00.000Z","children":[]},{"name":"Johnny","age":7,"gender":"Male","dob":"1975-01-01T00:00:00.000Z","children":[]}]}"""
#endif
Assert.JSON(expected, p)
}
test "Person2" {
let p =
{ Person2.Name = "John"
Age = 44
Gender = Gender.Male }
#if NEWTONSOFT
let expected = """{"name":"John","age":44,"gender":0}"""
#endif
#if FSHARPDATA
let expected = """{"name":"John","age":44,"gender":0}"""
#endif
#if SYSTEMJSON
let expected = """{"age":44,"gender":0,"name":"John"}"""
#endif
#if SYSTEMTEXTJSON
let expected = """{"name":"John","age":44,"gender":0}"""
#endif
Assert.JSON(expected, p)
}

test "Vehicle" {
let u = [ Bike ] |> toJson |> string |> strCleanUpAll
let v = [ MotorBike () ] |> toJson |> string |> strCleanUpAll
Expand Down