Changeset 868c6b8 for tests/src/onset/test-onset.c

Timestamp:

Dec 19, 2018, 6:16:29 PM (5 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/constantq

Children:

dfe6ab6

Parents:

f87e191 (diff), fda3394 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into feature/constantq

File:

• tests/src/onset/test-onset.c (modified) (3 diffs)

tests/src/onset/test-onset.c

@@ -10 +10 @@
     err = 2;
     PRINT_WRN("no arguments, running tests\n");
-    if (test_wrong_params() != 0) {
-      PRINT_ERR("tests failed!\n");
-      err = 1;
-    } else {
-      err = 0;
-    }
+    err = test_wrong_params();
     PRINT_MSG("usage: %s <source_path> [samplerate] [hop_size]\n", argv[0]);
     return err;
@@ -23 +18 @@
   uint_t hop_size = win_s / 4;
   uint_t n_frames = 0, read = 0;
-  if ( argc == 3 ) samplerate = atoi(argv[2]);
-  if ( argc == 4 ) hop_size = atoi(argv[3]);
+  if ( argc >= 3 ) samplerate = atoi(argv[2]);
+  if ( argc >= 4 ) hop_size = atoi(argv[3]);
 
   char_t *source_path = argv[1];
@@ -75 +70 @@
   uint_t samplerate = 44100;
   // hop_size < 1
-  if (new_aubio_onset("default", 5, 0, samplerate))
-    return 1;
+  if (new_aubio_onset("default", 5, 0, samplerate)) return 1;
+
   // buf_size < 2
-  if (new_aubio_onset("default", 1, 1, samplerate))
-    return 1;
+  if (new_aubio_onset("default", 1, 1, samplerate)) return 1;
+
   // buf_size < hop_size
-  if (new_aubio_onset("default", hop_size, win_size, samplerate))
-    return 1;
+  if (new_aubio_onset("default", hop_size, win_size, samplerate)) return 1;
+
   // samplerate < 1
-  if (new_aubio_onset("default", 1024, 512, 0))
-    return 1;
+  if (new_aubio_onset("default", 1024, 512, 0)) return 1;
 
   // specdesc creation failed
-  if (new_aubio_onset("abcd", win_size, win_size/2, samplerate))
-    return 1;
-  // pv creation failed
-  if (new_aubio_onset("default", 5, 2, samplerate))
-    return 1;
+  if (new_aubio_onset("abcd", win_size, win_size/2, samplerate)) return 1;
 
   aubio_onset_t *o;
+
+  // pv creation might fail
+  o = new_aubio_onset("default", 5, 2, samplerate);
+  if (o) del_aubio_onset(o);
+
   o = new_aubio_onset("default", win_size, hop_size, samplerate);
-  if (!aubio_onset_set_default_parameters(o, "wrong_type"))
-    return 1;
+  if (!aubio_onset_set_default_parameters(o, "wrong_type")) return 1;
   del_aubio_onset(o);
 
-  return 0;
+  return run_on_default_source(main);
 }