Skip to content

Commit 83cb1f9

Browse files
logic-buildinglogic-building
authored
Merge pull request #115 from logic-building/option-set-generated-code
Added functionality to auto generate set functions such join, differe…
2 parents dcf8d44 + 479ada5 commit 83cb1f9

18 files changed

+1134
-89
lines changed

‎fp/difference_test.go‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func TestDifferenceInt(t *testing.T) {
2727
list1 := []int{v8, v2, v1, v1, v2, v8}
2828
list2 := []int{v8}
2929
actual = DifferenceInt(list1, list2)
30-
if len(actual) != 2 || !ExistsInt(v2, actual) || !ExistsInt(v1, actual){
30+
if len(actual) != 2 || !ExistsInt(v2, actual) || !ExistsInt(v1, actual) {
3131
t.Errorf("DifferenceInt failed. Expected=%v, actual=%v", expected, actual)
3232
}
3333

@@ -72,7 +72,7 @@ func TestDifferenceInt64(t *testing.T) {
7272
list1 := []int64{v8, v2, v1, v1, v2, v8}
7373
list2 := []int64{v8}
7474
actual = DifferenceInt64(list1, list2)
75-
if len(actual) != 2 || !ExistsInt64(v2, actual) || !ExistsInt64(v1, actual){
75+
if len(actual) != 2 || !ExistsInt64(v2, actual) || !ExistsInt64(v1, actual) {
7676
t.Errorf("DifferenceInt64 failed. Expected=%v, actual=%v", expected, actual)
7777
}
7878

@@ -117,7 +117,7 @@ func TestDifferenceInt32(t *testing.T) {
117117
list1 := []int32{v8, v2, v1, v1, v2, v8}
118118
list2 := []int32{v8}
119119
actual = DifferenceInt32(list1, list2)
120-
if len(actual) != 2 || !ExistsInt32(v2, actual) || !ExistsInt32(v1, actual){
120+
if len(actual) != 2 || !ExistsInt32(v2, actual) || !ExistsInt32(v1, actual) {
121121
t.Errorf("DifferenceInt32 failed. Expected=%v, actual=%v", expected, actual)
122122
}
123123

@@ -162,7 +162,7 @@ func TestDifferenceInt16(t *testing.T) {
162162
list1 := []int16{v8, v2, v1, v1, v2, v8}
163163
list2 := []int16{v8}
164164
actual = DifferenceInt16(list1, list2)
165-
if len(actual) != 2 || !ExistsInt16(v2, actual) || !ExistsInt16(v1, actual){
165+
if len(actual) != 2 || !ExistsInt16(v2, actual) || !ExistsInt16(v1, actual) {
166166
t.Errorf("DifferenceInt16 failed. Expected=%v, actual=%v", expected, actual)
167167
}
168168

@@ -207,7 +207,7 @@ func TestDifferenceInt8(t *testing.T) {
207207
list1 := []int8{v8, v2, v1, v1, v2, v8}
208208
list2 := []int8{v8}
209209
actual = DifferenceInt8(list1, list2)
210-
if len(actual) != 2 || !ExistsInt8(v2, actual) || !ExistsInt8(v1, actual){
210+
if len(actual) != 2 || !ExistsInt8(v2, actual) || !ExistsInt8(v1, actual) {
211211
t.Errorf("DifferenceInt8 failed. Expected=%v, actual=%v", expected, actual)
212212
}
213213

@@ -252,7 +252,7 @@ func TestDifferenceUint(t *testing.T) {
252252
list1 := []uint{v8, v2, v1, v1, v2, v8}
253253
list2 := []uint{v8}
254254
actual = DifferenceUint(list1, list2)
255-
if len(actual) != 2 || !ExistsUint(v2, actual) || !ExistsUint(v1, actual){
255+
if len(actual) != 2 || !ExistsUint(v2, actual) || !ExistsUint(v1, actual) {
256256
t.Errorf("DifferenceUint failed. Expected=%v, actual=%v", expected, actual)
257257
}
258258

@@ -297,7 +297,7 @@ func TestDifferenceUint64(t *testing.T) {
297297
list1 := []uint64{v8, v2, v1, v1, v2, v8}
298298
list2 := []uint64{v8}
299299
actual = DifferenceUint64(list1, list2)
300-
if len(actual) != 2 || !ExistsUint64(v2, actual) || !ExistsUint64(v1, actual){
300+
if len(actual) != 2 || !ExistsUint64(v2, actual) || !ExistsUint64(v1, actual) {
301301
t.Errorf("DifferenceUint64 failed. Expected=%v, actual=%v", expected, actual)
302302
}
303303

@@ -342,7 +342,7 @@ func TestDifferenceUint32(t *testing.T) {
342342
list1 := []uint32{v8, v2, v1, v1, v2, v8}
343343
list2 := []uint32{v8}
344344
actual = DifferenceUint32(list1, list2)
345-
if len(actual) != 2 || !ExistsUint32(v2, actual) || !ExistsUint32(v1, actual){
345+
if len(actual) != 2 || !ExistsUint32(v2, actual) || !ExistsUint32(v1, actual) {
346346
t.Errorf("DifferenceUint32 failed. Expected=%v, actual=%v", expected, actual)
347347
}
348348

@@ -387,7 +387,7 @@ func TestDifferenceUint16(t *testing.T) {
387387
list1 := []uint16{v8, v2, v1, v1, v2, v8}
388388
list2 := []uint16{v8}
389389
actual = DifferenceUint16(list1, list2)
390-
if len(actual) != 2 || !ExistsUint16(v2, actual) || !ExistsUint16(v1, actual){
390+
if len(actual) != 2 || !ExistsUint16(v2, actual) || !ExistsUint16(v1, actual) {
391391
t.Errorf("DifferenceUint16 failed. Expected=%v, actual=%v", expected, actual)
392392
}
393393

@@ -432,7 +432,7 @@ func TestDifferenceUint8(t *testing.T) {
432432
list1 := []uint8{v8, v2, v1, v1, v2, v8}
433433
list2 := []uint8{v8}
434434
actual = DifferenceUint8(list1, list2)
435-
if len(actual) != 2 || !ExistsUint8(v2, actual) || !ExistsUint8(v1, actual){
435+
if len(actual) != 2 || !ExistsUint8(v2, actual) || !ExistsUint8(v1, actual) {
436436
t.Errorf("DifferenceUint8 failed. Expected=%v, actual=%v", expected, actual)
437437
}
438438

@@ -477,7 +477,7 @@ func TestDifferenceStr(t *testing.T) {
477477
list1 := []string{v8, v2, v1, v1, v2, v8}
478478
list2 := []string{v8}
479479
actual = DifferenceStr(list1, list2)
480-
if len(actual) != 2 || !ExistsStr(v2, actual) || !ExistsStr(v1, actual){
480+
if len(actual) != 2 || !ExistsStr(v2, actual) || !ExistsStr(v1, actual) {
481481
t.Errorf("DifferenceStr failed. Expected=%v, actual=%v", expected, actual)
482482
}
483483

@@ -567,7 +567,7 @@ func TestDifferenceFloat32(t *testing.T) {
567567
list1 := []float32{v8, v2, v1, v1, v2, v8}
568568
list2 := []float32{v8}
569569
actual = DifferenceFloat32(list1, list2)
570-
if len(actual) != 2 || !ExistsFloat32(v2, actual) || !ExistsFloat32(v1, actual){
570+
if len(actual) != 2 || !ExistsFloat32(v2, actual) || !ExistsFloat32(v1, actual) {
571571
t.Errorf("DifferenceFloat32 failed. Expected=%v, actual=%v", expected, actual)
572572
}
573573

@@ -612,7 +612,7 @@ func TestDifferenceFloat64(t *testing.T) {
612612
list1 := []float64{v8, v2, v1, v1, v2, v8}
613613
list2 := []float64{v8}
614614
actual = DifferenceFloat64(list1, list2)
615-
if len(actual) != 2 || !ExistsFloat64(v2, actual) || !ExistsFloat64(v1, actual){
615+
if len(actual) != 2 || !ExistsFloat64(v2, actual) || !ExistsFloat64(v1, actual) {
616616
t.Errorf("DifferenceFloat64 failed. Expected=%v, actual=%v", expected, actual)
617617
}
618618

‎fp/sort_test.go‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,11 @@ func TestSortInt64DescPtr(t *testing.T) {
7676
for i, val := range sortedList {
7777
if *val != *expectedList[i] {
7878
for _, val := range expectedList {
79-
t.Errorf("expected item: %v", *val)
79+
t.Errorf("expected item: %v", *val)
8080
}
8181

8282
for _, val := range sortedList {
83-
t.Errorf("sorted item: %v", *val)
83+
t.Errorf("sorted item: %v", *val)
8484
}
8585
t.Errorf("Sotredint64s failed")
8686
}
@@ -161,11 +161,11 @@ func TestSortInt32DescPtr(t *testing.T) {
161161
for i, val := range sortedList {
162162
if *val != *expectedList[i] {
163163
for _, val := range expectedList {
164-
t.Errorf("expected item: %v", *val)
164+
t.Errorf("expected item: %v", *val)
165165
}
166166

167167
for _, val := range sortedList {
168-
t.Errorf("sorted item: %v", *val)
168+
t.Errorf("sorted item: %v", *val)
169169
}
170170
t.Errorf("Sotredint32s failed")
171171
}
@@ -246,11 +246,11 @@ func TestSortInt16DescPtr(t *testing.T) {
246246
for i, val := range sortedList {
247247
if *val != *expectedList[i] {
248248
for _, val := range expectedList {
249-
t.Errorf("expected item: %v", *val)
249+
t.Errorf("expected item: %v", *val)
250250
}
251251

252252
for _, val := range sortedList {
253-
t.Errorf("sorted item: %v", *val)
253+
t.Errorf("sorted item: %v", *val)
254254
}
255255
t.Errorf("Sotredint16s failed")
256256
}
@@ -331,11 +331,11 @@ func TestSortInt8DescPtr(t *testing.T) {
331331
for i, val := range sortedList {
332332
if *val != *expectedList[i] {
333333
for _, val := range expectedList {
334-
t.Errorf("expected item: %v", *val)
334+
t.Errorf("expected item: %v", *val)
335335
}
336336

337337
for _, val := range sortedList {
338-
t.Errorf("sorted item: %v", *val)
338+
t.Errorf("sorted item: %v", *val)
339339
}
340340
t.Errorf("Sotredint8s failed")
341341
}
@@ -416,11 +416,11 @@ func TestSortUintDescPtr(t *testing.T) {
416416
for i, val := range sortedList {
417417
if *val != *expectedList[i] {
418418
for _, val := range expectedList {
419-
t.Errorf("expected item: %v", *val)
419+
t.Errorf("expected item: %v", *val)
420420
}
421421

422422
for _, val := range sortedList {
423-
t.Errorf("sorted item: %v", *val)
423+
t.Errorf("sorted item: %v", *val)
424424
}
425425
t.Errorf("Sotreduints failed")
426426
}
@@ -501,11 +501,11 @@ func TestSortUint64DescPtr(t *testing.T) {
501501
for i, val := range sortedList {
502502
if *val != *expectedList[i] {
503503
for _, val := range expectedList {
504-
t.Errorf("expected item: %v", *val)
504+
t.Errorf("expected item: %v", *val)
505505
}
506506

507507
for _, val := range sortedList {
508-
t.Errorf("sorted item: %v", *val)
508+
t.Errorf("sorted item: %v", *val)
509509
}
510510
t.Errorf("Sotreduint64s failed")
511511
}
@@ -586,11 +586,11 @@ func TestSortUint32DescPtr(t *testing.T) {
586586
for i, val := range sortedList {
587587
if *val != *expectedList[i] {
588588
for _, val := range expectedList {
589-
t.Errorf("expected item: %v", *val)
589+
t.Errorf("expected item: %v", *val)
590590
}
591591

592592
for _, val := range sortedList {
593-
t.Errorf("sorted item: %v", *val)
593+
t.Errorf("sorted item: %v", *val)
594594
}
595595
t.Errorf("Sotreduint32s failed")
596596
}
@@ -671,11 +671,11 @@ func TestSortUint16DescPtr(t *testing.T) {
671671
for i, val := range sortedList {
672672
if *val != *expectedList[i] {
673673
for _, val := range expectedList {
674-
t.Errorf("expected item: %v", *val)
674+
t.Errorf("expected item: %v", *val)
675675
}
676676

677677
for _, val := range sortedList {
678-
t.Errorf("sorted item: %v", *val)
678+
t.Errorf("sorted item: %v", *val)
679679
}
680680
t.Errorf("Sotreduint16s failed")
681681
}
@@ -756,11 +756,11 @@ func TestSortUint8DescPtr(t *testing.T) {
756756
for i, val := range sortedList {
757757
if *val != *expectedList[i] {
758758
for _, val := range expectedList {
759-
t.Errorf("expected item: %v", *val)
759+
t.Errorf("expected item: %v", *val)
760760
}
761761

762762
for _, val := range sortedList {
763-
t.Errorf("sorted item: %v", *val)
763+
t.Errorf("sorted item: %v", *val)
764764
}
765765
t.Errorf("Sotreduint8s failed")
766766
}
@@ -841,11 +841,11 @@ func TestSortFloat32DescPtr(t *testing.T) {
841841
for i, val := range sortedList {
842842
if *val != *expectedList[i] {
843843
for _, val := range expectedList {
844-
t.Errorf("expected item: %v", *val)
844+
t.Errorf("expected item: %v", *val)
845845
}
846846

847847
for _, val := range sortedList {
848-
t.Errorf("sorted item: %v", *val)
848+
t.Errorf("sorted item: %v", *val)
849849
}
850850
t.Errorf("Sotredfloat32s failed")
851851
}

‎fp/sortfloats_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ func TestSortFloat64Ptr(t *testing.T) {
3434
if *val != *expectedList[i] {
3535
t.Errorf("Sotredfloat64s failed")
3636
for _, val := range expectedList {
37-
t.Errorf("expected item: %v", *val)
37+
t.Errorf("expected item: %v", *val)
3838
}
3939

4040
for _, val := range sortedList {
41-
t.Errorf("sorted item: %v", *val)
41+
t.Errorf("sorted item: %v", *val)
4242
}
4343
}
4444
}

‎fp/sortints_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ func TestSortIntPtr(t *testing.T) {
3434
if *val != *expectedList[i] {
3535
t.Errorf("Sotredints failed")
3636
for _, val := range expectedList {
37-
t.Errorf("expected item: %v", *val)
37+
t.Errorf("expected item: %v", *val)
3838
}
3939

4040
for _, val := range sortedList {
41-
t.Errorf("sorted item: %v", *val)
41+
t.Errorf("sorted item: %v", *val)
4242
}
4343
}
4444
}

‎fp/sortstrs_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@ func TestSortStrPtr(t *testing.T) {
3434
if *val != *expectedList[i] {
3535
t.Errorf("Sotredstrings failed")
3636
for _, val := range expectedList {
37-
t.Errorf("expected item: %v", *val)
37+
t.Errorf("expected item: %v", *val)
3838
}
3939

4040
for _, val := range sortedList {
41-
t.Errorf("sorted item: %v", *val)
41+
t.Errorf("sorted item: %v", *val)
4242
}
4343
}
4444
}
@@ -77,11 +77,11 @@ func TestSortStrDescPtr(t *testing.T) {
7777
if *val != *expectedList[i] {
7878
t.Errorf("Sotredstrings failed")
7979
for _, val := range expectedList {
80-
t.Errorf("expected item: %v", *val)
80+
t.Errorf("expected item: %v", *val)
8181
}
8282

8383
for _, val := range sortedList {
84-
t.Errorf("sorted item: %v", *val)
84+
t.Errorf("sorted item: %v", *val)
8585
}
8686
}
8787
}

0 commit comments

Comments
 (0)