Added test for JSONGetItemByType
This commit is contained in:
Marius Orcsik
parent
1b855f7673
commit
ddf7c77e1c
|
|
@ -229,62 +229,6 @@ func UnmarshalJSON(data []byte) (Item, error) {
|
|||
return JSONUnmarshalToItem(data), nil
|
||||
}
|
||||
|
||||
/*
|
||||
func unmarshal(data []byte, a interface{}) (interface{}, error) {
|
||||
ta := make(mockObj, 0)
|
||||
err := jsonld.Unmarshal(data, &ta)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
typ := reflect.TypeOf(a)
|
||||
val := reflect.ValueOf(a)
|
||||
|
||||
if typ.Kind() == reflect.Ptr {
|
||||
typ = typ.Elem()
|
||||
val = val.Elem()
|
||||
}
|
||||
|
||||
for i := 0; i < typ.NumField(); i++ {
|
||||
cField := typ.Field(i)
|
||||
cValue := val.Field(i)
|
||||
cTag := cField.Tag
|
||||
tag, _ := jsonld.LoadTag(cTag)
|
||||
|
||||
var vv reflect.Value
|
||||
for key, j := range ta {
|
||||
if j == nil {
|
||||
continue
|
||||
}
|
||||
if key == tag.Name {
|
||||
if cField.Type.Implements(textUnmarshalerType) {
|
||||
m, _ := cValue.Interface().(encoding.TextUnmarshaler)
|
||||
m.UnmarshalText(j)
|
||||
vv = reflect.ValueOf(m)
|
||||
}
|
||||
if cField.Type.Implements(unmarshalerType) {
|
||||
m, _ := cValue.Interface().(json.Unmarshaler)
|
||||
m.UnmarshalJSON(j)
|
||||
vv = reflect.ValueOf(m)
|
||||
}
|
||||
if cField.Type.Implements(apUnmarshalerType) {
|
||||
o := JSONGetItemByType(getType(j))
|
||||
if o != nil {
|
||||
jsonld.Unmarshal([]byte(j), o)
|
||||
vv = reflect.ValueOf(o)
|
||||
}
|
||||
}
|
||||
}
|
||||
if vv.CanAddr() {
|
||||
cValue.Set(vv)
|
||||
fmt.Printf("\n\nReflected %q %q => %#v\n\n%#v\n", cField.Name, cField.Type, vv, tag.Name)
|
||||
}
|
||||
}
|
||||
}
|
||||
return a, nil
|
||||
}
|
||||
*/
|
||||
|
||||
func JSONGetItemByType(typ ActivityVocabularyType) (Item, error) {
|
||||
var ret Item
|
||||
var err error
|
||||
|
|
@ -331,12 +275,9 @@ func JSONGetItemByType(typ ActivityVocabularyType) (Item, error) {
|
|||
case DocumentType:
|
||||
ret = ObjectNew(typ)
|
||||
case EventType:
|
||||
o := Object{}
|
||||
o.Type = typ
|
||||
ret = ObjectNew(typ)
|
||||
case ImageType:
|
||||
ret = ObjectNew(typ)
|
||||
o := ret.(*Object)
|
||||
o.Type = typ
|
||||
case NoteType:
|
||||
ret = ObjectNew(typ)
|
||||
case PageType:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,125 @@
|
|||
package activitystreams
|
||||
|
||||
import "testing"
|
||||
import (
|
||||
"reflect"
|
||||
"testing"
|
||||
)
|
||||
|
||||
type testPairs map[ActivityVocabularyType]reflect.Type
|
||||
|
||||
var objectPtrType = reflect.TypeOf(new(*Object)).Elem()
|
||||
var linkPtrType = reflect.TypeOf(new(*Link)).Elem()
|
||||
var mentionPtrType = reflect.TypeOf(new(*Mention)).Elem()
|
||||
var activityPtrType = reflect.TypeOf(new(*Activity)).Elem()
|
||||
var intransitiveActivityPtrType = reflect.TypeOf(new(*IntransitiveActivity)).Elem()
|
||||
var collectionPtrType = reflect.TypeOf(new(*Collection)).Elem()
|
||||
var collectionPagePtrType = reflect.TypeOf(new(*CollectionPage)).Elem()
|
||||
var orderedCollectionPtrType = reflect.TypeOf(new(*OrderedCollection)).Elem()
|
||||
var orderedCollectionPagePtrType = reflect.TypeOf(new(*OrderedCollectionPage)).Elem()
|
||||
var applicationPtrType = reflect.TypeOf(new(*Application)).Elem()
|
||||
var servicePtrType = reflect.TypeOf(new(*Service)).Elem()
|
||||
var personPtrType = reflect.TypeOf(new(*Person)).Elem()
|
||||
var groupPtrType = reflect.TypeOf(new(*Group)).Elem()
|
||||
var organizationPtrType = reflect.TypeOf(new(*Organization)).Elem()
|
||||
var acceptPtrType = reflect.TypeOf(new(*Accept)).Elem()
|
||||
var addPtrType = reflect.TypeOf(new(*Add)).Elem()
|
||||
var announcePtrType = reflect.TypeOf(new(*Announce)).Elem()
|
||||
var arrivePtrType = reflect.TypeOf(new(*Arrive)).Elem()
|
||||
var blockPtrType = reflect.TypeOf(new(*Block)).Elem()
|
||||
var createPtrType = reflect.TypeOf(new(*Create)).Elem()
|
||||
var deletePtrType = reflect.TypeOf(new(*Delete)).Elem()
|
||||
var dislikePtrType = reflect.TypeOf(new(*Dislike)).Elem()
|
||||
var flagPtrType = reflect.TypeOf(new(*Flag)).Elem()
|
||||
var followPtrType = reflect.TypeOf(new(*Follow)).Elem()
|
||||
var ignorePtrType = reflect.TypeOf(new(*Ignore)).Elem()
|
||||
var invitePtrType = reflect.TypeOf(new(*Invite)).Elem()
|
||||
var joinPtrType = reflect.TypeOf(new(*Join)).Elem()
|
||||
var leavePtrType = reflect.TypeOf(new(*Leave)).Elem()
|
||||
var likePtrType = reflect.TypeOf(new(*Like)).Elem()
|
||||
var listenPtrType = reflect.TypeOf(new(*Listen)).Elem()
|
||||
var movePtrType = reflect.TypeOf(new(*Move)).Elem()
|
||||
var offerPtrType = reflect.TypeOf(new(*Offer)).Elem()
|
||||
var questionPtrType = reflect.TypeOf(new(*Question)).Elem()
|
||||
var rejectPtrType = reflect.TypeOf(new(*Reject)).Elem()
|
||||
var readPtrType = reflect.TypeOf(new(*Read)).Elem()
|
||||
var removePtrType = reflect.TypeOf(new(*Remove)).Elem()
|
||||
var tentativeRejectPtrType = reflect.TypeOf(new(*TentativeReject)).Elem()
|
||||
var tentativeAcceptPtrType = reflect.TypeOf(new(*TentativeAccept)).Elem()
|
||||
var travelPtrType = reflect.TypeOf(new(*Travel)).Elem()
|
||||
var undoPtrType = reflect.TypeOf(new(*Undo)).Elem()
|
||||
var updatePtrType = reflect.TypeOf(new(*Update)).Elem()
|
||||
var viewPtrType = reflect.TypeOf(new(*View)).Elem()
|
||||
|
||||
var tests = testPairs{
|
||||
ObjectType: objectPtrType,
|
||||
ArticleType: objectPtrType,
|
||||
AudioType: objectPtrType,
|
||||
DocumentType: objectPtrType,
|
||||
ImageType: objectPtrType,
|
||||
NoteType: objectPtrType,
|
||||
PageType: objectPtrType,
|
||||
PlaceType: objectPtrType,
|
||||
ProfileType: objectPtrType,
|
||||
RelationshipType: objectPtrType,
|
||||
TombstoneType: objectPtrType,
|
||||
VideoType: objectPtrType,
|
||||
LinkType: linkPtrType,
|
||||
MentionType: mentionPtrType,
|
||||
CollectionType: collectionPtrType,
|
||||
CollectionPageType: collectionPagePtrType,
|
||||
OrderedCollectionType: orderedCollectionPtrType,
|
||||
OrderedCollectionPageType: orderedCollectionPagePtrType,
|
||||
ActorType: objectPtrType,
|
||||
ApplicationType: applicationPtrType,
|
||||
ServiceType: servicePtrType,
|
||||
PersonType: personPtrType,
|
||||
GroupType: groupPtrType,
|
||||
OrganizationType: organizationPtrType,
|
||||
ActivityType: activityPtrType,
|
||||
IntransitiveActivityType: intransitiveActivityPtrType,
|
||||
AcceptType: acceptPtrType,
|
||||
AddType: addPtrType,
|
||||
AnnounceType: announcePtrType,
|
||||
ArriveType: arrivePtrType,
|
||||
BlockType: blockPtrType,
|
||||
CreateType: createPtrType,
|
||||
DeleteType: deletePtrType,
|
||||
DislikeType: dislikePtrType,
|
||||
FlagType: flagPtrType,
|
||||
FollowType: followPtrType,
|
||||
IgnoreType: ignorePtrType,
|
||||
InviteType: invitePtrType,
|
||||
JoinType: joinPtrType,
|
||||
LeaveType: leavePtrType,
|
||||
LikeType: likePtrType,
|
||||
ListenType: listenPtrType,
|
||||
MoveType: movePtrType,
|
||||
OfferType: offerPtrType,
|
||||
QuestionType: questionPtrType,
|
||||
RejectType: rejectPtrType,
|
||||
ReadType: readPtrType,
|
||||
RemoveType: removePtrType,
|
||||
TentativeRejectType: tentativeRejectPtrType,
|
||||
TentativeAcceptType: tentativeAcceptPtrType,
|
||||
TravelType: travelPtrType,
|
||||
UndoType: undoPtrType,
|
||||
UpdateType: updatePtrType,
|
||||
ViewType: viewPtrType,
|
||||
}
|
||||
|
||||
func TestJSONGetItemByType(t *testing.T) {
|
||||
for typ, test := range tests {
|
||||
t.Run(string(typ), func(t *testing.T) {
|
||||
v, err := JSONGetItemByType(typ)
|
||||
if err != nil {
|
||||
t.Error(err)
|
||||
}
|
||||
if reflect.TypeOf(v) != test {
|
||||
t.Errorf("Invalid type returned %T, expected %s", v, test.String())
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestUnmarshalJSON(t *testing.T) {
|
||||
dataEmpty := []byte("{}")
|
||||
|
|
|
|||
Reference in a new issue