 baa93ec66e
			
		
	
	
	baa93ec66e
	
	
	
		
			
			This PR is part of https://codeberg.org/forgejo/forgejo/pulls/4767 filed by @algernon Validateable is enhanced for less duplication. ## Checklist The [contributor guide](https://forgejo.org/docs/next/contributor/) contains information that will be helpful to first time contributors. There also are a few [conditions for merging Pull Requests in Forgejo repositories](https://codeberg.org/forgejo/governance/src/branch/main/PullRequestsAgreement.md). You are also welcome to join the [Forgejo development chatroom](https://matrix.to/#/#forgejo-development:matrix.org). ### Tests - I added test coverage for Go changes... - [x] in their respective `*_test.go` for unit tests. ### Release notes - [x] I do not want this change to show in the release notes. - [ ] I want the title to show in the release notes with a link to this pull request. - [ ] I want the content of the `release-notes/<pull request number>.md` to be be used for the release notes instead of the title. Co-authored-by: zam <mirco.zachmann@meissa.de> Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/7714 Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org> Co-authored-by: Michael Jerger <michael.jerger@meissa-gmbh.de> Co-committed-by: Michael Jerger <michael.jerger@meissa-gmbh.de>
		
			
				
	
	
		
			165 lines
		
	
	
	
		
			5 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
			
		
		
	
	
			165 lines
		
	
	
	
		
			5 KiB
		
	
	
	
		
			Go
		
	
	
	
	
	
| // Copyright 2023, 2024 The Forgejo Authors. All rights reserved.
 | |
| // SPDX-License-Identifier: MIT
 | |
| 
 | |
| package forgefed
 | |
| 
 | |
| import (
 | |
| 	"errors"
 | |
| 	"reflect"
 | |
| 	"strings"
 | |
| 	"testing"
 | |
| 	"time"
 | |
| 
 | |
| 	"forgejo.org/modules/validation"
 | |
| 
 | |
| 	ap "github.com/go-ap/activitypub"
 | |
| )
 | |
| 
 | |
