Skip to content

Commit

Permalink
Adjust tests affected by Issue #217
Browse files Browse the repository at this point in the history 
Changed tests to accomodate changed files numbers and content.
Changed Consine to Cosine - this affect several methods
  • Loading branch information
@towsey @atruskie
towsey authored and atruskie committed Mar 25, 2019
1 parent 8c4a0fb commit f25b053
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 17 deletions.
2 changes: 1 addition & 1 deletion src/AnalysisPrograms/Sandpit.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1434,7 +1434,7 @@ public static void TestAnalyseLongRecordingUsingArtificialSignal()
int sampleRate = 22050;
double duration = 420; // signal duration in seconds = 7 minutes
int[] harmonics = {500, 1000, 2000, 4000, 8000};
var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine);
var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine);
var outputDirectory = @"C:\SensorNetworks\SoftwareTests\TestLongDurationRecordings";
var recordingPath = Path.Combine(outputDirectory, "TemporaryRecording.wav");
WavWriter.WriteWavFileViaFfmpeg(recordingPath.ToFileInfo(), recording.WavReader);
Expand Down
6 changes: 3 additions & 3 deletions src/AudioAnalysisTools/DSP/DSP_Filters.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public static void TestMethod_GenerateSignal1()
var freqScale = new FrequencyScale(sampleRate / 2, windowSize, 1000);
string path = @"C:\SensorNetworks\Output\Sonograms\UnitTestSonograms\SineSignal1.png";

var recording = GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine);
var recording = GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine);
var sonoConfig = new SonogramConfig
{
WindowSize = freqScale.WindowSize,
Expand Down Expand Up @@ -79,7 +79,7 @@ public static void TestMethod_GenerateSignal2()
int[] harmonics = { 500, 1000, 2000, 4000, 8000 };
var freqScale = new FrequencyScale(FreqScaleType.Linear125Octaves7Tones28Nyquist32000);
string path = @"C:\SensorNetworks\Output\Sonograms\UnitTestSonograms\SineSignal2.png";
var recording = GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine);
var recording = GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine);

// init the default sonogram config
var sonoConfig = new SonogramConfig
Expand Down Expand Up @@ -143,7 +143,7 @@ public static AudioRecording GenerateTestRecording(int sampleRate, double durati
public static double[] GenerateTestSignal(int sampleRate, double duration, int[] harmonics, WaveType waveType)
{
double[] signal = null;
if (waveType == WaveType.Consine)
if (waveType == WaveType.Cosine)
{
signal = GetSignalOfAddedCosines(sampleRate, duration, harmonics);
}
Expand Down
4 changes: 2 additions & 2 deletions src/AudioAnalysisTools/DSP/WaveType.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// <copyright file="WaveType.cs" company="QutEcoacoustics">
// <copyright file="WaveType.cs" company="QutEcoacoustics">
// All code in this file and all associated files are the copyright and property of the QUT Ecoacoustics Research Group (formerly MQUTeR, and formerly QUT Bioacoustics Research Group).
// </copyright>

Expand All @@ -7,6 +7,6 @@ namespace AudioAnalysisTools.DSP
public enum WaveType
{
Sine,
Consine,
Cosine,
}
}
12 changes: 6 additions & 6 deletions tests/Acoustics.Test/AnalysisPrograms/AnalyzeLongRecordings/TestAnalyzeLongRecording.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ public void TestAnalyzeSr22050Recording()
int sampleRate = 22050;
double duration = 420; // signal duration in seconds = 7 minutes
int[] harmonics = { 500, 1000, 2000, 4000, 8000 };
var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine);
var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine);
var recordingPath = this.outputDirectory.CombineFile("TemporaryRecording1.wav");
WavWriter.WriteWavFileViaFfmpeg(recordingPath, recording.WavReader);

Expand Down Expand Up @@ -98,7 +98,7 @@ public void TestAnalyzeSr22050Recording()
var resultsDirectory = this.outputDirectory.Combine("Towsey.Acoustic");
var listOfFiles = resultsDirectory.EnumerateFiles().ToArray();

Assert.AreEqual(38, listOfFiles.Length);
Assert.AreEqual(40, listOfFiles.Length);

var csvCount = listOfFiles.Count(f => f.Name.EndsWith(".csv"));
Assert.AreEqual(16, csvCount);
Expand All @@ -107,12 +107,12 @@ public void TestAnalyzeSr22050Recording()
Assert.AreEqual(2, jsonCount);

var pngCount = listOfFiles.Count(f => f.Name.EndsWith(".png"));
Assert.AreEqual(20, pngCount);
Assert.AreEqual(22, pngCount);

var twoMapsImagePath = resultsDirectory.CombineFile("TemporaryRecording1__2Maps.png");
var twoMapsImage = ImageTools.ReadImage2Bitmap(twoMapsImagePath.FullName);

// image is 7 * 652
// image is 7 * 632
Assert.AreEqual(7, twoMapsImage.Width);
Assert.AreEqual(632, twoMapsImage.Height);

