Skip to content

Commit

Permalink
fix: fix Go tests
Browse files Browse the repository at this point in the history
  • Loading branch information
PascalinDe committed Nov 21, 2023
1 parent a4b1645 commit f0f5ec7
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 22 deletions.
38 changes: 19 additions & 19 deletions contracts/evoting/types/ballots_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,29 +56,29 @@ func TestBallot_Unmarshal(t *testing.T) {

Selects: []Select{{
ID: decodedQuestionID(1),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 2,
MinN: 2,
Choices: make([]string, 3),
}, {
ID: decodedQuestionID(2),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 3,
MinN: 3,
Choices: make([]string, 5),
}},

Ranks: []Rank{{
ID: decodedQuestionID(3),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 4,
MinN: 0,
Choices: make([]string, 4),
}},

Texts: []Text{{
ID: decodedQuestionID(4),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 2,
MinN: 2,
MaxLength: 10,
Expand Down Expand Up @@ -305,7 +305,7 @@ func TestSubject_MaxEncodedSize(t *testing.T) {
subject := Subject{
Subjects: []Subject{{
ID: "",
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
Order: nil,
Subjects: []Subject{},
Selects: []Select{},
Expand All @@ -315,37 +315,37 @@ func TestSubject_MaxEncodedSize(t *testing.T) {

Selects: []Select{{
ID: encodedQuestionID(1),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 3,
MinN: 0,
Choices: make([]string, 3),
}, {
ID: encodedQuestionID(2),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 5,
MinN: 0,
Choices: make([]string, 5),
}},

Ranks: []Rank{{
ID: encodedQuestionID(3),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 4,
MinN: 0,
Choices: make([]string, 4),
}},

Texts: []Text{{
ID: encodedQuestionID(4),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 2,
MinN: 0,
MaxLength: 10,
Regex: "",
Choices: make([]string, 2),
}, {
ID: encodedQuestionID(5),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 1,
MinN: 0,
MaxLength: 10,
Expand All @@ -355,7 +355,7 @@ func TestSubject_MaxEncodedSize(t *testing.T) {
}

conf := Configuration{
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
Scaffold: []Subject{subject},
}

Expand All @@ -368,7 +368,7 @@ func TestSubject_MaxEncodedSize(t *testing.T) {
func TestSubject_IsValid(t *testing.T) {
mainSubject := &Subject{
ID: ID(base64.StdEncoding.EncodeToString([]byte("S1"))),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
Order: []ID{},
Subjects: []Subject{},
Selects: []Select{},
Expand All @@ -378,7 +378,7 @@ func TestSubject_IsValid(t *testing.T) {

subSubject := &Subject{
ID: ID(base64.StdEncoding.EncodeToString([]byte("S2"))),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
Order: []ID{},
Subjects: []Subject{},
Selects: []Select{},
Expand All @@ -387,7 +387,7 @@ func TestSubject_IsValid(t *testing.T) {
}

configuration := Configuration{
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
Scaffold: []Subject{*mainSubject, *subSubject},
}

Expand All @@ -400,15 +400,15 @@ func TestSubject_IsValid(t *testing.T) {

mainSubject.Selects = []Select{{
ID: encodedQuestionID(1),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 0,
MinN: 0,
Choices: make([]string, 0),
}}

mainSubject.Ranks = []Rank{{
ID: encodedQuestionID(1),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 0,
MinN: 0,
Choices: make([]string, 0),
Expand All @@ -423,7 +423,7 @@ func TestSubject_IsValid(t *testing.T) {

mainSubject.Ranks[0] = Rank{
ID: encodedQuestionID(2),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 0,
MinN: 2,
Choices: make([]string, 0),
Expand All @@ -439,7 +439,7 @@ func TestSubject_IsValid(t *testing.T) {
mainSubject.Ranks = []Rank{}
mainSubject.Selects[0] = Select{
ID: encodedQuestionID(1),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 1,
MinN: 0,
Choices: make([]string, 0),
Expand All @@ -455,7 +455,7 @@ func TestSubject_IsValid(t *testing.T) {
mainSubject.Selects = []Select{}
mainSubject.Texts = []Text{{
ID: encodedQuestionID(3),
Title: {En: "", Fr: "", De: ""},
Title: Title{En: "", Fr: "", De: ""},
MaxN: 2,
MinN: 4,
MaxLength: 0,
Expand Down
6 changes: 3 additions & 3 deletions integration/performance_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func BenchmarkIntegration_CustomVotesScenario(b *testing.B) {
}

// ##### CREATE FORM #####
formID, err := createFormNChunks(m, "Three votes form", adminID, numChunksPerBallot)
formID, err := createFormNChunks(m, types.Title{En: "Three votes form", Fr: "", De: ""}, adminID, numChunksPerBallot)
require.NoError(b, err)

time.Sleep(time.Millisecond * 1000)
Expand Down Expand Up @@ -157,14 +157,14 @@ func createFormNChunks(m txManager, title types.Title, admin string, numChunks i
Scaffold: []types.Subject{
{
ID: "aa",
Title: {En: "subject1", Fr: "", De: ""},
Title: types.Title{En: "subject1", Fr: "", De: ""},
Order: nil,
Subjects: nil,
Selects: nil,
Ranks: []types.Rank{},
Texts: []types.Text{{
ID: "bb",
Title: {En: "Enter favorite snack", Fr: "", De: ""},
Title: types.Title{En: "Enter favorite snack", Fr: "", De: ""},
MaxN: 1,
MinN: 0,
MaxLength: uint(base64.StdEncoding.DecodedLen(textSize)),
Expand Down

0 comments on commit f0f5ec7

Please sign in to comment.