Added Json unmarshalling for the Person tupe and its aliases

Changes

2 changed files (+109/-0)

• activitystreams/actors.go
  • @@ -439,6 +439,46 @@ func (p *Person) UnmarshalJSON(data []byte) error {
    return err } + // UnmarshalJSON + func (a *Application) UnmarshalJSON(data []byte) error { + act := a.GetActor() + err := act.UnmarshalJSON(data) + + *a = Application(act) + + return err + } + + // UnmarshalJSON + func (g *Group) UnmarshalJSON(data []byte) error { + a := g.GetActor() + err := a.UnmarshalJSON(data) + + *g = Group(a) + + return err + } + + // UnmarshalJSON + func (o *Organization) UnmarshalJSON(data []byte) error { + a := o.GetActor() + err := a.UnmarshalJSON(data) + + *o = Organization(a) + + return err + } + + // UnmarshalJSON + func (s *Service) UnmarshalJSON(data []byte) error { + a := s.GetActor() + err := a.UnmarshalJSON(data) + + *s = Service(a) + + return err + } + // GetActor returns the underlying Actor type func (a Actor) GetActor() Actor { return a
• activitystreams/actors_test.go
  • @@ -248,8 +248,77 @@ func TestPerson_GetType(t *testing.T) {
    } + func validateEmptyPerson(p Person, t *testing.T) { + if p.ID != "" { + t.Errorf("Unmarshalled object %T should have empty ID, received %q", p, p.ID) + } + if p.Type != "" { + t.Errorf("Unmarshalled object %T should have empty Type, received %q", p, p.Type) + } + if p.AttributedTo != nil { + t.Errorf("Unmarshalled object %T should have empty AttributedTo, received %q", p, p.AttributedTo) + } + if len(p.Name) != 0 { + t.Errorf("Unmarshalled object %T should have empty Name, received %q", p, p.Name) + } + if len(p.Summary) != 0 { + t.Errorf("Unmarshalled object %T should have empty Summary, received %q", p, p.Summary) + } + if len(p.Content) != 0 { + t.Errorf("Unmarshalled object %T should have empty Content, received %q", p, p.Content) + } + if p.URL != nil { + t.Errorf("Unmarshalled object %T should have empty URL, received %v", p, p.URL) + } + if !p.Published.IsZero() { + t.Errorf("Unmarshalled object %T should have empty Published, received %q", p, p.Published) + } + if !p.StartTime.IsZero() { + t.Errorf("Unmarshalled object %T should have empty StartTime, received %q", p, p.StartTime) + } + if !p.Updated.IsZero() { + t.Errorf("Unmarshalled object %T should have empty Updated, received %q", p, p.Updated) + } + } + func TestPerson_UnmarshalJSON(t *testing.T) { + p := Person{} + + dataEmpty := []byte("{}") + p.UnmarshalJSON(dataEmpty) + validateEmptyPerson(p, t) + } + + func TestApplication_UnmarshalJSON(t *testing.T) { + a := Application{} + + dataEmpty := []byte("{}") + a.UnmarshalJSON(dataEmpty) + validateEmptyPerson(Person(a), t) + } + + func TestGroup_UnmarshalJSON(t *testing.T) { + g := Group{} + + dataEmpty := []byte("{}") + g.UnmarshalJSON(dataEmpty) + validateEmptyPerson(Person(g), t) + } + + func TestOrganization_UnmarshalJSON(t *testing.T) { + o := Organization{} + + dataEmpty := []byte("{}") + o.UnmarshalJSON(dataEmpty) + validateEmptyPerson(Person(o), t) + } + + func TestService_UnmarshalJSON(t *testing.T) { + s := Service{} + dataEmpty := []byte("{}") + s.UnmarshalJSON(dataEmpty) + validateEmptyPerson(Person(s), t) } func TestService_GetActor(t *testing.T) {