# HG changeset patch
# User Chris Cannam
# Date 1554304760 -3600
# Node ID 0e9840a381b5cb21707374f3c4d853171a2bfbfb
# Parent  95396c9382e3bb93fbde4f407b5db80d87e27751
Update tests for most recent changes

diff -r 95396c9382e3 -r 0e9840a381b5 data/model/test/TestFFTModel.h
--- a/data/model/test/TestFFTModel.h	Wed Apr 03 16:04:03 2019 +0100
+++ b/data/model/test/TestFFTModel.h	Wed Apr 03 16:19:20 2019 +0100
@@ -152,8 +152,6 @@
              { { {}, { 0.f, 2.f }, {}, {}, {} } }, 4);
         test(&mwm, RectangularWindow, 8, 8, 8, 3,
              { { {}, {}, {}, {}, {} } }, 4);
-        test(&mwm, RectangularWindow, 4, 4, 7, 3, // prime transform size
-             { { {}, {}, {} } }, 6);
     }
     
     void cosine_simple_rect() {
diff -r 95396c9382e3 -r 0e9840a381b5 data/model/test/TestSparseModels.h
--- a/data/model/test/TestSparseModels.h	Wed Apr 03 16:04:03 2019 +0100
+++ b/data/model/test/TestSparseModels.h	Wed Apr 03 16:19:20 2019 +0100
@@ -123,11 +123,11 @@
         m.toXml(str);
         str.flush();
         QString expected =
-            "<model id='2' name='This &quot;&amp;&quot; that' sampleRate='100' start='20' end='60' type='sparse' dimensions='1' resolution='10' notifyOnAdd='true' dataset='1' />\n"
-            "<dataset id='1' dimensions='1'>\n"
-            "  <point frame='20' />\n"
+            "<model id='1' name='This &quot;&amp;&quot; that' sampleRate='100' start='20' end='60' type='sparse' dimensions='1' resolution='10' notifyOnAdd='true' dataset='0' />\n"
+            "<dataset id='0' dimensions='1'>\n"
+            "  <point frame='20' label='' />\n"
             "  <point frame='20' label='Label &amp;&apos;&quot;&gt;' />\n"
-            "  <point frame='50' />\n"
+            "  <point frame='50' label='' />\n"
             "</dataset>\n";
         expected.replace("\'", "\"");
         if (xml != expected) {
@@ -209,8 +209,8 @@
         str.flush();
         
         QString expected =
-            "<model id='4' name='' sampleRate='100' start='20' end='80' type='sparse' dimensions='3' resolution='10' notifyOnAdd='true' dataset='3' subtype='note' valueQuantization='0' minimum='123.4' maximum='126.3' units='Hz' />\n"
-            "<dataset id='3' dimensions='3'>\n"
+            "<model id='3' name='' sampleRate='100' start='20' end='80' type='sparse' dimensions='3' resolution='10' notifyOnAdd='true' dataset='2' subtype='note' valueQuantization='0' minimum='123.4' maximum='126.3' units='Hz' />\n"
+            "<dataset id='2' dimensions='3'>\n"
             "  <point frame='20' value='124.3' duration='10' level='0.9' label='note 2' />\n"
             "  <point frame='20' value='123.4' duration='20' level='0.8' label='note 1' />\n"
             "  <point frame='50' value='126.3' duration='30' level='0.9' label='note 3' />\n"
@@ -237,8 +237,8 @@
         str.flush();
 
         QString expected =
-            "<model id='6' name='' sampleRate='100' start='20' end='60' type='sparse' dimensions='2' resolution='10' notifyOnAdd='true' dataset='5' subtype='text' />\n"
-            "<dataset id='5' dimensions='2'>\n"
+            "<model id='5' name='' sampleRate='100' start='20' end='60' type='sparse' dimensions='2' resolution='10' notifyOnAdd='true' dataset='4' subtype='text' />\n"
+            "<dataset id='4' dimensions='2'>\n"
             "  <point frame='20' height='0' label='text 2' />\n"
             "  <point frame='20' height='1' label='text 1' />\n"
             "  <point frame='50' height='0.3' label='text 3' />\n"
@@ -265,8 +265,8 @@
         str.flush();
 
         QString expected =
-            "<model id='7' name='' sampleRate='100' start='20' end='60' type='sparse' dimensions='2' resolution='10' notifyOnAdd='true' dataset='7' subtype='path' />\n"
-            "<dataset id='7' dimensions='2'>\n"
+            "<model id='6' name='' sampleRate='100' start='20' end='60' type='sparse' dimensions='2' resolution='10' notifyOnAdd='true' dataset='6' subtype='path' />\n"
+            "<dataset id='6' dimensions='2'>\n"
             "  <point frame='20' mapframe='30' />\n"
             "  <point frame='40' mapframe='60' />\n"
             "  <point frame='50' mapframe='49' />\n"
@@ -289,8 +289,8 @@
         str.flush();
 
         QString expected =
-            "<model id='9' name='' sampleRate='100' start='20' end='30' type='sparse' dimensions='1' resolution='10' notifyOnAdd='true' dataset='8' subtype='image' />\n"
-            "<dataset id='8' dimensions='1'>\n"
+            "<model id='8' name='' sampleRate='100' start='20' end='30' type='sparse' dimensions='1' resolution='10' notifyOnAdd='true' dataset='7' subtype='image' />\n"
+            "<dataset id='7' dimensions='1'>\n"
             "  <point frame='20' label='a label' image='/path/to/thing.png' />\n"
             "</dataset>\n";
         expected.replace("\'", "\"");