| func Test_NewForgeLike(t *testing.T) {
 | |
| 	want := []byte(`{"type":"Like","startTime":"2024-03-07T00:00:00Z","actor":"https://repo.prod.meissa.de/api/v1/activitypub/user-id/1","object":"https://codeberg.org/api/v1/activitypub/repository-id/1"}`)
 | |
| 
 | |
| 	actorIRI := "https://repo.prod.meissa.de/api/v1/activitypub/user-id/1"
 | |
| 	objectIRI := "https://codeberg.org/api/v1/activitypub/repository-id/1"
 | |
| 	startTime, _ := time.Parse("2006-Jan-02", "2024-Mar-07")
 | |
| 	sut, err := NewForgeLike(actorIRI, objectIRI, startTime)
 | |
| 	if err != nil {
 | |
| 		t.Errorf("unexpected error: %v\n", err)
 | |
| 	}
 | |
| 	if valid, _ := validation.IsValid(sut); !valid {
 | |
| 		t.Errorf("sut expected to be valid: %v\n", sut.Validate())
 | |
| 	}
 | |
| 
 | |
| 	got, err := sut.MarshalJSON()
 | |
| 	if err != nil {
 | |
| 		t.Errorf("MarshalJSON() error = \"%v\"", err)
 | |
| 		return
 | |
| 	}
 | |
| 	if !reflect.DeepEqual(got, want) {
 | |
| 		t.Errorf("MarshalJSON() got = %q, want %q", got, want)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func Test_LikeMarshalJSON(t *testing.T) {
 | |
| 	type testPair struct {
 | |
| 		item    ForgeLike
 | |
| 		want    []byte
 | |
| 		wantErr error
 | |
| 	}
 | |
| 
 | |
| 	tests := map[string]testPair{
 | |
| 		"empty": {
 | |
| 			item: ForgeLike{},
 | |
| 			want: nil,
 | |
| 		},
 | |
| 		"with ID": {
 | |
| 			item: ForgeLike{
 | |
| 				Activity: ap.Activity{
 | |
| 					Actor:  ap.IRI("https://repo.prod.meissa.de/api/v1/activitypub/user-id/1"),
 | |
| 					Type:   "Like",
 | |
| 					Object: ap.IRI("https://codeberg.org/api/v1/activitypub/repository-id/1"),
 | |
| 				},
 | |
| 			},
 | |
| 			want: []byte(`{"type":"Like","actor":"https://repo.prod.meissa.de/api/v1/activitypub/user-id/1","object":"https://codeberg.org/api/v1/activitypub/repository-id/1"}`),
 | |
| 		},
 | |
| 	}
 | |
| 
 | |
| 	for name, tt := range tests {
 | |
| 		t.Run(name, func(t *testing.T) {
 | |
| 			got, err := tt.item.MarshalJSON()
 | |
| 			if (err != nil || tt.wantErr != nil) && tt.wantErr.Error() != err.Error() {
 | |
| 				t.Errorf("MarshalJSON() error = \"%v\", wantErr \"%v\"", err, tt.wantErr)
 | |
| 				return
 | |
| 			}
 | |
| 			if !reflect.DeepEqual(got, tt.want) {
 | |
| 				t.Errorf("MarshalJSON() got = %q, want %q", got, tt.want)
 | |
| 			}
 | |
| 		})
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func Test_LikeUnmarshalJSON(t *testing.T) {
 | |
| 	type testPair struct {
 | |
| 		item    []byte
 | |
| 		want    *ForgeLike
 | |
| 		wantErr error
 | |
| 	}
 | |
| 
 | |
| 	tests := map[string]testPair{
 | |
| 		"with ID": {
 | |
| 			item: []byte(`{"type":"Like","actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1","object":"https://codeberg.org/api/activitypub/repository-id/1"}`),
 | |
| 			want: &ForgeLike{
 | |
| 				Activity: ap.Activity{
 | |
| 					Actor:  ap.IRI("https://repo.prod.meissa.de/api/activitypub/user-id/1"),
 | |
| 					Type:   "Like",
 | |
| 					Object: ap.IRI("https://codeberg.org/api/activitypub/repository-id/1"),
 | |
| 				},
 | |
| 			},
 | |
| 			wantErr: nil,
 | |
| 		},
 | |
| 		"invalid": {
 | |
| 			item:    []byte(`{"type":"Invalid","actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1","object":"https://codeberg.org/api/activitypub/repository-id/1"`),
 | |
| 			want:    &ForgeLike{},
 | |
| 			wantErr: errors.New("cannot parse JSON"),
 | |
| 		},
 | |
| 	}
 | |
| 
 | |
| 	for name, test := range tests {
 | |
| 		t.Run(name, func(t *testing.T) {
 | |
| 			got := new(ForgeLike)
 | |
| 			err := got.UnmarshalJSON(test.item)
 | |
| 			if (err != nil || test.wantErr != nil) && !strings.Contains(err.Error(), test.wantErr.Error()) {
 | |
| 				t.Errorf("UnmarshalJSON() error = \"%v\", wantErr \"%v\"", err, test.wantErr)
 | |
| 				return
 | |
| 			}
 | |
| 			if !reflect.DeepEqual(got, test.want) {
 | |
| 				t.Errorf("UnmarshalJSON() got = %q, want %q, err %q", got, test.want, err.Error())
 | |
| 			}
 | |
| 		})
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func Test_ForgeLikeValidation(t *testing.T) {
 | |
| 	// Successful
 | |
| 
 | |
| 	sut := new(ForgeLike)
 | |
| 	sut.UnmarshalJSON([]byte(`{"type":"Like",
 | |
| 	"actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1",
 | |
| 	"object":"https://codeberg.org/api/activitypub/repository-id/1",
 | |
| 	"startTime": "2014-12-31T23:00:00-08:00"}`))
 | |
| 	if res, _ := validation.IsValid(sut); !res {
 | |
| 		t.Errorf("sut expected to be valid: %v\n", sut.Validate())
 | |
| 	}
 | |
| 
 | |
| 	// Errors
 | |
| 
 | |
| 	sut.UnmarshalJSON([]byte(`{"actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1",
 | |
| 	"object":"https://codeberg.org/api/activitypub/repository-id/1",
 | |
| 	"startTime": "2014-12-31T23:00:00-08:00"}`))
 | |
| 	if err := validateAndCheckError(sut, "type should not be empty"); err != nil {
 | |
| 		t.Error(err)
 | |
| 	}
 | |
| 
 | |
| 	sut.UnmarshalJSON([]byte(`{"type":"bad-type",
 | |
| 		"actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1",
 | |
| 	"object":"https://codeberg.org/api/activitypub/repository-id/1",
 | |
| 	"startTime": "2014-12-31T23:00:00-08:00"}`))
 | |
| 	if err := validateAndCheckError(sut, "Field type contains the value bad-type, which is not in allowed subset [Like]"); err != nil {
 | |
| 		t.Error(err)
 | |
| 	}
 | |
| 
 | |
| 	sut.UnmarshalJSON([]byte(`{"type":"Like",
 | |
| 		"actor":"https://repo.prod.meissa.de/api/activitypub/user-id/1",
 | |
| 	  "object":"https://codeberg.org/api/activitypub/repository-id/1",
 | |
| 	  "startTime": "not a date"}`))
 | |
| 	if err := validateAndCheckError(sut, "StartTime was invalid."); err != nil {
 | |
| 		t.Error(err)
 | |
| 	}
 | |
| }
 | |
| 
 | |
| func TestActivityValidation_Attack(t *testing.T) {
 | |
| 	sut := new(ForgeLike)
 | |
| 	sut.UnmarshalJSON([]byte(`{rubbish}`))
 | |
| 	if len(sut.Validate()) != 5 {
 | |
| 		t.Errorf("5 validation errors expected but was: %v\n", len(sut.Validate()))
 | |
| 	}
 | |
| }
 |