diff options
Diffstat (limited to 'src/pkg/container/vector/vector_test.go')
-rw-r--r-- | src/pkg/container/vector/vector_test.go | 112 |
1 files changed, 56 insertions, 56 deletions
diff --git a/src/pkg/container/vector/vector_test.go b/src/pkg/container/vector/vector_test.go index 3206c7fce..158b34479 100644 --- a/src/pkg/container/vector/vector_test.go +++ b/src/pkg/container/vector/vector_test.go @@ -10,7 +10,7 @@ package vector import "testing" -func TestZeroLenExp(t *testing.T) { +func TestZeroLen(t *testing.T) { a := new(Vector) if a.Len() != 0 { t.Errorf("%T: B1) expected 0, got %d", a, a.Len()) @@ -28,28 +28,28 @@ func TestZeroLenExp(t *testing.T) { } -func TestResizeExp(t *testing.T) { +func TestResize(t *testing.T) { var a Vector - checkSizeExp(t, &a, 0, 0) - checkSizeExp(t, a.Resize(0, 5), 0, 5) - checkSizeExp(t, a.Resize(1, 0), 1, 5) - checkSizeExp(t, a.Resize(10, 0), 10, 10) - checkSizeExp(t, a.Resize(5, 0), 5, 10) - checkSizeExp(t, a.Resize(3, 8), 3, 10) - checkSizeExp(t, a.Resize(0, 100), 0, 100) - checkSizeExp(t, a.Resize(11, 100), 11, 100) + checkSize(t, &a, 0, 0) + checkSize(t, a.Resize(0, 5), 0, 5) + checkSize(t, a.Resize(1, 0), 1, 5) + checkSize(t, a.Resize(10, 0), 10, 10) + checkSize(t, a.Resize(5, 0), 5, 10) + checkSize(t, a.Resize(3, 8), 3, 10) + checkSize(t, a.Resize(0, 100), 0, 100) + checkSize(t, a.Resize(11, 100), 11, 100) } -func TestResize2Exp(t *testing.T) { +func TestResize2(t *testing.T) { var a Vector - checkSizeExp(t, &a, 0, 0) + checkSize(t, &a, 0, 0) a.Push(int2Value(1)) a.Push(int2Value(2)) a.Push(int2Value(3)) a.Push(int2Value(4)) - checkSizeExp(t, &a, 4, 4) - checkSizeExp(t, a.Resize(10, 0), 10, 10) + checkSize(t, &a, 4, 4) + checkSize(t, a.Resize(10, 0), 10, 10) for i := 4; i < a.Len(); i++ { if a.At(i) != zero { t.Errorf("%T: expected a.At(%d) == %v; found %v!", a, i, zero, a.At(i)) @@ -63,7 +63,7 @@ func TestResize2Exp(t *testing.T) { } -func checkZeroExp(t *testing.T, a *Vector, i int) { +func checkZero(t *testing.T, a *Vector, i int) { for j := 0; j < i; j++ { if a.At(j) == zero { t.Errorf("%T: 1 expected a.At(%d) == %d; found %v", a, j, j, a.At(j)) @@ -83,45 +83,45 @@ func checkZeroExp(t *testing.T, a *Vector, i int) { } -func TestTrailingElementsExp(t *testing.T) { +func TestTrailingElements(t *testing.T) { var a Vector for i := 0; i < 10; i++ { a.Push(int2Value(i + 1)) } - checkZeroExp(t, &a, 10) - checkSizeExp(t, &a, 10, 16) - checkSizeExp(t, a.Resize(5, 0), 5, 16) - checkSizeExp(t, a.Resize(10, 0), 10, 16) - checkZeroExp(t, &a, 5) + checkZero(t, &a, 10) + checkSize(t, &a, 10, 16) + checkSize(t, a.Resize(5, 0), 5, 16) + checkSize(t, a.Resize(10, 0), 10, 16) + checkZero(t, &a, 5) } -func TestAccessExp(t *testing.T) { +func TestAccess(t *testing.T) { const n = 100 var a Vector a.Resize(n, 0) for i := 0; i < n; i++ { - a.Set(i, int2Value(valExp(i))) + a.Set(i, int2Value(val(i))) } for i := 0; i < n; i++ { - if elem2Value(a.At(i)) != int2Value(valExp(i)) { + if elem2Value(a.At(i)) != int2Value(val(i)) { t.Error(i) } } var b Vector b.Resize(n, 0) for i := 0; i < n; i++ { - b[i] = int2Value(valExp(i)) + b[i] = int2Value(val(i)) } for i := 0; i < n; i++ { - if elem2Value(b[i]) != int2Value(valExp(i)) { + if elem2Value(b[i]) != int2Value(val(i)) { t.Error(i) } } } -func TestInsertDeleteClearExp(t *testing.T) { +func TestInsertDeleteClear(t *testing.T) { const n = 100 var a Vector @@ -132,19 +132,19 @@ func TestInsertDeleteClearExp(t *testing.T) { if len(a) != i { t.Errorf("T%: A) wrong len() %d (expected %d)", a, len(a), i) } - a.Insert(0, int2Value(valExp(i))) - if elem2Value(a.Last()) != int2Value(valExp(0)) { + a.Insert(0, int2Value(val(i))) + if elem2Value(a.Last()) != int2Value(val(0)) { t.Error("T%: B", a) } } for i := n - 1; i >= 0; i-- { - if elem2Value(a.Last()) != int2Value(valExp(0)) { + if elem2Value(a.Last()) != int2Value(val(0)) { t.Error("T%: C", a) } - if elem2Value(a.At(0)) != int2Value(valExp(i)) { + if elem2Value(a.At(0)) != int2Value(val(i)) { t.Error("T%: D", a) } - if elem2Value(a[0]) != int2Value(valExp(i)) { + if elem2Value(a[0]) != int2Value(val(i)) { t.Error("T%: D2", a) } a.Delete(0) @@ -163,14 +163,14 @@ func TestInsertDeleteClearExp(t *testing.T) { t.Errorf("T%: F) wrong len() %d (expected 0)", a, len(a)) } for i := 0; i < n; i++ { - a.Push(int2Value(valExp(i))) + a.Push(int2Value(val(i))) if a.Len() != i+1 { t.Errorf("T%: G) wrong Len() %d (expected %d)", a, a.Len(), i+1) } if len(a) != i+1 { t.Errorf("T%: G) wrong len() %d (expected %d)", a, len(a), i+1) } - if elem2Value(a.Last()) != int2Value(valExp(i)) { + if elem2Value(a.Last()) != int2Value(val(i)) { t.Error("T%: H", a) } } @@ -186,7 +186,7 @@ func TestInsertDeleteClearExp(t *testing.T) { for j := 0; j < m; j++ { a.Push(int2Value(j)) for i := 0; i < n; i++ { - x := valExp(i) + x := val(i) a.Push(int2Value(x)) if elem2Value(a.Pop()) != int2Value(x) { t.Error("T%: J", a) @@ -208,7 +208,7 @@ func TestInsertDeleteClearExp(t *testing.T) { } -func verify_sliceExp(t *testing.T, x *Vector, elt, i, j int) { +func verify_slice(t *testing.T, x *Vector, elt, i, j int) { for k := i; k < j; k++ { if elem2Value(x.At(k)) != int2Value(elt) { t.Errorf("T%: M) wrong [%d] element %v (expected %v)", x, k, elem2Value(x.At(k)), int2Value(elt)) @@ -224,7 +224,7 @@ func verify_sliceExp(t *testing.T, x *Vector, elt, i, j int) { } -func verify_patternExp(t *testing.T, x *Vector, a, b, c int) { +func verify_pattern(t *testing.T, x *Vector, a, b, c int) { n := a + b + c if x.Len() != n { t.Errorf("T%: O) wrong Len() %d (expected %d)", x, x.Len(), n) @@ -232,13 +232,13 @@ func verify_patternExp(t *testing.T, x *Vector, a, b, c int) { if len(*x) != n { t.Errorf("T%: O) wrong len() %d (expected %d)", x, len(*x), n) } - verify_sliceExp(t, x, 0, 0, a) - verify_sliceExp(t, x, 1, a, a+b) - verify_sliceExp(t, x, 0, a+b, n) + verify_slice(t, x, 0, 0, a) + verify_slice(t, x, 1, a, a+b) + verify_slice(t, x, 0, a+b, n) } -func make_vectorExp(elt, len int) *Vector { +func make_vector(elt, len int) *Vector { x := new(Vector).Resize(len, 0) for i := 0; i < len; i++ { x.Set(i, int2Value(elt)) @@ -247,31 +247,31 @@ func make_vectorExp(elt, len int) *Vector { } -func TestInsertVectorExp(t *testing.T) { +func TestInsertVector(t *testing.T) { // 1 - a := make_vectorExp(0, 0) - b := make_vectorExp(1, 10) + a := make_vector(0, 0) + b := make_vector(1, 10) a.InsertVector(0, b) - verify_patternExp(t, a, 0, 10, 0) + verify_pattern(t, a, 0, 10, 0) // 2 - a = make_vectorExp(0, 10) - b = make_vectorExp(1, 0) + a = make_vector(0, 10) + b = make_vector(1, 0) a.InsertVector(5, b) - verify_patternExp(t, a, 5, 0, 5) + verify_pattern(t, a, 5, 0, 5) // 3 - a = make_vectorExp(0, 10) - b = make_vectorExp(1, 3) + a = make_vector(0, 10) + b = make_vector(1, 3) a.InsertVector(3, b) - verify_patternExp(t, a, 3, 3, 7) + verify_pattern(t, a, 3, 3, 7) // 4 - a = make_vectorExp(0, 10) - b = make_vectorExp(1, 1000) + a = make_vector(0, 10) + b = make_vector(1, 1000) a.InsertVector(8, b) - verify_patternExp(t, a, 8, 1000, 2) + verify_pattern(t, a, 8, 1000, 2) } -func TestDoExp(t *testing.T) { +func TestDo(t *testing.T) { const n = 25 const salt = 17 a := new(Vector).Resize(n, 0) @@ -326,7 +326,7 @@ func TestDoExp(t *testing.T) { } -func TestIterExp(t *testing.T) { +func TestIter(t *testing.T) { const Len = 100 x := new(Vector).Resize(Len, 0) for i := 0; i < Len; i++ { |