From f3af250ff7921722876ad52acf923136478852ca Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 2 Apr 2019 11:07:30 +0100 Subject: [PATCH] Tidied up unit test code layout --- .../juce_ThreadedAnalyticsDestination.cpp | 4 +- .../buffers/juce_AudioChannelSet.cpp | 4 + .../buffers/juce_AudioDataConverters.cpp | 1 + .../buffers/juce_FloatVectorOperations.cpp | 1 + .../midi/juce_MidiMessageSequence.cpp | 3 + .../juce_audio_basics/midi/juce_MidiRPN.cpp | 3 +- .../mpe/juce_MPEInstrument.cpp | 3 +- .../mpe/juce_MPEMessages.cpp | 3 +- .../juce_audio_basics/mpe/juce_MPENote.cpp | 3 +- .../juce_audio_basics/mpe/juce_MPEUtils.cpp | 2 + .../juce_audio_basics/mpe/juce_MPEValue.cpp | 3 +- .../mpe/juce_MPEZoneLayout.cpp | 3 +- .../midi_io/juce_MidiDevices.cpp | 169 +++++++++--------- .../codecs/juce_CoreAudioFormat.cpp | 2 +- .../codecs/juce_WavAudioFormat.cpp | 2 + .../utilities/juce_AudioParameterChoice.cpp | 9 +- .../utilities/juce_AudioParameterInt.cpp | 9 +- .../juce_AudioProcessorValueTreeState.cpp | 15 +- .../blocks/juce_BlocksVersion.cpp | 5 + .../containers/juce_AbstractFifo.cpp | 1 + modules/juce_core/files/juce_File.cpp | 1 + .../juce_core/files/juce_FileInputStream.cpp | 2 + modules/juce_core/javascript/juce_JSON.cpp | 1 + modules/juce_core/maths/juce_BigInteger.cpp | 1 + modules/juce_core/maths/juce_Random.cpp | 2 + modules/juce_core/network/juce_IPAddress.cpp | 2 + modules/juce_core/network/juce_NamedPipe.cpp | 3 +- modules/juce_core/network/juce_Socket.cpp | 2 + .../streams/juce_BufferedInputStream.cpp | 2 + .../streams/juce_MemoryInputStream.cpp | 2 + .../streams/juce_SubregionStream.cpp | 2 + .../text/juce_CharacterFunctions.cpp | 2 + modules/juce_core/text/juce_String.cpp | 1 + modules/juce_core/text/juce_TextDiff.cpp | 1 + .../juce_core/threads/juce_ChildProcess.cpp | 2 + modules/juce_core/threads/juce_Thread.cpp | 4 +- modules/juce_core/xml/juce_XmlElement.cpp | 1 + .../zip/juce_GZIPCompressorOutputStream.cpp | 2 + .../zip/juce_GZIPDecompressorInputStream.cpp | 2 + modules/juce_core/zip/juce_ZipFile.cpp | 2 + .../encryption/juce_BlowFish.cpp | 2 + .../juce_cryptography/hashing/juce_MD5.cpp | 1 + .../hashing/juce_Whirlpool.cpp | 1 + .../values/juce_ValueTree.cpp | 2 + modules/juce_gui_basics/layout/juce_Grid.cpp | 2 +- modules/juce_osc/osc/juce_OSCAddress.cpp | 3 +- modules/juce_osc/osc/juce_OSCArgument.cpp | 3 +- modules/juce_osc/osc/juce_OSCBundle.cpp | 4 +- modules/juce_osc/osc/juce_OSCMessage.cpp | 3 +- modules/juce_osc/osc/juce_OSCReceiver.cpp | 2 +- modules/juce_osc/osc/juce_OSCSender.cpp | 4 +- 51 files changed, 201 insertions(+), 108 deletions(-) diff --git a/modules/juce_analytics/destinations/juce_ThreadedAnalyticsDestination.cpp b/modules/juce_analytics/destinations/juce_ThreadedAnalyticsDestination.cpp index ba3c571731..7c4be689a5 100644 --- a/modules/juce_analytics/destinations/juce_ThreadedAnalyticsDestination.cpp +++ b/modules/juce_analytics/destinations/juce_ThreadedAnalyticsDestination.cpp @@ -141,6 +141,8 @@ void ThreadedAnalyticsDestination::EventDispatcher::addToQueue (const AnalyticsE eventQueue.push_back (event); } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS @@ -213,7 +215,7 @@ namespace DestinationTestHelpers struct ThreadedAnalyticsDestinationTests : public UnitTest { ThreadedAnalyticsDestinationTests() - : UnitTest ("ThreadedAnalyticsDestination") + : UnitTest ("ThreadedAnalyticsDestination", "Analytics") {} void compareEventQueues (const std::deque& a, diff --git a/modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp b/modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp index c4794af10b..dfc69e359f 100644 --- a/modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp +++ b/modules/juce_audio_basics/buffers/juce_AudioChannelSet.cpp @@ -557,8 +557,11 @@ int JUCE_CALLTYPE AudioChannelSet::getAmbisonicOrderForNumChannels (int numChann return (static_cast (ambisonicOrder) == sqrtMinusOne ? ambisonicOrder : -1); } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS + class AudioChannelSetUnitTest : public UnitTest { public: @@ -645,6 +648,7 @@ private: }; static AudioChannelSetUnitTest audioChannelSetUnitTest; + #endif } // namespace juce diff --git a/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp b/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp index 162fd1a8d1..54f26f494b 100644 --- a/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp +++ b/modules/juce_audio_basics/buffers/juce_AudioDataConverters.cpp @@ -460,6 +460,7 @@ void AudioDataConverters::deinterleaveSamples (const float* source, float** dest } +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp b/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp index da999286ad..652edef969 100644 --- a/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp +++ b/modules/juce_audio_basics/buffers/juce_FloatVectorOperations.cpp @@ -1139,6 +1139,7 @@ ScopedNoDenormals::~ScopedNoDenormals() noexcept #endif } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp index f3245b80c4..f2ec29e563 100644 --- a/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiMessageSequence.cpp @@ -344,6 +344,9 @@ void MidiMessageSequence::createControllerUpdatesForTime (int channelNumber, dou } } + +//============================================================================== +//============================================================================== #if JUCE_UNIT_TESTS struct MidiMessageSequenceTest : public UnitTest diff --git a/modules/juce_audio_basics/midi/juce_MidiRPN.cpp b/modules/juce_audio_basics/midi/juce_MidiRPN.cpp index 9e2c2df329..f8479a5d10 100644 --- a/modules/juce_audio_basics/midi/juce_MidiRPN.cpp +++ b/modules/juce_audio_basics/midi/juce_MidiRPN.cpp @@ -159,6 +159,7 @@ MidiBuffer MidiRPNGenerator::generate (int midiChannel, return buffer; } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS @@ -371,6 +372,6 @@ private: static MidiRPNGeneratorTests MidiRPNGeneratorUnitTests; -#endif // JUCE_UNIT_TESTS +#endif } // namespace juce diff --git a/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp b/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp index c83b16fb79..9753a0a31c 100644 --- a/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp +++ b/modules/juce_audio_basics/mpe/juce_MPEInstrument.cpp @@ -791,6 +791,7 @@ void MPEInstrument::releaseAllNotes() notes.clear(); } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS @@ -2286,6 +2287,6 @@ private: static MPEInstrumentTests MPEInstrumentUnitTests; -#endif // JUCE_UNIT_TESTS +#endif } // namespace juce diff --git a/modules/juce_audio_basics/mpe/juce_MPEMessages.cpp b/modules/juce_audio_basics/mpe/juce_MPEMessages.cpp index 37c332fbaf..08fef6fcce 100644 --- a/modules/juce_audio_basics/mpe/juce_MPEMessages.cpp +++ b/modules/juce_audio_basics/mpe/juce_MPEMessages.cpp @@ -106,6 +106,7 @@ MidiBuffer MPEMessages::setZoneLayout (MPEZoneLayout layout) return buffer; } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS @@ -233,6 +234,6 @@ private: static MPEMessagesTests MPEMessagesUnitTests; -#endif // JUCE_UNIT_TESTS +#endif } // namespace juce diff --git a/modules/juce_audio_basics/mpe/juce_MPENote.cpp b/modules/juce_audio_basics/mpe/juce_MPENote.cpp index c4c5707cd8..45bc111fe5 100644 --- a/modules/juce_audio_basics/mpe/juce_MPENote.cpp +++ b/modules/juce_audio_basics/mpe/juce_MPENote.cpp @@ -84,6 +84,7 @@ bool MPENote::operator!= (const MPENote& other) const noexcept return noteID != other.noteID; } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS @@ -119,6 +120,6 @@ private: static MPENoteTests MPENoteUnitTests; -#endif // JUCE_UNIT_TESTS +#endif } // namespace juce diff --git a/modules/juce_audio_basics/mpe/juce_MPEUtils.cpp b/modules/juce_audio_basics/mpe/juce_MPEUtils.cpp index 18efd66f2d..77f9d00ddd 100644 --- a/modules/juce_audio_basics/mpe/juce_MPEUtils.cpp +++ b/modules/juce_audio_basics/mpe/juce_MPEUtils.cpp @@ -255,6 +255,7 @@ void MPEChannelRemapper::zeroArrays() } } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS @@ -475,4 +476,5 @@ struct MPEUtilsUnitTests : public UnitTest static MPEUtilsUnitTests MPEUtilsUnitTests; #endif + } // namespace juce diff --git a/modules/juce_audio_basics/mpe/juce_MPEValue.cpp b/modules/juce_audio_basics/mpe/juce_MPEValue.cpp index b9a071303e..0b8800536e 100644 --- a/modules/juce_audio_basics/mpe/juce_MPEValue.cpp +++ b/modules/juce_audio_basics/mpe/juce_MPEValue.cpp @@ -82,6 +82,7 @@ bool MPEValue::operator!= (const MPEValue& other) const noexcept return ! operator== (other); } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS @@ -165,6 +166,6 @@ private: static MPEValueTests MPEValueUnitTests; -#endif // JUCE_UNIT_TESTS +#endif } // namespace juce diff --git a/modules/juce_audio_basics/mpe/juce_MPEZoneLayout.cpp b/modules/juce_audio_basics/mpe/juce_MPEZoneLayout.cpp index 7f94dee8b0..7875b4ea8d 100644 --- a/modules/juce_audio_basics/mpe/juce_MPEZoneLayout.cpp +++ b/modules/juce_audio_basics/mpe/juce_MPEZoneLayout.cpp @@ -205,6 +205,7 @@ void MPEZoneLayout::checkAndLimitZoneParameters (int minValue, int maxValue, } } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS @@ -382,6 +383,6 @@ public: static MPEZoneLayoutTests MPEZoneLayoutUnitTests; -#endif // JUCE_UNIT_TESTS +#endif } // namespace juce diff --git a/modules/juce_audio_devices/midi_io/juce_MidiDevices.cpp b/modules/juce_audio_devices/midi_io/juce_MidiDevices.cpp index eb80c4a794..7f5498fa81 100644 --- a/modules/juce_audio_devices/midi_io/juce_MidiDevices.cpp +++ b/modules/juce_audio_devices/midi_io/juce_MidiDevices.cpp @@ -157,116 +157,121 @@ void MidiOutput::run() clearAllPendingMessages(); } + +//============================================================================== +//============================================================================== #if JUCE_UNIT_TESTS - class MidiDevicesUnitTests : public UnitTest - { - public: - MidiDevicesUnitTests() : UnitTest ("MidiInput/MidiOutput", "MIDI/MPE") {} - void runTest() override - { - beginTest ("default device (input)"); - { - auto devices = MidiInput::getAvailableDevices(); - auto defaultDevice = MidiInput::getDefaultDevice(); +class MidiDevicesUnitTests : public UnitTest +{ +public: + MidiDevicesUnitTests() : UnitTest ("MidiInput/MidiOutput", "MIDI/MPE") {} - if (devices.size() == 0) - expect (defaultDevice == MidiDeviceInfo()); - else - expect (devices.contains (defaultDevice)); - } + void runTest() override + { + beginTest ("default device (input)"); + { + auto devices = MidiInput::getAvailableDevices(); + auto defaultDevice = MidiInput::getDefaultDevice(); - beginTest ("default device (output)"); - { - auto devices = MidiOutput::getAvailableDevices(); - auto defaultDevice = MidiOutput::getDefaultDevice(); + if (devices.size() == 0) + expect (defaultDevice == MidiDeviceInfo()); + else + expect (devices.contains (defaultDevice)); + } - if (devices.size() == 0) - expect (defaultDevice == MidiDeviceInfo()); - else - expect (devices.contains (defaultDevice)); - } + beginTest ("default device (output)"); + { + auto devices = MidiOutput::getAvailableDevices(); + auto defaultDevice = MidiOutput::getDefaultDevice(); - #if JUCE_MAC || JUCE_LINUX || JUCE_IOS - String testDeviceName ("TestDevice"); - String testDeviceName2 ("TestDevice2"); + if (devices.size() == 0) + expect (defaultDevice == MidiDeviceInfo()); + else + expect (devices.contains (defaultDevice)); + } - struct MessageCallbackHandler : public MidiInputCallback - { - void handleIncomingMidiMessage (MidiInput* source, const MidiMessage& message) override - { - const ScopedLock sl (messageLock); + #if JUCE_MAC || JUCE_LINUX || JUCE_IOS + String testDeviceName ("TestDevice"); + String testDeviceName2 ("TestDevice2"); - messageSource = source; - messageReceived = message; - } + struct MessageCallbackHandler : public MidiInputCallback + { + void handleIncomingMidiMessage (MidiInput* source, const MidiMessage& message) override + { + const ScopedLock sl (messageLock); - MidiInput* messageSource = nullptr; - MidiMessage messageReceived; - CriticalSection messageLock; - }; + messageSource = source; + messageReceived = message; + } - MessageCallbackHandler handler; + MidiInput* messageSource = nullptr; + MidiMessage messageReceived; + CriticalSection messageLock; + }; - beginTest ("create device (input)"); - { - std::unique_ptr device (MidiInput::createNewDevice (testDeviceName, &handler)); + MessageCallbackHandler handler; - expect (device.get() != nullptr); - expect (device->getName() == testDeviceName); + beginTest ("create device (input)"); + { + std::unique_ptr device (MidiInput::createNewDevice (testDeviceName, &handler)); - device->setName (testDeviceName2); - expect (device->getName() == testDeviceName2); - } + expect (device.get() != nullptr); + expect (device->getName() == testDeviceName); - beginTest ("create device (output)"); - { - std::unique_ptr device (MidiOutput::createNewDevice (testDeviceName)); + device->setName (testDeviceName2); + expect (device->getName() == testDeviceName2); + } + + beginTest ("create device (output)"); + { + std::unique_ptr device (MidiOutput::createNewDevice (testDeviceName)); + + expect (device.get() != nullptr); + expect (device->getName() == testDeviceName); + } - expect (device.get() != nullptr); - expect (device->getName() == testDeviceName); - } + #if JUCE_MODAL_LOOPS_PERMITTED + auto testMessage = MidiMessage::noteOn (5, 12, (uint8) 51); - #if JUCE_MODAL_LOOPS_PERMITTED - auto testMessage = MidiMessage::noteOn (5, 12, (uint8) 51); + beginTest ("send messages"); + { + std::unique_ptr midiInput (MidiInput::createNewDevice (testDeviceName, &handler)); + expect (midiInput.get() != nullptr); + midiInput->start(); - beginTest ("send messages"); - { - std::unique_ptr midiInput (MidiInput::createNewDevice (testDeviceName, &handler)); - expect (midiInput.get() != nullptr); - midiInput->start(); + auto inputInfo = midiInput->getDeviceInfo(); - auto inputInfo = midiInput->getDeviceInfo(); + expect (MidiOutput::getAvailableDevices().contains (inputInfo)); - expect (MidiOutput::getAvailableDevices().contains (inputInfo)); + std::unique_ptr midiOutput (MidiOutput::openDevice (midiInput->getIdentifier())); + expect (midiOutput.get() != nullptr); - std::unique_ptr midiOutput (MidiOutput::openDevice (midiInput->getIdentifier())); - expect (midiOutput.get() != nullptr); + midiOutput->sendMessageNow (testMessage); - midiOutput->sendMessageNow (testMessage); + // Pump the message thread for a bit to allow the message to be delivered + MessageManager::getInstance()->runDispatchLoopUntil (100); - // Pump the message thread for a bit to allow the message to be delivered - MessageManager::getInstance()->runDispatchLoopUntil (100); + { + const ScopedLock sl (handler.messageLock); - { - const ScopedLock sl (handler.messageLock); + expect (handler.messageSource == midiInput.get()); - expect (handler.messageSource == midiInput.get()); + expect (handler.messageReceived.getChannel() == testMessage.getChannel()); + expect (handler.messageReceived.getNoteNumber() == testMessage.getNoteNumber()); + expect (handler.messageReceived.getVelocity() == testMessage.getVelocity()); + } - expect (handler.messageReceived.getChannel() == testMessage.getChannel()); - expect (handler.messageReceived.getNoteNumber() == testMessage.getNoteNumber()); - expect (handler.messageReceived.getVelocity() == testMessage.getVelocity()); - } + midiInput->stop(); + } + #endif - midiInput->stop(); - } - #endif + #endif + } +}; - #endif - } - }; +static MidiDevicesUnitTests MidiDevicesUnitTests; - static MidiDevicesUnitTests MidiDevicesUnitTests; #endif } // namespace juce diff --git a/modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp index ce4f6375b9..720661a84e 100644 --- a/modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_CoreAudioFormat.cpp @@ -592,8 +592,8 @@ AudioFormatWriter* CoreAudioFormat::createWriterFor (OutputStream*, return nullptr; } + //============================================================================== -// Unit tests for Core Audio layout conversions //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp b/modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp index b4c7b84e6b..b5a1542b95 100644 --- a/modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp +++ b/modules/juce_audio_formats/codecs/juce_WavAudioFormat.cpp @@ -1809,6 +1809,8 @@ bool WavAudioFormat::replaceMetadataInFile (const File& wavFile, const StringPai return slowCopyWavFileWithNewMetadata (wavFile, newMetadata); } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_audio_processors/utilities/juce_AudioParameterChoice.cpp b/modules/juce_audio_processors/utilities/juce_AudioParameterChoice.cpp index 23825fe5ce..7bad588b0d 100644 --- a/modules/juce_audio_processors/utilities/juce_AudioParameterChoice.cpp +++ b/modules/juce_audio_processors/utilities/juce_AudioParameterChoice.cpp @@ -69,9 +69,12 @@ AudioParameterChoice& AudioParameterChoice::operator= (int newValue) return *this; } + +//============================================================================== +//============================================================================== #if JUCE_UNIT_TESTS -static struct AudioParameterChoiceTests final : public UnitTest +struct AudioParameterChoiceTests : public UnitTest { AudioParameterChoiceTests() : UnitTest ("AudioParameterChoice", "AudioProcessor Parameters") {} @@ -112,7 +115,9 @@ static struct AudioParameterChoiceTests final : public UnitTest } } -} audioParameterChoiceTests; +}; + +static AudioParameterChoiceTests audioParameterChoiceTests; #endif diff --git a/modules/juce_audio_processors/utilities/juce_AudioParameterInt.cpp b/modules/juce_audio_processors/utilities/juce_AudioParameterInt.cpp index f9e104b7c7..c455c44591 100644 --- a/modules/juce_audio_processors/utilities/juce_AudioParameterInt.cpp +++ b/modules/juce_audio_processors/utilities/juce_AudioParameterInt.cpp @@ -69,9 +69,12 @@ AudioParameterInt& AudioParameterInt::operator= (int newValue) return *this; } + +//============================================================================== +//============================================================================== #if JUCE_UNIT_TESTS -static struct AudioParameterIntTests final : public UnitTest +struct AudioParameterIntTests : public UnitTest { AudioParameterIntTests() : UnitTest ("AudioParameterInt", "AudioProcessor Parameters") {} @@ -117,7 +120,9 @@ static struct AudioParameterIntTests final : public UnitTest expectEquals (intParam.get(), 2); } } -} audioParameterIntTests; +}; + +static AudioParameterIntTests audioParameterIntTests; #endif diff --git a/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp b/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp index 894783581a..ead5a78972 100644 --- a/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp +++ b/modules/juce_audio_processors/utilities/juce_AudioProcessorValueTreeState.cpp @@ -740,9 +740,12 @@ AudioProcessorValueTreeState::ButtonAttachment::ButtonAttachment (AudioProcessor AudioProcessorValueTreeState::ButtonAttachment::~ButtonAttachment() {} + +//============================================================================== +//============================================================================== #if JUCE_UNIT_TESTS -static struct ParameterAdapterTests final : public UnitTest +struct ParameterAdapterTests : public UnitTest { ParameterAdapterTests() : UnitTest ("Parameter Adapter", "AudioProcessor Parameters") {} @@ -812,7 +815,9 @@ static struct ParameterAdapterTests final : public UnitTest test ({ 0, 7.5 }, "2.5", 2.5); } } -} parameterAdapterTests; +}; + +static ParameterAdapterTests parameterAdapterTests; namespace { @@ -832,7 +837,7 @@ inline bool operator!= (const NormalisableRange& a, } } // namespace -static class AudioProcessorValueTreeStateTests final : public UnitTest +class AudioProcessorValueTreeStateTests : public UnitTest { private: using Parameter = AudioProcessorValueTreeState::Parameter; @@ -1166,7 +1171,9 @@ public: expectEquals (listener.id, String (key)); } } -} audioProcessorValueTreeStateTests; +}; + +static AudioProcessorValueTreeStateTests audioProcessorValueTreeStateTests; #endif diff --git a/modules/juce_blocks_basics/blocks/juce_BlocksVersion.cpp b/modules/juce_blocks_basics/blocks/juce_BlocksVersion.cpp index c0af1b98d5..ca391c420e 100644 --- a/modules/juce_blocks_basics/blocks/juce_BlocksVersion.cpp +++ b/modules/juce_blocks_basics/blocks/juce_BlocksVersion.cpp @@ -155,7 +155,11 @@ bool BlocksVersion::operator>= (const BlocksVersion& other) const return (*this > other) || (*this == other); } + +//============================================================================== +//============================================================================== #if JUCE_UNIT_TESTS + class BlocksVersionUnitTests : public UnitTest { public: @@ -225,6 +229,7 @@ public: }; static BlocksVersionUnitTests BlocksVersionUnitTests; + #endif } // namespace juce diff --git a/modules/juce_core/containers/juce_AbstractFifo.cpp b/modules/juce_core/containers/juce_AbstractFifo.cpp index fce82ba3bb..d3231fde0a 100644 --- a/modules/juce_core/containers/juce_AbstractFifo.cpp +++ b/modules/juce_core/containers/juce_AbstractFifo.cpp @@ -166,6 +166,7 @@ AbstractFifo::ScopedRead AbstractFifo::read (int numToRead) noexcept { ret AbstractFifo::ScopedWrite AbstractFifo::write (int numToWrite) noexcept { return { *this, numToWrite }; } +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/files/juce_File.cpp b/modules/juce_core/files/juce_File.cpp index f226ba0e97..34256d6b21 100644 --- a/modules/juce_core/files/juce_File.cpp +++ b/modules/juce_core/files/juce_File.cpp @@ -1004,6 +1004,7 @@ MemoryMappedFile::MemoryMappedFile (const File& file, const Range& fileRa } +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/files/juce_FileInputStream.cpp b/modules/juce_core/files/juce_FileInputStream.cpp index c659bd8baf..3e1a5352f1 100644 --- a/modules/juce_core/files/juce_FileInputStream.cpp +++ b/modules/juce_core/files/juce_FileInputStream.cpp @@ -76,6 +76,8 @@ bool FileInputStream::setPosition (int64 pos) return currentPosition == pos; } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/javascript/juce_JSON.cpp b/modules/juce_core/javascript/juce_JSON.cpp index 7e8d221f0c..d5089f83d1 100644 --- a/modules/juce_core/javascript/juce_JSON.cpp +++ b/modules/juce_core/javascript/juce_JSON.cpp @@ -538,6 +538,7 @@ Result JSON::parseQuotedString (String::CharPointerType& t, var& result) return Result::fail ("Not a quoted string!"); } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/maths/juce_BigInteger.cpp b/modules/juce_core/maths/juce_BigInteger.cpp index dda62ad705..77903b2432 100644 --- a/modules/juce_core/maths/juce_BigInteger.cpp +++ b/modules/juce_core/maths/juce_BigInteger.cpp @@ -1278,6 +1278,7 @@ uint32 readLittleEndianBitsInBuffer (const void* buffer, uint32 startBit, uint32 return result; } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/maths/juce_Random.cpp b/modules/juce_core/maths/juce_Random.cpp index 86b82e9f48..df23fe1701 100644 --- a/modules/juce_core/maths/juce_Random.cpp +++ b/modules/juce_core/maths/juce_Random.cpp @@ -161,6 +161,8 @@ void Random::fillBitsRandomly (BigInteger& arrayToChange, int startBit, int numB arrayToChange.setBit (startBit + numBits, nextBool()); } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/network/juce_IPAddress.cpp b/modules/juce_core/network/juce_IPAddress.cpp index 78e8c081b9..315d437b3e 100644 --- a/modules/juce_core/network/juce_IPAddress.cpp +++ b/modules/juce_core/network/juce_IPAddress.cpp @@ -372,6 +372,8 @@ Array IPAddress::getAllAddresses (bool includeIPv6) return addresses; } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/network/juce_NamedPipe.cpp b/modules/juce_core/network/juce_NamedPipe.cpp index 73d6c0a8ea..9128e735f2 100644 --- a/modules/juce_core/network/juce_NamedPipe.cpp +++ b/modules/juce_core/network/juce_NamedPipe.cpp @@ -60,8 +60,9 @@ String NamedPipe::getName() const // other methods for this class are implemented in the platform-specific files -//============================================================================== +//============================================================================== +//============================================================================== #if JUCE_UNIT_TESTS class NamedPipeTests : public UnitTest diff --git a/modules/juce_core/network/juce_Socket.cpp b/modules/juce_core/network/juce_Socket.cpp index b9ab138e98..abb8326217 100644 --- a/modules/juce_core/network/juce_Socket.cpp +++ b/modules/juce_core/network/juce_Socket.cpp @@ -780,6 +780,8 @@ bool DatagramSocket::setEnablePortReuse (bool enabled) #pragma warning (pop) #endif + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/streams/juce_BufferedInputStream.cpp b/modules/juce_core/streams/juce_BufferedInputStream.cpp index 546b275745..ca60c0b975 100644 --- a/modules/juce_core/streams/juce_BufferedInputStream.cpp +++ b/modules/juce_core/streams/juce_BufferedInputStream.cpp @@ -196,6 +196,8 @@ String BufferedInputStream::readString() return InputStream::readString(); } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/streams/juce_MemoryInputStream.cpp b/modules/juce_core/streams/juce_MemoryInputStream.cpp index 12a42ff004..73ac6f55d3 100644 --- a/modules/juce_core/streams/juce_MemoryInputStream.cpp +++ b/modules/juce_core/streams/juce_MemoryInputStream.cpp @@ -95,6 +95,8 @@ void MemoryInputStream::skipNextBytes (int64 numBytesToSkip) setPosition (getPosition() + numBytesToSkip); } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/streams/juce_SubregionStream.cpp b/modules/juce_core/streams/juce_SubregionStream.cpp index a7ff868ca1..a3f09c9c85 100644 --- a/modules/juce_core/streams/juce_SubregionStream.cpp +++ b/modules/juce_core/streams/juce_SubregionStream.cpp @@ -78,6 +78,8 @@ bool SubregionStream::isExhausted() return source->isExhausted(); } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/text/juce_CharacterFunctions.cpp b/modules/juce_core/text/juce_CharacterFunctions.cpp index df5b36cc81..c1295fda41 100644 --- a/modules/juce_core/text/juce_CharacterFunctions.cpp +++ b/modules/juce_core/text/juce_CharacterFunctions.cpp @@ -179,6 +179,8 @@ juce_wchar CharacterFunctions::getUnicodeCharFromWindows1252Codepage (const uint return (juce_wchar) lookup[c - 0x80]; } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/text/juce_String.cpp b/modules/juce_core/text/juce_String.cpp index 416c39ff1c..f614b54a03 100644 --- a/modules/juce_core/text/juce_String.cpp +++ b/modules/juce_core/text/juce_String.cpp @@ -2300,6 +2300,7 @@ static String serialiseDouble (double input) return reduceLengthOfFloatString (String (input, numberOfDecimalPlaces)); } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/text/juce_TextDiff.cpp b/modules/juce_core/text/juce_TextDiff.cpp index 1b41f1fbbb..f916795c43 100644 --- a/modules/juce_core/text/juce_TextDiff.cpp +++ b/modules/juce_core/text/juce_TextDiff.cpp @@ -216,6 +216,7 @@ String TextDiff::Change::appliedTo (const String& text) const noexcept return text.replaceSection (start, length, insertedText); } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/threads/juce_ChildProcess.cpp b/modules/juce_core/threads/juce_ChildProcess.cpp index 011dd03151..709c1dd42c 100644 --- a/modules/juce_core/threads/juce_ChildProcess.cpp +++ b/modules/juce_core/threads/juce_ChildProcess.cpp @@ -80,6 +80,8 @@ String ChildProcess::readAllProcessOutput() return result.toString(); } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/threads/juce_Thread.cpp b/modules/juce_core/threads/juce_Thread.cpp index b37208d8a0..3470a45cd0 100644 --- a/modules/juce_core/threads/juce_Thread.cpp +++ b/modules/juce_core/threads/juce_Thread.cpp @@ -350,9 +350,11 @@ bool JUCE_CALLTYPE Process::isRunningUnderDebugger() noexcept return juce_isRunningUnderDebugger(); } -#if JUCE_UNIT_TESTS //============================================================================== +//============================================================================== +#if JUCE_UNIT_TESTS + class AtomicTests : public UnitTest { public: diff --git a/modules/juce_core/xml/juce_XmlElement.cpp b/modules/juce_core/xml/juce_XmlElement.cpp index 91f6479c55..3b4b15b0da 100644 --- a/modules/juce_core/xml/juce_XmlElement.cpp +++ b/modules/juce_core/xml/juce_XmlElement.cpp @@ -925,6 +925,7 @@ void XmlElement::deleteAllTextElements() noexcept } } +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp b/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp index b46af22f7c..33ff64fa21 100644 --- a/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp +++ b/modules/juce_core/zip/juce_GZIPCompressorOutputStream.cpp @@ -154,6 +154,8 @@ bool GZIPCompressorOutputStream::setPosition (int64 /*newPosition*/) return false; } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp index 16290c0083..e30e838eda 100644 --- a/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp +++ b/modules/juce_core/zip/juce_GZIPDecompressorInputStream.cpp @@ -298,6 +298,8 @@ bool GZIPDecompressorInputStream::setPosition (int64 newPos) return true; } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_core/zip/juce_ZipFile.cpp b/modules/juce_core/zip/juce_ZipFile.cpp index ee8463a47e..61cfd08cd0 100644 --- a/modules/juce_core/zip/juce_ZipFile.cpp +++ b/modules/juce_core/zip/juce_ZipFile.cpp @@ -638,6 +638,8 @@ bool ZipFile::Builder::writeToStream (OutputStream& target, double* const progre return true; } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_cryptography/encryption/juce_BlowFish.cpp b/modules/juce_cryptography/encryption/juce_BlowFish.cpp index a88deb3d36..5ac0ef7c39 100644 --- a/modules/juce_cryptography/encryption/juce_BlowFish.cpp +++ b/modules/juce_cryptography/encryption/juce_BlowFish.cpp @@ -366,6 +366,8 @@ int BlowFish::unpad (const void* data, size_t size) noexcept return static_cast (size - static_cast (paddingSize)); } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_cryptography/hashing/juce_MD5.cpp b/modules/juce_cryptography/hashing/juce_MD5.cpp index d4e2575ed8..4147b9361c 100644 --- a/modules/juce_cryptography/hashing/juce_MD5.cpp +++ b/modules/juce_cryptography/hashing/juce_MD5.cpp @@ -304,6 +304,7 @@ bool MD5::operator== (const MD5& other) const noexcept { return memcmp (result bool MD5::operator!= (const MD5& other) const noexcept { return ! operator== (other); } +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_cryptography/hashing/juce_Whirlpool.cpp b/modules/juce_cryptography/hashing/juce_Whirlpool.cpp index 0078ceda4c..ccb4b84259 100644 --- a/modules/juce_cryptography/hashing/juce_Whirlpool.cpp +++ b/modules/juce_cryptography/hashing/juce_Whirlpool.cpp @@ -623,6 +623,7 @@ bool Whirlpool::operator== (const Whirlpool& other) const noexcept { return mem bool Whirlpool::operator!= (const Whirlpool& other) const noexcept { return ! operator== (other); } +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_data_structures/values/juce_ValueTree.cpp b/modules/juce_data_structures/values/juce_ValueTree.cpp index 8eaa78d98f..de09a0a5cd 100644 --- a/modules/juce_data_structures/values/juce_ValueTree.cpp +++ b/modules/juce_data_structures/values/juce_ValueTree.cpp @@ -1095,6 +1095,8 @@ void ValueTree::Listener::valueTreeChildOrderChanged (ValueTree&, int, int) void ValueTree::Listener::valueTreeParentChanged (ValueTree&) {} void ValueTree::Listener::valueTreeRedirected (ValueTree&) {} + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS diff --git a/modules/juce_gui_basics/layout/juce_Grid.cpp b/modules/juce_gui_basics/layout/juce_Grid.cpp index faf8196a0d..efae9835c5 100644 --- a/modules/juce_gui_basics/layout/juce_Grid.cpp +++ b/modules/juce_gui_basics/layout/juce_Grid.cpp @@ -1260,6 +1260,6 @@ struct GridTests : public UnitTest static GridTests gridUnitTests; -#endif // JUCE_UNIT_TESTS +#endif } // namespace juce diff --git a/modules/juce_osc/osc/juce_OSCAddress.cpp b/modules/juce_osc/osc/juce_OSCAddress.cpp index 39bfc8126d..69a76cab6d 100644 --- a/modules/juce_osc/osc/juce_OSCAddress.cpp +++ b/modules/juce_osc/osc/juce_OSCAddress.cpp @@ -394,6 +394,7 @@ String OSCAddressPattern::toString() const noexcept return asString; } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS @@ -780,6 +781,6 @@ public: static OSCPatternMatcherTests OSCPatternMatcherUnitTests; -#endif // JUCE_UNIT_TESTS +#endif } // namespace juce diff --git a/modules/juce_osc/osc/juce_OSCArgument.cpp b/modules/juce_osc/osc/juce_OSCArgument.cpp index 5b95c6f733..eff89688fe 100644 --- a/modules/juce_osc/osc/juce_OSCArgument.cpp +++ b/modules/juce_osc/osc/juce_OSCArgument.cpp @@ -78,6 +78,7 @@ OSCColour OSCArgument::getColour() const noexcept return { 0, 0, 0, 0 }; } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS @@ -242,6 +243,6 @@ public: static OSCArgumentTests OSCArgumentUnitTests; -#endif // JUCE_UNIT_TESTS +#endif } // namespace juce diff --git a/modules/juce_osc/osc/juce_OSCBundle.cpp b/modules/juce_osc/osc/juce_OSCBundle.cpp index 4f466f3454..0500fd1834 100644 --- a/modules/juce_osc/osc/juce_OSCBundle.cpp +++ b/modules/juce_osc/osc/juce_OSCBundle.cpp @@ -108,6 +108,8 @@ const OSCBundle& OSCBundle::Element::getBundle() const return *bundle; } + +//============================================================================== //============================================================================== #if JUCE_UNIT_TESTS @@ -239,6 +241,6 @@ public: static OSCBundleElementTests OSCBundleElementUnitTests; -#endif // JUCE_UNIT_TESTS +#endif } // namespace juce diff --git a/modules/juce_osc/osc/juce_OSCMessage.cpp b/modules/juce_osc/osc/juce_OSCMessage.cpp index 30e05f2623..d3825e5c68 100644 --- a/modules/juce_osc/osc/juce_OSCMessage.cpp +++ b/modules/juce_osc/osc/juce_OSCMessage.cpp @@ -86,6 +86,7 @@ void OSCMessage::addBlob (MemoryBlock blob) { arguments.add (OSCArgument void OSCMessage::addColour (OSCColour colour) { arguments.add (OSCArgument (colour)); } void OSCMessage::addArgument (OSCArgument arg) { arguments.add (arg); } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS @@ -210,6 +211,6 @@ public: static OSCMessageTests OSCMessageUnitTests; -#endif // JUCE_UNIT_TESTS +#endif } // namespace juce diff --git a/modules/juce_osc/osc/juce_OSCReceiver.cpp b/modules/juce_osc/osc/juce_OSCReceiver.cpp index defc8664d3..f8a146c834 100644 --- a/modules/juce_osc/osc/juce_OSCReceiver.cpp +++ b/modules/juce_osc/osc/juce_OSCReceiver.cpp @@ -1188,6 +1188,6 @@ public: static OSCInputStreamTests OSCInputStreamUnitTests; -#endif // JUCE_UNIT_TESTS +#endif } // namespace juce diff --git a/modules/juce_osc/osc/juce_OSCSender.cpp b/modules/juce_osc/osc/juce_OSCSender.cpp index 6b76d191ac..f6b1e6fc84 100644 --- a/modules/juce_osc/osc/juce_OSCSender.cpp +++ b/modules/juce_osc/osc/juce_OSCSender.cpp @@ -332,6 +332,7 @@ bool OSCSender::send (const OSCBundle& bundle) { return pimpl->send (bundle bool OSCSender::sendToIPAddress (const String& host, int port, const OSCMessage& message) { return pimpl->send (message, host, port); } bool OSCSender::sendToIPAddress (const String& host, int port, const OSCBundle& bundle) { return pimpl->send (bundle, host, port); } + //============================================================================== //============================================================================== #if JUCE_UNIT_TESTS @@ -867,7 +868,6 @@ public: static OSCRoundTripTests OSCRoundTripUnitTests; -//============================================================================== -#endif // JUCE_UNIT_TESTS +#endif } // namespace juce