Expand Down Expand Up @@ -151,7 +151,7 @@ public void TestAnalyzeSr64000Recording()
int sampleRate = 64000;
double duration = 420; // signal duration in seconds = 7 minutes
int[] harmonics = { 500, 1000, 2000, 4000, 8000 };
var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine);
var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine);
string recordingName = "TemporaryRecording2";
var recordingPath = this.outputDirectory.CombineFile(recordingName + ".wav");
WavWriter.WriteWavFileViaFfmpeg(recordingPath, recording.WavReader);
Expand Down Expand Up @@ -269,7 +269,7 @@ public void TestAnalyzeSr64000Recording()
// test number of images - should now be 23
listOfFiles = resultsDirectory.EnumerateFiles().ToArray();
pngCount = listOfFiles.Count(f => f.Name.EndsWith(".png"));
Assert.AreEqual(21, pngCount);
Assert.AreEqual(23, pngCount);

var twoMapsImagePath = resultsDirectory.CombineFile(recordingName + "__2Maps.png");
var twoMapsImage = ImageTools.ReadImage2Bitmap(twoMapsImagePath.FullName);
Expand Down
4 changes: 2 additions & 2 deletions tests/Acoustics.Test/AudioAnalysisTools/DSP/FrequencyScaleTests.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ public void TestFreqScaleOnArtificialSignal1()
var freqScale = new FrequencyScale(sampleRate / 2, windowSize, 1000);
var outputImagePath = Path.Combine(this.outputDirectory.FullName, "Signal1_LinearFreqScale.png");

var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine);
var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine);
var sonoConfig = new SonogramConfig
{
WindowSize = freqScale.WindowSize,
Expand Down Expand Up @@ -406,7 +406,7 @@ public void TestFreqScaleOnArtificialSignal2()
int[] harmonics = { 500, 1000, 2000, 4000, 8000 };
var freqScale = new FrequencyScale(FreqScaleType.Linear125Octaves7Tones28Nyquist32000);
var outputImagePath = Path.Combine(this.outputDirectory.FullName, "Signal2_OctaveFreqScale.png");
var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Consine);
var recording = DspFilters.GenerateTestRecording(sampleRate, duration, harmonics, WaveType.Cosine);

// init the default sonogram config
var sonoConfig = new SonogramConfig
Expand Down
6 changes: 3 additions & 3 deletions tests/Acoustics.Test/Shared/CsvTests.cs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// --------------------------------------------------------------------------------------------------------------------
// --------------------------------------------------------------------------------------------------------------------
// <copyright file="CsvTests.cs" company="QutEcoacoustics">
// All code in this file and all associated files are the copyright and property of the QUT Ecoacoustics Research Group (formerly MQUTeR, and formerly QUT Bioacoustics Research Group).
// </copyright>
Expand Down Expand Up @@ -351,8 +351,8 @@ public void TestBaseTypesAreNotSerializedAsArray()
var baseExpected = $@"{nameof(SummaryIndexBase.RankOrder)},{nameof(SummaryIndexBase.FileName)},{nameof(SummaryIndexBase.ResultStartSeconds)},{nameof(SummaryIndexBase.SegmentDurationSeconds)},{nameof(SummaryIndexBase.ResultMinute)}
0,,0,0,0
".NormalizeToCrLf();
var childExpected = $@"ZeroSignal,HighAmplitudeIndex,ClippingIndex,AvgSignalAmplitude,BackgroundNoise,Snr,AvgSnrOfActiveFrames,Activity,EventsPerSecond,HighFreqCover,MidFreqCover,LowFreqCover,AcousticComplexity,TemporalEntropy,EntropyOfAverageSpectrum,AvgEntropySpectrum,EntropyOfVarianceSpectrum,VarianceEntropySpectrum,EntropyOfPeaksSpectrum,EntropyPeaks,EntropyOfCoVSpectrum,ClusterCount,ThreeGramCount,Ndsi,SptDensity,{nameof(SummaryIndexBase.RankOrder)},{nameof(SummaryIndexBase.FileName)},{nameof(SummaryIndexBase.ResultStartSeconds)},{nameof(SummaryIndexBase.SegmentDurationSeconds)},{nameof(SummaryIndexBase.ResultMinute)}
0,0,0,-100,-100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,0,0,0
var childExpected = $@"ZeroSignal,HighAmplitudeIndex,ClippingIndex,AvgSignalAmplitude,BackgroundNoise,Snr,AvgSnrOfActiveFrames,Activity,EventsPerSecond,HighFreqCover,MidFreqCover,LowFreqCover,AcousticComplexity,TemporalEntropy,EntropyOfAverageSpectrum,EntropyOfVarianceSpectrum,EntropyOfPeaksSpectrum,EntropyOfCoVSpectrum,ClusterCount,ThreeGramCount,Ndsi,SptDensity,{nameof(SummaryIndexBase.RankOrder)},{nameof(SummaryIndexBase.FileName)},{nameof(SummaryIndexBase.ResultStartSeconds)},{nameof(SummaryIndexBase.SegmentDurationSeconds)},{nameof(SummaryIndexBase.ResultMinute)}
0,0,0,-100,-100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,,0,0,0
".NormalizeToCrLf();

Csv.WriteToCsv(this.testFile, childArray);
Expand Down

0 comments on commit f25b053

Please sign in to comment.