Added tests for RecipientsDeduplication on Activities So much code for so little testing

Changes

2 changed files (+192/-3)

• src/activitypub/activity.go
  • @@ -462,18 +462,18 @@ func IntransitiveActivityNew(id ObjectID, _type ActivityVocabularyType) *Intrans
    func (a *Activity) RecipientsDeduplication() { var actor ObjectsArr actor.Append(a.Actor) - recipientsDeduplication(&actor, &a.To, &a.CC, &a.BCC) + recipientsDeduplication(&actor, &a.To, &a.Bto, &a.CC, &a.BCC) } func (i *IntransitiveActivity) RecipientsDeduplication() { var actor ObjectsArr actor.Append(i.Actor) - recipientsDeduplication(&actor, &i.To, &i.CC, &i.BCC) + recipientsDeduplication(&actor, &i.To, &i.Bto, &i.CC, &i.BCC) } func (b *Block) RecipientsDeduplication() { var dedupObjects ObjectsArr dedupObjects.Append(b.Actor) dedupObjects.Append(b.Object) - recipientsDeduplication(&dedupObjects, &b.To, &b.CC, &b.BCC) + recipientsDeduplication(&dedupObjects, &b.To, &b.Bto, &b.CC, &b.BCC) }
• src/activitypub/activity_test.go
  • @@ -431,3 +431,192 @@ func TestViewNew(t *testing.T) {
    t.Errorf("Activity Type '%v' different than expected '%v'", a.Type, ViewType) } } + + func TestActivityRecipientsDeduplication(t *testing.T) { + bob := PersonNew("bob") + alice := PersonNew("alice") + foo := OrganizationNew("foo") + bar := GroupNew("bar") + + a := ActivityNew("t", "test", nil) + + a.To.Append(bob) + a.To.Append(alice) + a.To.Append(foo) + a.To.Append(bar) + if len(a.To) != 4 { + t.Errorf("%T.To should have exactly 4(four) elements, not %d", a, len(a.To)) + } + + a.To.Append(bar) + a.To.Append(alice) + a.To.Append(foo) + a.To.Append(bob) + if len(a.To) != 8 { + t.Errorf("%T.To should have exactly 8(eight) elements, not %d", a, len(a.To)) + } + + a.RecipientsDeduplication() + if len(a.To) != 4 { + t.Errorf("%T.To should have exactly 4(four) elements, not %d", a, len(a.To)) + } + + b := ActivityNew("t", "test", nil) + + b.To.Append(bar) + b.To.Append(alice) + b.To.Append(foo) + b.To.Append(bob) + b.Bto.Append(bar) + b.Bto.Append(alice) + b.Bto.Append(foo) + b.Bto.Append(bob) + b.CC.Append(bar) + b.CC.Append(alice) + b.CC.Append(foo) + b.CC.Append(bob) + b.BCC.Append(bar) + b.BCC.Append(alice) + b.BCC.Append(foo) + b.BCC.Append(bob) + + b.RecipientsDeduplication() + if len(b.To) != 4 { + t.Errorf("%T.To should have exactly 4(four) elements, not %d", b, len(b.To)) + } + if len(b.Bto) != 0 { + t.Errorf("%T.Bto should have exactly 0(zero) elements, not %d", b, len(b.Bto)) + } + if len(b.CC) != 0 { + t.Errorf("%T.CC should have exactly 0(zero) elements, not %d", b, len(b.CC)) + } + if len(b.BCC) != 0 { + t.Errorf("%T.BCC should have exactly 0(zero) elements, not %d", b, len(b.BCC)) + } + } + + func TestBlockRecipientsDeduplication(t *testing.T) { + bob := PersonNew("bob") + alice := PersonNew("alice") + foo := OrganizationNew("foo") + bar := GroupNew("bar") + + a := BlockNew("bbb", bob) + + a.To.Append(bob) + a.To.Append(alice) + a.To.Append(foo) + a.To.Append(bar) + if len(a.To) != 4 { + t.Errorf("%T.To should have exactly 4(four) elements, not %d", a, len(a.To)) + } + + a.To.Append(bar) + a.To.Append(alice) + a.To.Append(foo) + a.To.Append(bob) + if len(a.To) != 8 { + t.Errorf("%T.To should have exactly 8(eight) elements, not %d", a, len(a.To)) + } + + a.RecipientsDeduplication() + if len(a.To) != 3 { + t.Errorf("%T.To should have exactly 3(four) elements, not %d", a, len(a.To)) + } + + b := BlockNew("t", bob) + + b.To.Append(bar) + b.To.Append(alice) + b.To.Append(foo) + b.To.Append(bob) + b.Bto.Append(bar) + b.Bto.Append(alice) + b.Bto.Append(foo) + b.Bto.Append(bob) + b.CC.Append(bar) + b.CC.Append(alice) + b.CC.Append(foo) + b.CC.Append(bob) + b.BCC.Append(bar) + b.BCC.Append(alice) + b.BCC.Append(foo) + b.BCC.Append(bob) + + b.RecipientsDeduplication() + if len(b.To) != 3 { + t.Errorf("%T.To should have exactly 4(four) elements, not %d", b, len(b.To)) + } + if len(b.Bto) != 0 { + t.Errorf("%T.Bto should have exactly 0(zero) elements, not %d", b, len(b.Bto)) + } + if len(b.CC) != 0 { + t.Errorf("%T.CC should have exactly 0(zero) elements, not %d", b, len(b.CC)) + } + if len(b.BCC) != 0 { + t.Errorf("%T.BCC should have exactly 0(zero) elements, not %d", b, len(b.BCC)) + } + } + + func TestIntransitiveActivityRecipientsDeduplication(t *testing.T) { + bob := PersonNew("bob") + alice := PersonNew("alice") + foo := OrganizationNew("foo") + bar := GroupNew("bar") + + a := IntransitiveActivityNew("test", "t") + + a.To.Append(bob) + a.To.Append(alice) + a.To.Append(foo) + a.To.Append(bar) + if len(a.To) != 4 { + t.Errorf("%T.To should have exactly 4(four) elements, not %d", a, len(a.To)) + } + + a.To.Append(bar) + a.To.Append(alice) + a.To.Append(foo) + a.To.Append(bob) + if len(a.To) != 8 { + t.Errorf("%T.To should have exactly 8(eight) elements, not %d", a, len(a.To)) + } + + a.RecipientsDeduplication() + if len(a.To) != 4 { + t.Errorf("%T.To should have exactly 4(four) elements, not %d", a, len(a.To)) + } + + b := ActivityNew("t", "test", nil) + + b.To.Append(bar) + b.To.Append(alice) + b.To.Append(foo) + b.To.Append(bob) + b.Bto.Append(bar) + b.Bto.Append(alice) + b.Bto.Append(foo) + b.Bto.Append(bob) + b.CC.Append(bar) + b.CC.Append(alice) + b.CC.Append(foo) + b.CC.Append(bob) + b.BCC.Append(bar) + b.BCC.Append(alice) + b.BCC.Append(foo) + b.BCC.Append(bob) + + b.RecipientsDeduplication() + if len(b.To) != 4 { + t.Errorf("%T.To should have exactly 4(four) elements, not %d", b, len(b.To)) + } + if len(b.Bto) != 0 { + t.Errorf("%T.Bto should have exactly 0(zero) elements, not %d", b, len(b.Bto)) + } + if len(b.CC) != 0 { + t.Errorf("%T.CC should have exactly 0(zero) elements, not %d", b, len(b.CC)) + } + if len(b.BCC) != 0 { + t.Errorf("%T.BCC should have exactly 0(zero) elements, not %d", b, len(b.BCC)) + } + }