From 7dd525f3c1dcd515f1f303401f43a4f89618257d Mon Sep 17 00:00:00 2001
From: Dave Griffiths <dave@fo.am>
Date: Mon, 3 Aug 2015 20:24:49 +0100
Subject: [PATCH] all tests pass

---
 samplebrain/src/block.cpp    | 2 +-
 samplebrain/src/brain.cpp    | 8 ++++++--
 samplebrain/src/main.cpp     | 2 --
 samplebrain/src/renderer.cpp | 9 +++++++--
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/samplebrain/src/block.cpp b/samplebrain/src/block.cpp
index 96f19f3..a172d5c 100644
--- a/samplebrain/src/block.cpp
+++ b/samplebrain/src/block.cpp
@@ -273,7 +273,7 @@ bool block::unit_test() {
 
     sample data2(200);
     for (u32 i=0; i<data.get_length(); i++) {
-        data[i]=i%10;
+        data2[i]=i%10;
     }
 
     block cpy("test",data,100,w);
diff --git a/samplebrain/src/brain.cpp b/samplebrain/src/brain.cpp
index 794114b..3fefb9e 100644
--- a/samplebrain/src/brain.cpp
+++ b/samplebrain/src/brain.cpp
@@ -234,10 +234,11 @@ ios &spiralcore::operator||(ios &s, brain &b) {
     u32 version=0;
     string id("brain");
     s||id||version;
-    s||b.m_blocks;
+    stream_vector(s,b.m_blocks);
     stream_list(s,b.m_samples);
     s||b.m_block_size||b.m_overlap||b.m_window;
-    s||b.m_current_block_index||b.m_average_error||b.m_usage_falloff;
+    s||b.m_current_block_index||b.m_current_error||
+        b.m_average_error||b.m_usage_falloff;
 }
 
 bool brain::unit_test() {
@@ -275,6 +276,7 @@ bool brain::unit_test() {
     assert(b3.search(b2.m_blocks[19],p)==19);
     assert(b3.search(b2.m_blocks[29],p)==29);
 
+
     ofstream of("test_data/test.brain",ios::binary);
     of||b3;
     of.close();
@@ -284,6 +286,8 @@ bool brain::unit_test() {
     ifs||b4;
     ifs.close();
 
+    assert(b3.m_samples.size()==b4.m_samples.size());
+    assert(b3.m_blocks.size()==b4.m_blocks.size());
 
     assert(b4.search(b2.m_blocks[0],p)==0);
     assert(b4.search(b2.m_blocks[9],p)==9);
diff --git a/samplebrain/src/main.cpp b/samplebrain/src/main.cpp
index 8857d67..1890053 100644
--- a/samplebrain/src/main.cpp
+++ b/samplebrain/src/main.cpp
@@ -38,8 +38,6 @@ void unit_test() {
     cerr<<"testing renderer"<<endl;
     if (renderer::unit_test()) cerr<<"passed"<<endl;
     else cerr<<"failed"<<endl;
-
-
 }
 
 audio_device *a = NULL;
diff --git a/samplebrain/src/renderer.cpp b/samplebrain/src/renderer.cpp
index 0043e2b..9bf9403 100644
--- a/samplebrain/src/renderer.cpp
+++ b/samplebrain/src/renderer.cpp
@@ -170,8 +170,10 @@ bool renderer::unit_test() {
 
     renderer rr(source,target);
     rr.set_playing(true);
-    float *buf=new float[10];
+    float *buf=new float[400];
     rr.process(10,buf);
+    rr.process(10,buf);
+
     assert(rr.m_render_blocks.size()==2);
     rr.process(10,buf);
     assert(rr.m_render_blocks.size()==2);
@@ -184,7 +186,10 @@ bool renderer::unit_test() {
 
     target.init(10,5,window::RECTANGLE);
     rr.process(10,buf);
-    assert(rr.m_render_blocks.size()==5);
+    rr.process(10,buf);
+    rr.process(10,buf);
+    rr.process(10,buf);
+    assert(rr.m_render_blocks.size()==4);
     delete[] buf;
 
 }