# HG changeset patch
# User Maria Panteli <m.x.panteli@gmail.com>
# Date 1506457159 -3600
# Node ID 9b2beffa5fddbd88b7e05f5e77f851bb58ee5af3
# Parent  027945e9321161ec8ecdcb28873aeec293b7baf6
test updates

diff -r 027945e93211 -r 9b2beffa5fdd tests/test_OPMellin.py
--- a/tests/test_OPMellin.py	Tue Sep 26 20:42:44 2017 +0100
+++ b/tests/test_OPMellin.py	Tue Sep 26 21:19:19 2017 +0100
@@ -8,21 +8,23 @@
 import pytest
 
 import numpy as np
+import os
 
 import scripts.OPMellin as OPMellin
 
 
 opm = OPMellin.OPMellin()
-
+TEST_AUDIO_FILE = os.path.join(os.path.dirname(__file__), os.path.pardir, 
+                                 'data', 'sample_dataset', 'Audio', 'mel_1_2_1.wav')
 
 def test_load_audiofile():
-    audiofile = 'data/sample_dataset/Audio/mel_1_2_1.wav'
+    audiofile = TEST_AUDIO_FILE
     opm.load_audiofile(audiofile, segment=False)
     assert opm.y is not None and opm.sr is not None
 
 
 def test_mel_spectrogram():
-    audiofile = 'data/sample_dataset/Audio/mel_1_2_1.wav'
+    audiofile = TEST_AUDIO_FILE
     opm.load_audiofile(audiofile, segment=False)
     opm.mel_spectrogram(y=opm.y, sr=opm.sr)
     # assume 40 mel bands
@@ -30,7 +32,7 @@
 
 
 def test_post_process_spec():
-    audiofile = 'data/sample_dataset/Audio/mel_1_2_1.wav'
+    audiofile = TEST_AUDIO_FILE
     opm.load_audiofile(audiofile, segment=False)
     opm.mel_spectrogram(y=opm.y, sr=opm.sr)
     melspec = opm.melspec
@@ -40,7 +42,7 @@
 
 
 def test_onset_patterns_n_frames():
-    audiofile = 'data/sample_dataset/Audio/mel_1_2_1.wav'
+    audiofile = TEST_AUDIO_FILE
     opm.load_audiofile(audiofile, segment=False)
     opm.mel_spectrogram(y=opm.y, sr=opm.sr)
     opm.onset_patterns(melspec=opm.melspec, melsr=opm.melsr)
@@ -48,7 +50,7 @@
 
 
 def test_onset_patterns_n_bins():
-    audiofile = 'data/sample_dataset/Audio/mel_1_2_1.wav'
+    audiofile = TEST_AUDIO_FILE
     opm.load_audiofile(audiofile, segment=False)
     opm.mel_spectrogram(y=opm.y, sr=opm.sr)
     opm.onset_patterns(melspec=opm.melspec, melsr=opm.melsr)
@@ -56,7 +58,7 @@
 
 
 def test_post_process_op():
-    audiofile = 'data/sample_dataset/Audio/mel_1_2_1.wav'
+    audiofile = TEST_AUDIO_FILE
     opm.load_audiofile(audiofile, segment=False)
     opm.mel_spectrogram(y=opm.y, sr=opm.sr)
     opm.onset_patterns(melspec=opm.melspec, melsr=opm.melsr)
diff -r 027945e93211 -r 9b2beffa5fdd tests/test_PitchBihist.py
--- a/tests/test_PitchBihist.py	Tue Sep 26 20:42:44 2017 +0100
+++ b/tests/test_PitchBihist.py	Tue Sep 26 21:19:19 2017 +0100
@@ -8,12 +8,14 @@
 import pytest
 
 import numpy as np
+import os
 
 import scripts.PitchBihist as PitchBihist
 
 
 pbi = PitchBihist.PitchBihist()
-
+TEST_MELODIA_FILE = os.path.join(os.path.dirname(__file__), os.path.pardir, 
+                                 'data', 'sample_dataset', 'Melodia', 'mel_1_2_1.csv')
 
 def test_hz_to_cents():
     freq_Hz = np.array([32.703, 65.406, 55, 110])
@@ -30,7 +32,7 @@
 
 
 def test_get_melody_from_file():
-    melodia_file = 'data/sample_dataset/Melodia/mel_1_2_1.csv'
+    melodia_file = TEST_MELODIA_FILE
     melody = pbi.get_melody_from_file(melodia_file)
     assert len(melody) < 12. * pbi.melody_sr
 
@@ -56,13 +58,13 @@
 
 
 def test_bihist_from_melodia():
-    melodia_file = 'data/sample_dataset/Melodia/mel_1_2_1.csv'
+    melodia_file = TEST_MELODIA_FILE
     bihist = pbi.bihist_from_melodia(melodia_file, secondframedecomp=False)
     assert bihist.shape == (60, 60)
 
 
 def test_bihist_from_melodia_n_frames():
-    melodia_file = 'data/sample_dataset/Melodia/mel_1_2_1.csv'
+    melodia_file = TEST_MELODIA_FILE
     bihist = pbi.bihist_from_melodia(melodia_file, secondframedecomp=True)
     dur_sec = 11.5  # duration of first file in metadata.csv is > 11 seconds
     n_frames_true = np.round((dur_sec - pbi.win2sec) * 2)  # for .5 sec hop size
diff -r 027945e93211 -r 9b2beffa5fdd tests/test_load_features.py
--- a/tests/test_load_features.py	Tue Sep 26 20:42:44 2017 +0100
+++ b/tests/test_load_features.py	Tue Sep 26 21:19:19 2017 +0100
@@ -10,15 +10,13 @@
 import os
 import numpy as np
 import pandas as pd
+
 import scripts.load_features as load_features
 
 feat_loader = load_features.FeatureLoader(win2sec=8)
 
-#TEST_METADATA_FILE = '../data/sample_dataset/metadata.csv'
 TEST_METADATA_FILE = os.path.join(os.path.dirname(__file__), os.path.pardir, 
                                     'data', 'sample_dataset', 'metadata.csv')
-#TEST_METADATA_FILE = 'data/sample_dataset/metadata.csv'
-#TEST_MELODIA_FILE = 'data/sample_dataset/Melodia/mel_1_2_1.csv'
 TEST_MELODIA_FILE = os.path.join(os.path.dirname(__file__), os.path.pardir, 
                                  'data', 'sample_dataset', 'Melodia', 'mel_1_2_1.csv')