Adding target to Add and Remove activity initializers

Implementing S2S#2 tests from https://test.activitypub.rocks/

S2S Server: Activities requiring the target property

src/activitypub/activity.go

@@ -235,9 +235,10 @@ func AcceptNew(id ObjectID, ob ObjectOrLink) *Accept {
 }
 
 // AddNew initializes an Add activity
-func AddNew(id ObjectID, ob ObjectOrLink) *Add {
+func AddNew(id ObjectID, ob ObjectOrLink, trgt ObjectOrLink) *Add {
 	a := ActivityNew(id, AddType, ob)
 	o := Add(*a)
+	o.Target = trgt
 	return &o
 }
 
@@ -368,9 +369,10 @@ func ReadNew(id ObjectID, ob ObjectOrLink) *Read {
 }
 
 // RemoveNew initializes a Remove activity
-func RemoveNew(id ObjectID, ob ObjectOrLink) *Remove {
+func RemoveNew(id ObjectID, ob ObjectOrLink, trgt ObjectOrLink) *Remove {
 	a := ActivityNew(id, RemoveType, ob)
 	o := Remove(*a)
+	o.Target = trgt
 	return &o
 }
 

src/activitypub/activity_test.go

@@ -84,7 +84,7 @@ func TestAcceptNew(t *testing.T) {
 func TestAddNew(t *testing.T) {
 	var testValue = ObjectID("test")
 
-	a := AddNew(testValue, nil)
+	a := AddNew(testValue, nil, nil)
 
 	if a.Id != testValue {
 		t.Errorf("Activity Id '%v' different than expected '%v'", a.Id, testValue)
@@ -344,7 +344,7 @@ func TestReadNew(t *testing.T) {
 func TestRemoveNew(t *testing.T) {
 	var testValue = ObjectID("test")
 
-	a := RemoveNew(testValue, nil)
+	a := RemoveNew(testValue, nil, nil)
 
 	if a.Id != testValue {
 		t.Errorf("Activity Id '%v' different than expected '%v'", a.Id, testValue)

tests/server_to_server_test.go

@@ -1,8 +1,6 @@
 package tests
 
-// The distribution of the following activities require that they contain the object property:
-// Create, Update, Delete, Follow, Add, Remove, Like, Block, Undo.
-//	Implementation always includes object property for each of the above supported activities
+// S2S tests from: https://test.activitypub.rocks/
 
 import (
 	"activitypub"
@@ -24,9 +22,21 @@ func testActivityHasObject(activity interface{}, obj LinkOrObject) error {
 }
 */
 
+func TestMain(m *testing.M) {
+	// call flag.Parse() here if TestMain uses flags
+	fmt.Println("starting")
+	status := m.Run()
+	fmt.Println("ending")
+	os.Exit(status)
+}
+
+// S2S Server: Activities requiring the object property
+// The distribution of the following activities require that they contain the object property:
+// Create, Update, Delete, Follow, Add, Remove, Like, Block, Undo.
+//	Implementation always includes object property for each of the above supported activities
 func TestObjectPropertyExistsForAdd(t *testing.T) {
 	obj := activitypub.MentionNew("gigel")
-	add := activitypub.AddNew("https://localhost/myactivity", obj)
+	add := activitypub.AddNew("https://localhost/myactivity", obj, nil)
 
 	if add.Object == nil {
 		t.Errorf("Missing Object in Add activity %#v", add.Object)
@@ -120,10 +130,30 @@ func TestObjectPropertyExistsForUndo(t *testing.T) {
 	}
 }
 
-func TestMain(m *testing.M) {
-	// call flag.Parse() here if TestMain uses flags
-	fmt.Println("starting")
-	status := m.Run()
-	fmt.Println("ending")
-	os.Exit(status)
+// S2S Server: Activities requiring the target property
+// The distribution of the following activities require that they contain the target property: Add, Remove.
+func TestTargetPropertyExistsForAdd(t *testing.T) {
+	obj := activitypub.MentionNew("foo")
+	target := activitypub.MentionNew("bar")
+	add := activitypub.AddNew("https://localhost/myactivity", obj, target)
+
+	if add.Target == nil {
+		t.Errorf("Missing Target in Add activity %#v", add.Target)
+	}
+	if add.Target != target {
+		t.Errorf("Add.Target different than what we initialized %#v %#v", add.Target, target)
+	}
+}
+
+func TestTargetPropertyExistsForRemove(t *testing.T) {
+	obj := activitypub.MentionNew("foo")
+	target := activitypub.MentionNew("bar")
+	remove := activitypub.RemoveNew("https://localhost/myactivity", obj, target)
+
+	if remove.Target == nil {
+		t.Errorf("Missing Target in Remove activity %#v", remove.Target)
+	}
+	if remove.Target != target {
+		t.Errorf("Remove.Target different than what we initialized %#v %#v", remove.Target, target)
+	}
 }