Name and order the build queue code

[onechat] / view_test.go

diff --git a/view_test.go b/view_test.go
index 201483e8c79d966d6782aa5a7c0ced7dca96d02a..7184f8c7b2c89cab9d6139567916dfc071fccfea 100644 (file)
--- a/view_test.go
+++ b/view_test.go
@@ -9,11 +9,11 @@ import (
 )
 
 func TestViewMergesInTheOrderOfTheRollbackPush(t *testing.T) {
 )
 
 func TestViewMergesInTheOrderOfTheRollbackPush(t *testing.T) {

-       tree := builtTree{}
+       tree := ViewBuiltTree{}

        view := newView(0, 0)
        view := newView(0, 0)

-       var states *pushEntry
+       var states *ViewPushEntry

        for tick := range 20001 {
        for tick := range 20001 {

-               states = push(tick, states)
+               states = viewPush(tick, states)

                starts := states.starts()
                view.high = len(starts)
                view.low = len(starts)
                starts := states.starts()
                view.high = len(starts)
                view.low = len(starts)


@@ -30,7 +30,7 @@ func TestViewMergesInTheOrderOfTheRollbackPush(t *testing.T) {
 }
 
 func TestViewMergesInOneBatchFromHighToLow(t *testing.T) {
 }
 
 func TestViewMergesInOneBatchFromHighToLow(t *testing.T) {

-       tree := builtTree{}
+       tree := ViewBuiltTree{}

        view := newView(10, 5)
        sizes := make([]int, 0, 20)
        for range 20 {
        view := newView(10, 5)
        sizes := make([]int, 0, 20)
        for range 20 {


@@ -43,7 +43,7 @@ func TestViewMergesInOneBatchFromHighToLow(t *testing.T) {
 }
 
 func TestViewMergesOnlyBuiltParents(t *testing.T) {
 }
 
 func TestViewMergesOnlyBuiltParents(t *testing.T) {

-       tree := partTree{
+       tree := ViewPartTree{

                sizes: map[nodeKey]int{
                        {0, 0}: 1,
                        {0, 1}: 1,
                sizes: map[nodeKey]int{
                        {0, 0}: 1,
                        {0, 1}: 1,


@@ -79,7 +79,7 @@ func TestViewMergesOnlyBuiltParents(t *testing.T) {
 }
 
 func TestViewRendersPendingLinesWithoutTheirMessage(t *testing.T) {
 }
 
 func TestViewRendersPendingLinesWithoutTheirMessage(t *testing.T) {

-       tree := partTree{
+       tree := ViewPartTree{

                sizes: map[nodeKey]int{
                        {0, 0}: 3,
                        {0, 1}: 3,
                sizes: map[nodeKey]int{
                        {0, 0}: 3,
                        {0, 1}: 3,


@@ -87,36 +87,36 @@ func TestViewRendersPendingLinesWithoutTheirMessage(t *testing.T) {
                },
        }
 
                },
        }
 

-       view, err := restoreView(viewState{
+       view, err := restoreView(ViewState{

                Lines: [][2]int{{1, 0}, {0, 2}},
                Lines: [][2]int{{1, 0}, {0, 2}},

-       }, chatHigh, chatLow, tree)
+       }, viewChatHigh, viewChatLow, tree)

        require.NoError(t, err)
        require.NoError(t, err)

-       require.Equal(t, "<chat>\n0+2|aaa aaa\n2+1|"+pending+"\n</chat>", view.Render())
-       require.Equal(t, 7+len(pending), view.Size())
+       require.Equal(t, "<chat>\n0+2|aaa aaa\n2+1|"+viewPending+"\n</chat>", view.Render())
+       require.Equal(t, 7+len(viewPending), view.Size())

 }
 
 func TestViewCoarsenTakesTheCoarserLines(t *testing.T) {
 }
 
 func TestViewCoarsenTakesTheCoarserLines(t *testing.T) {

-       view, err := restoreView(viewState{
+       view, err := restoreView(ViewState{

                Lines: [][2]int{{1, 0}, {0, 2}, {0, 3}, {0, 4}, {0, 5}},
                Lines: [][2]int{{1, 0}, {0, 2}, {0, 3}, {0, 4}, {0, 5}},

-       }, 100, 100, builtTree{})
+       }, 100, 100, ViewBuiltTree{})

        require.NoError(t, err)
 
        require.NoError(t, err)
 

-       other, err := restoreView(viewState{
+       other, err := restoreView(ViewState{

                Lines: [][2]int{{0, 0}, {0, 1}, {1, 1}, {0, 4}, {0, 5}},
                Lines: [][2]int{{0, 0}, {0, 1}, {1, 1}, {0, 4}, {0, 5}},

-       }, 100, 100, builtTree{})
+       }, 100, 100, ViewBuiltTree{})

        require.NoError(t, err)
 
        require.NoError(t, err)
 

-       require.NoError(t, view.Coarsen(other, builtTree{}))
+       require.NoError(t, view.Coarsen(other, ViewBuiltTree{}))

        require.Equal(t, []nodeKey{{1, 0}, {1, 1}, {0, 4}, {0, 5}}, view.lines)
 
        view.low = 2
        require.Equal(t, []nodeKey{{1, 0}, {1, 1}, {0, 4}, {0, 5}}, view.lines)
 
        view.low = 2

-       require.NoError(t, view.Coarsen(other, builtTree{}))
+       require.NoError(t, view.Coarsen(other, ViewBuiltTree{}))

        require.Equal(t, []nodeKey{{2, 0}, {1, 2}}, view.lines)
        require.False(t, view.merging)
 }
 
 func TestViewContextStopsAtTheFirstPendingLine(t *testing.T) {
        require.Equal(t, []nodeKey{{2, 0}, {1, 2}}, view.lines)
        require.False(t, view.merging)
 }
 
 func TestViewContextStopsAtTheFirstPendingLine(t *testing.T) {

-       tree := partTree{
+       tree := ViewPartTree{

                sizes: map[nodeKey]int{
                        {0, 0}: 1,
                        {0, 1}: 1,
                sizes: map[nodeKey]int{
                        {0, 0}: 1,
                        {0, 1}: 1,


@@ -125,7 +125,7 @@ func TestViewContextStopsAtTheFirstPendingLine(t *testing.T) {
                },
        }
 
                },
        }
 

-       view, err := restoreView(viewState{
+       view, err := restoreView(ViewState{

                Lines: [][2]int{{1, 0}, {0, 2}, {0, 3}},
        }, 100, 100, tree)
        require.NoError(t, err)
                Lines: [][2]int{{1, 0}, {0, 2}, {0, 3}},
        }, 100, 100, tree)
        require.NoError(t, err)


@@ -135,44 +135,34 @@ func TestViewContextStopsAtTheFirstPendingLine(t *testing.T) {
 }
 
 func TestRestoreViewRejectsAGap(t *testing.T) {
 }
 
 func TestRestoreViewRejectsAGap(t *testing.T) {

-       _, err := restoreView(viewState{
+       _, err := restoreView(ViewState{

                Lines: [][2]int{{0, 0}, {0, 2}},
                Lines: [][2]int{{0, 0}, {0, 2}},

-       }, chatHigh, chatLow, builtTree{})
+       }, viewChatHigh, viewChatLow, ViewBuiltTree{})

        require.ErrorContains(t, err, "does not start at message 1")
 }
 
        require.ErrorContains(t, err, "does not start at message 1")
 }
 

-// pushEntry is one entry of the rollback state list of the reference design,
-// newest first. Under push alone, life stays 0, so the entry leaves it out.
-type pushEntry struct {
-       keep  bool
-       state int
-       older *pushEntry
-}
+// ViewBuiltTree is a tree with each node built, with 1 byte of text.
+type ViewBuiltTree struct{}

 
 

-// push is the push of rollback_state_list.js.
-func push(state int, states *pushEntry) *pushEntry {
-       if states == nil {
-               return &pushEntry{
-                       state: state,
-               }
-       }
+func (ViewBuiltTree) Built(level, index int) (bool, error) {
+       return true, nil
+}

 
 

-       if !states.keep {
-               return &pushEntry{
-                       keep:  true,
-                       state: states.state,
-                       older: states.older,
-               }
-       }
+func (ViewBuiltTree) Node(level, index int) (Node, bool, error) {
+       return testNode(level, index, "a"), true, nil
+}

 
 

-       return &pushEntry{
-               state: state,
-               older: push(states.state, states.older),
-       }
+// ViewPushEntry is one entry of the rollback state list of the reference
+// design, newest first. Under push alone, life stays 0, so the entry leaves it
+// out.
+type ViewPushEntry struct {
+       keep  bool
+       state int
+       older *ViewPushEntry

 }
 
 // starts returns the states of the list, oldest first.
 }
 
 // starts returns the states of the list, oldest first.

-func (e *pushEntry) starts() []int {
+func (e *ViewPushEntry) starts() []int {

        var starts []int
        for entry := e; entry != nil; entry = entry.older {
                starts = append(starts, entry.state)
        var starts []int
        for entry := e; entry != nil; entry = entry.older {
                starts = append(starts, entry.state)


@@ -183,28 +173,17 @@ func (e *pushEntry) starts() []int {
        return starts
 }
 
        return starts
 }
 

-// builtTree is a tree with each node built, with 1 byte of text.
-type builtTree struct{}
-
-func (builtTree) Built(level, index int) (bool, error) {
-       return true, nil
-}
-
-func (builtTree) Node(level, index int) (Node, bool, error) {
-       return testNode(level, index, "a"), true, nil
-}
-
-// partTree is a tree with the built nodes of its sizes.
-type partTree struct {
+// ViewPartTree is a tree with the built nodes of its sizes.
+type ViewPartTree struct {

        sizes map[nodeKey]int
 }
 
        sizes map[nodeKey]int
 }
 

-func (p partTree) Built(level, index int) (bool, error) {
+func (p ViewPartTree) Built(level, index int) (bool, error) {

        _, built := p.sizes[nodeKey{level, index}]
        return built, nil
 }
 
        _, built := p.sizes[nodeKey{level, index}]
        return built, nil
 }
 

-func (p partTree) Node(level, index int) (Node, bool, error) {
+func (p ViewPartTree) Node(level, index int) (Node, bool, error) {

        size, built := p.sizes[nodeKey{level, index}]
        if !built {
                return Node{}, false, nil
        size, built := p.sizes[nodeKey{level, index}]
        if !built {
                return Node{}, false, nil


@@ -217,3 +196,25 @@ func (p partTree) Node(level, index int) (Node, bool, error) {
 
        return testNode(level, index, text), true, nil
 }
 
        return testNode(level, index, text), true, nil
 }

+
+// viewPush is the push of rollback_state_list.js.
+func viewPush(state int, states *ViewPushEntry) *ViewPushEntry {
+       if states == nil {
+               return &ViewPushEntry{
+                       state: state,
+               }
+       }
+
+       if !states.keep {
+               return &ViewPushEntry{
+                       keep:  true,
+                       state: states.state,
+                       older: states.older,
+               }
+       }
+
+       return &ViewPushEntry{
+               state: state,
+               older: viewPush(states.state, states.older),
+       }
+}