From 87a7b22314ca9565b4ff3c4937ffbf513a381f30 Mon Sep 17 00:00:00 2001 From: Chris Jones Date: Thu, 5 Jan 2023 16:03:27 -0600 Subject: [PATCH] Moved plugins to FWCore/Integration/plugins These were previously in the test directory. --- .../{test => plugins}/AcquireIntFilter.cc | 2 +- .../{test => plugins}/AcquireIntProducer.cc | 2 +- .../AcquireIntStreamFilter.cc | 2 +- .../AcquireIntStreamProducer.cc | 2 +- .../AssociationMapAnalyzer.cc | 2 +- .../AssociationMapProducer.cc | 2 +- FWCore/Integration/plugins/BuildFile.xml | 132 +++++++++ .../ConcurrentIOVAnalyzer.cc | 2 +- .../ConcurrentIOVESProducer.cc | 2 +- .../ConcurrentIOVESSource.cc | 2 +- .../DelayedReaderThrowingSource.cc | 0 .../DetSetVectorThingProducer.cc | 2 +- .../Integration/{test => plugins}/Doodad.cc | 2 +- FWCore/Integration/{test => plugins}/Doodad.h | 0 .../{test => plugins}/DoodadEDLooper.cc | 0 .../{test => plugins}/DoodadESProducer.cc | 6 +- .../{test => plugins}/DoodadESSource.cc | 14 +- .../{test => plugins}/ESTestAnalyzers.cc | 4 +- .../{test => plugins}/ESTestProducers.cc | 0 .../ExceptionThrowingProducer.cc | 0 .../ExistingDictionaryTestModules.cc | 0 .../{test => plugins}/GadgetRcd.cc | 2 +- .../Integration/{test => plugins}/GadgetRcd.h | 0 .../HierarchicalAlgorithms.h | 0 .../HierarchicalEDProducer.cc | 2 +- .../HierarchicalEDProducer.h | 2 +- .../{test => plugins}/HistProducer.cc | 2 +- .../{test => plugins}/HistProducer.h | 0 .../{test => plugins}/IOVTestInfo.cc | 2 +- .../{test => plugins}/IOVTestInfo.h | 0 .../{test => plugins}/IntSource.cc | 6 +- .../{test => plugins}/ManyProductProducer.cc | 0 .../MissingDictionaryTestProducer.cc | 2 +- .../{test => plugins}/OtherThingAlgorithm.cc | 4 +- .../{test => plugins}/OtherThingAlgorithm.h | 0 .../{test => plugins}/OtherThingAnalyzer.cc | 2 +- .../{test => plugins}/OtherThingProducer.cc | 2 +- .../OtherThingRefComparer.cc | 2 +- .../{test => plugins}/PathAnalyzer.cc | 8 +- .../PathsAndConsumesOfModulesTestService.cc | 0 .../{test => plugins}/PluginUsingProducer.cc | 0 .../{test => plugins}/ProdigalAnalyzer.cc | 0 .../{test => plugins}/ProdigalAnalyzer.h | 0 .../ProducerUsingCollector.cc | 0 .../{test => plugins}/ProducerWithPSetDesc.cc | 7 +- .../{test => plugins}/ProducerWithPSetDesc.h | 0 .../{test => plugins}/PutOrMergeTestSource.cc | 0 .../{test => plugins}/RandomIntProducer.cc | 0 .../{test => plugins}/RunLumiESAnalyzer.cc | 2 +- .../{test => plugins}/RunLumiESSource.cc | 2 +- .../SlimmingDSVThingProducer.cc | 0 .../SlimmingThingProducer.cc | 4 +- .../SwitchProducerProvenanceAnalyzer.cc | 0 .../{test => plugins}/TableTestModules.cc | 2 +- .../TestDescriptionComments.cc | 2 +- .../TestESConcurrentSource.cc | 4 +- .../{test => plugins}/TestESSource.cc | 4 +- .../{test => plugins}/TestFindProduct.cc | 2 +- .../TestGetByLabelAnalyzer.cc | 2 +- .../{test => plugins}/TestGetterOfProducts.cc | 4 +- .../{test => plugins}/TestGlobalOutput.cc | 0 .../{test => plugins}/TestHistoryKeeping.cc | 0 .../{test => plugins}/TestInterProcessProd.cc | 4 +- .../TestInterProcessRandomProd.cc | 4 +- .../{test => plugins}/TestLimitedOutput.cc | 0 .../{test => plugins}/TestOneOutput.cc | 0 .../{test => plugins}/TestPSetAnalyzer.cc | 0 .../{test => plugins}/TestParentage.cc | 2 +- ...stServicesOnNonFrameworkThreadsAnalyzer.cc | 0 .../{test => plugins}/ThingAlgorithm.cc | 2 +- .../{test => plugins}/ThingAlgorithm.h | 0 .../{test => plugins}/ThingAnalyzer.cc | 11 +- .../{test => plugins}/ThingExtSource.cc | 2 +- .../{test => plugins}/ThingExtSource.h | 2 +- .../{test => plugins}/ThingProducer.cc | 2 +- .../{test => plugins}/ThingProducer.h | 2 +- .../{test => plugins}/ThingSource.cc | 2 +- .../{test => plugins}/ThingSource.h | 2 +- .../ThingWithMergeProducer.cc | 2 +- .../ThingWithMergeProducer.h | 2 +- .../ThinnedRefFromTestAnalyzer.cc | 0 .../ThinningDSVTestAnalyzer.cc | 2 +- .../ThinningDSVThingProducer.cc | 0 .../{test => plugins}/ThinningTestAnalyzer.cc | 0 .../ThinningThingProducer.cc | 4 +- .../{test => plugins}/ThrowingSource.cc | 2 +- .../TrackOfDSVThingsProducer.cc | 0 .../TrackOfThingsProducer.cc | 2 +- .../TransformAsyncIntProducer.cc | 0 .../TransformAsyncIntStreamProducer.cc | 0 .../{test => plugins}/TransformIntProducer.cc | 0 .../TransformIntStreamProducer.cc | 0 .../UseValueExampleAnalyzer.cc | 2 +- .../{test => plugins}/ValueExample.cc | 2 +- .../{test => plugins}/ValueExample.h | 4 +- .../{test => plugins}/ValueExamplePlugin.cc | 2 +- .../{test => plugins}/ViewAnalyzer.cc | 2 +- .../{test => plugins}/WaitingServer.cc | 2 +- .../{test => plugins}/WaitingServer.h | 0 .../{test => plugins}/WaitingService.cc | 2 +- .../{test => plugins}/WaitingService.h | 2 +- .../Integration/{test => plugins}/WhatsIt.cc | 2 +- .../Integration/{test => plugins}/WhatsIt.h | 0 .../{test => plugins}/WhatsItAnalyzer.cc | 8 +- .../{test => plugins}/WhatsItESProducer.cc | 8 +- .../WhatsItWatcherAnalyzer.cc | 4 +- FWCore/Integration/test/BuildFile.xml | 253 ------------------ 107 files changed, 234 insertions(+), 357 deletions(-) rename FWCore/Integration/{test => plugins}/AcquireIntFilter.cc (98%) rename FWCore/Integration/{test => plugins}/AcquireIntProducer.cc (98%) rename FWCore/Integration/{test => plugins}/AcquireIntStreamFilter.cc (98%) rename FWCore/Integration/{test => plugins}/AcquireIntStreamProducer.cc (98%) rename FWCore/Integration/{test => plugins}/AssociationMapAnalyzer.cc (99%) rename FWCore/Integration/{test => plugins}/AssociationMapProducer.cc (99%) create mode 100644 FWCore/Integration/plugins/BuildFile.xml rename FWCore/Integration/{test => plugins}/ConcurrentIOVAnalyzer.cc (99%) rename FWCore/Integration/{test => plugins}/ConcurrentIOVESProducer.cc (98%) rename FWCore/Integration/{test => plugins}/ConcurrentIOVESSource.cc (99%) rename FWCore/Integration/{test => plugins}/DelayedReaderThrowingSource.cc (100%) rename FWCore/Integration/{test => plugins}/DetSetVectorThingProducer.cc (98%) rename FWCore/Integration/{test => plugins}/Doodad.cc (88%) rename FWCore/Integration/{test => plugins}/Doodad.h (100%) rename FWCore/Integration/{test => plugins}/DoodadEDLooper.cc (100%) rename FWCore/Integration/{test => plugins}/DoodadESProducer.cc (94%) rename FWCore/Integration/{test => plugins}/DoodadESSource.cc (87%) rename FWCore/Integration/{test => plugins}/ESTestAnalyzers.cc (98%) rename FWCore/Integration/{test => plugins}/ESTestProducers.cc (100%) rename FWCore/Integration/{test => plugins}/ExceptionThrowingProducer.cc (100%) rename FWCore/Integration/{test => plugins}/ExistingDictionaryTestModules.cc (100%) rename FWCore/Integration/{test => plugins}/GadgetRcd.cc (87%) rename FWCore/Integration/{test => plugins}/GadgetRcd.h (100%) rename FWCore/Integration/{test => plugins}/HierarchicalAlgorithms.h (100%) rename FWCore/Integration/{test => plugins}/HierarchicalEDProducer.cc (91%) rename FWCore/Integration/{test => plugins}/HierarchicalEDProducer.h (92%) rename FWCore/Integration/{test => plugins}/HistProducer.cc (92%) rename FWCore/Integration/{test => plugins}/HistProducer.h (100%) rename FWCore/Integration/{test => plugins}/IOVTestInfo.cc (84%) rename FWCore/Integration/{test => plugins}/IOVTestInfo.h (100%) rename FWCore/Integration/{test => plugins}/IntSource.cc (88%) rename FWCore/Integration/{test => plugins}/ManyProductProducer.cc (100%) rename FWCore/Integration/{test => plugins}/MissingDictionaryTestProducer.cc (98%) rename FWCore/Integration/{test => plugins}/OtherThingAlgorithm.cc (97%) rename FWCore/Integration/{test => plugins}/OtherThingAlgorithm.h (100%) rename FWCore/Integration/{test => plugins}/OtherThingAnalyzer.cc (99%) rename FWCore/Integration/{test => plugins}/OtherThingProducer.cc (98%) rename FWCore/Integration/{test => plugins}/OtherThingRefComparer.cc (97%) rename FWCore/Integration/{test => plugins}/PathAnalyzer.cc (92%) rename FWCore/Integration/{test => plugins}/PathsAndConsumesOfModulesTestService.cc (100%) rename FWCore/Integration/{test => plugins}/PluginUsingProducer.cc (100%) rename FWCore/Integration/{test => plugins}/ProdigalAnalyzer.cc (100%) rename FWCore/Integration/{test => plugins}/ProdigalAnalyzer.h (100%) rename FWCore/Integration/{test => plugins}/ProducerUsingCollector.cc (100%) rename FWCore/Integration/{test => plugins}/ProducerWithPSetDesc.cc (99%) rename FWCore/Integration/{test => plugins}/ProducerWithPSetDesc.h (100%) rename FWCore/Integration/{test => plugins}/PutOrMergeTestSource.cc (100%) rename FWCore/Integration/{test => plugins}/RandomIntProducer.cc (100%) rename FWCore/Integration/{test => plugins}/RunLumiESAnalyzer.cc (99%) rename FWCore/Integration/{test => plugins}/RunLumiESSource.cc (98%) rename FWCore/Integration/{test => plugins}/SlimmingDSVThingProducer.cc (100%) rename FWCore/Integration/{test => plugins}/SlimmingThingProducer.cc (98%) rename FWCore/Integration/{test => plugins}/SwitchProducerProvenanceAnalyzer.cc (100%) rename FWCore/Integration/{test => plugins}/TableTestModules.cc (99%) rename FWCore/Integration/{test => plugins}/TestDescriptionComments.cc (98%) rename FWCore/Integration/{test => plugins}/TestESConcurrentSource.cc (99%) rename FWCore/Integration/{test => plugins}/TestESSource.cc (99%) rename FWCore/Integration/{test => plugins}/TestFindProduct.cc (99%) rename FWCore/Integration/{test => plugins}/TestGetByLabelAnalyzer.cc (98%) rename FWCore/Integration/{test => plugins}/TestGetterOfProducts.cc (99%) rename FWCore/Integration/{test => plugins}/TestGlobalOutput.cc (100%) rename FWCore/Integration/{test => plugins}/TestHistoryKeeping.cc (100%) rename FWCore/Integration/{test => plugins}/TestInterProcessProd.cc (99%) rename FWCore/Integration/{test => plugins}/TestInterProcessRandomProd.cc (99%) rename FWCore/Integration/{test => plugins}/TestLimitedOutput.cc (100%) rename FWCore/Integration/{test => plugins}/TestOneOutput.cc (100%) rename FWCore/Integration/{test => plugins}/TestPSetAnalyzer.cc (100%) rename FWCore/Integration/{test => plugins}/TestParentage.cc (98%) rename FWCore/Integration/{test => plugins}/TestServicesOnNonFrameworkThreadsAnalyzer.cc (100%) rename FWCore/Integration/{test => plugins}/ThingAlgorithm.cc (89%) rename FWCore/Integration/{test => plugins}/ThingAlgorithm.h (100%) rename FWCore/Integration/{test => plugins}/ThingAnalyzer.cc (94%) rename FWCore/Integration/{test => plugins}/ThingExtSource.cc (98%) rename FWCore/Integration/{test => plugins}/ThingExtSource.h (96%) rename FWCore/Integration/{test => plugins}/ThingProducer.cc (98%) rename FWCore/Integration/{test => plugins}/ThingProducer.h (97%) rename FWCore/Integration/{test => plugins}/ThingSource.cc (98%) rename FWCore/Integration/{test => plugins}/ThingSource.h (96%) rename FWCore/Integration/{test => plugins}/ThingWithMergeProducer.cc (99%) rename FWCore/Integration/{test => plugins}/ThingWithMergeProducer.h (97%) rename FWCore/Integration/{test => plugins}/ThinnedRefFromTestAnalyzer.cc (100%) rename FWCore/Integration/{test => plugins}/ThinningDSVTestAnalyzer.cc (99%) rename FWCore/Integration/{test => plugins}/ThinningDSVThingProducer.cc (100%) rename FWCore/Integration/{test => plugins}/ThinningTestAnalyzer.cc (100%) rename FWCore/Integration/{test => plugins}/ThinningThingProducer.cc (98%) rename FWCore/Integration/{test => plugins}/ThrowingSource.cc (99%) rename FWCore/Integration/{test => plugins}/TrackOfDSVThingsProducer.cc (100%) rename FWCore/Integration/{test => plugins}/TrackOfThingsProducer.cc (98%) rename FWCore/Integration/{test => plugins}/TransformAsyncIntProducer.cc (100%) rename FWCore/Integration/{test => plugins}/TransformAsyncIntStreamProducer.cc (100%) rename FWCore/Integration/{test => plugins}/TransformIntProducer.cc (100%) rename FWCore/Integration/{test => plugins}/TransformIntStreamProducer.cc (100%) rename FWCore/Integration/{test => plugins}/UseValueExampleAnalyzer.cc (97%) rename FWCore/Integration/{test => plugins}/ValueExample.cc (93%) rename FWCore/Integration/{test => plugins}/ValueExample.h (87%) rename FWCore/Integration/{test => plugins}/ValueExamplePlugin.cc (89%) rename FWCore/Integration/{test => plugins}/ViewAnalyzer.cc (99%) rename FWCore/Integration/{test => plugins}/WaitingServer.cc (97%) rename FWCore/Integration/{test => plugins}/WaitingServer.h (100%) rename FWCore/Integration/{test => plugins}/WaitingService.cc (96%) rename FWCore/Integration/{test => plugins}/WaitingService.h (96%) rename FWCore/Integration/{test => plugins}/WhatsIt.cc (88%) rename FWCore/Integration/{test => plugins}/WhatsIt.h (100%) rename FWCore/Integration/{test => plugins}/WhatsItAnalyzer.cc (94%) rename FWCore/Integration/{test => plugins}/WhatsItESProducer.cc (97%) rename FWCore/Integration/{test => plugins}/WhatsItWatcherAnalyzer.cc (96%) diff --git a/FWCore/Integration/test/AcquireIntFilter.cc b/FWCore/Integration/plugins/AcquireIntFilter.cc similarity index 98% rename from FWCore/Integration/test/AcquireIntFilter.cc rename to FWCore/Integration/plugins/AcquireIntFilter.cc index b162a84c8e49a..6f78f6d33e24c 100644 --- a/FWCore/Integration/test/AcquireIntFilter.cc +++ b/FWCore/Integration/plugins/AcquireIntFilter.cc @@ -5,7 +5,7 @@ #include "FWCore/Framework/interface/global/EDFilter.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/PreallocationConfiguration.h" -#include "FWCore/Integration/test/WaitingServer.h" +#include "WaitingServer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/EDGetToken.h" #include "FWCore/Utilities/interface/InputTag.h" diff --git a/FWCore/Integration/test/AcquireIntProducer.cc b/FWCore/Integration/plugins/AcquireIntProducer.cc similarity index 98% rename from FWCore/Integration/test/AcquireIntProducer.cc rename to FWCore/Integration/plugins/AcquireIntProducer.cc index 4debcf6838094..fa1ccdab79342 100644 --- a/FWCore/Integration/test/AcquireIntProducer.cc +++ b/FWCore/Integration/plugins/AcquireIntProducer.cc @@ -5,7 +5,7 @@ #include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/PreallocationConfiguration.h" -#include "FWCore/Integration/test/WaitingServer.h" +#include "WaitingServer.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/Utilities/interface/EDGetToken.h" #include "FWCore/Utilities/interface/InputTag.h" diff --git a/FWCore/Integration/test/AcquireIntStreamFilter.cc b/FWCore/Integration/plugins/AcquireIntStreamFilter.cc similarity index 98% rename from FWCore/Integration/test/AcquireIntStreamFilter.cc rename to FWCore/Integration/plugins/AcquireIntStreamFilter.cc index d435144ef426e..3f94c29824a37 100644 --- a/FWCore/Integration/test/AcquireIntStreamFilter.cc +++ b/FWCore/Integration/plugins/AcquireIntStreamFilter.cc @@ -4,7 +4,7 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/stream/EDFilter.h" #include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/Integration/test/WaitingService.h" +#include "WaitingService.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Utilities/interface/EDGetToken.h" diff --git a/FWCore/Integration/test/AcquireIntStreamProducer.cc b/FWCore/Integration/plugins/AcquireIntStreamProducer.cc similarity index 98% rename from FWCore/Integration/test/AcquireIntStreamProducer.cc rename to FWCore/Integration/plugins/AcquireIntStreamProducer.cc index 2e7e57e6e94ed..a23aa3aa9a5e5 100644 --- a/FWCore/Integration/test/AcquireIntStreamProducer.cc +++ b/FWCore/Integration/plugins/AcquireIntStreamProducer.cc @@ -4,7 +4,7 @@ #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/stream/EDProducer.h" #include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/Integration/test/WaitingService.h" +#include "WaitingService.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Utilities/interface/EDGetToken.h" diff --git a/FWCore/Integration/test/AssociationMapAnalyzer.cc b/FWCore/Integration/plugins/AssociationMapAnalyzer.cc similarity index 99% rename from FWCore/Integration/test/AssociationMapAnalyzer.cc rename to FWCore/Integration/plugins/AssociationMapAnalyzer.cc index acae3360a00e3..36abd13fc910b 100644 --- a/FWCore/Integration/test/AssociationMapAnalyzer.cc +++ b/FWCore/Integration/plugins/AssociationMapAnalyzer.cc @@ -31,7 +31,7 @@ namespace edmtest { typedef edm::AssociationMap, edm::View>> AssocOneToOneView; explicit AssociationMapAnalyzer(edm::ParameterSet const&); - virtual void analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const override; + void analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const override; edm::EDGetTokenT> inputToken1_; edm::EDGetTokenT> inputToken2_; diff --git a/FWCore/Integration/test/AssociationMapProducer.cc b/FWCore/Integration/plugins/AssociationMapProducer.cc similarity index 99% rename from FWCore/Integration/test/AssociationMapProducer.cc rename to FWCore/Integration/plugins/AssociationMapProducer.cc index d015213a95b15..91b933c6945ff 100644 --- a/FWCore/Integration/test/AssociationMapProducer.cc +++ b/FWCore/Integration/plugins/AssociationMapProducer.cc @@ -29,7 +29,7 @@ namespace edmtest { class AssociationMapProducer : public edm::one::EDProducer<> { public: explicit AssociationMapProducer(edm::ParameterSet const&); - virtual ~AssociationMapProducer(); + ~AssociationMapProducer() override; void produce(edm::Event&, edm::EventSetup const&) override; diff --git a/FWCore/Integration/plugins/BuildFile.xml b/FWCore/Integration/plugins/BuildFile.xml new file mode 100644 index 0000000000000..67e3251067b8b --- /dev/null +++ b/FWCore/Integration/plugins/BuildFile.xml @@ -0,0 +1,132 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FWCore/Integration/test/ConcurrentIOVAnalyzer.cc b/FWCore/Integration/plugins/ConcurrentIOVAnalyzer.cc similarity index 99% rename from FWCore/Integration/test/ConcurrentIOVAnalyzer.cc rename to FWCore/Integration/plugins/ConcurrentIOVAnalyzer.cc index 009ceb4d1c5f4..8d7b6d3e15dc0 100644 --- a/FWCore/Integration/test/ConcurrentIOVAnalyzer.cc +++ b/FWCore/Integration/plugins/ConcurrentIOVAnalyzer.cc @@ -17,7 +17,7 @@ #include "FWCore/Framework/interface/EventSetup.h" #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Integration/interface/ESTestRecords.h" -#include "FWCore/Integration/test/IOVTestInfo.h" +#include "IOVTestInfo.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" diff --git a/FWCore/Integration/test/ConcurrentIOVESProducer.cc b/FWCore/Integration/plugins/ConcurrentIOVESProducer.cc similarity index 98% rename from FWCore/Integration/test/ConcurrentIOVESProducer.cc rename to FWCore/Integration/plugins/ConcurrentIOVESProducer.cc index 7df82e1e3e529..e5fe26042db9f 100644 --- a/FWCore/Integration/test/ConcurrentIOVESProducer.cc +++ b/FWCore/Integration/plugins/ConcurrentIOVESProducer.cc @@ -15,7 +15,7 @@ #include "FWCore/Framework/interface/ESProducer.h" #include "FWCore/Framework/interface/ModuleFactory.h" #include "FWCore/Integration/interface/ESTestRecords.h" -#include "FWCore/Integration/test/IOVTestInfo.h" +#include "IOVTestInfo.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" diff --git a/FWCore/Integration/test/ConcurrentIOVESSource.cc b/FWCore/Integration/plugins/ConcurrentIOVESSource.cc similarity index 99% rename from FWCore/Integration/test/ConcurrentIOVESSource.cc rename to FWCore/Integration/plugins/ConcurrentIOVESSource.cc index 8a05df4b4579c..667d5901f5dac 100644 --- a/FWCore/Integration/test/ConcurrentIOVESSource.cc +++ b/FWCore/Integration/plugins/ConcurrentIOVESSource.cc @@ -19,7 +19,7 @@ #include "FWCore/Framework/interface/ValidityInterval.h" #include "FWCore/Integration/interface/ESTestData.h" #include "FWCore/Integration/interface/ESTestRecords.h" -#include "FWCore/Integration/test/IOVTestInfo.h" +#include "IOVTestInfo.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" diff --git a/FWCore/Integration/test/DelayedReaderThrowingSource.cc b/FWCore/Integration/plugins/DelayedReaderThrowingSource.cc similarity index 100% rename from FWCore/Integration/test/DelayedReaderThrowingSource.cc rename to FWCore/Integration/plugins/DelayedReaderThrowingSource.cc diff --git a/FWCore/Integration/test/DetSetVectorThingProducer.cc b/FWCore/Integration/plugins/DetSetVectorThingProducer.cc similarity index 98% rename from FWCore/Integration/test/DetSetVectorThingProducer.cc rename to FWCore/Integration/plugins/DetSetVectorThingProducer.cc index 7ffe2ee5f0723..ec4a4ae2a73df 100644 --- a/FWCore/Integration/test/DetSetVectorThingProducer.cc +++ b/FWCore/Integration/plugins/DetSetVectorThingProducer.cc @@ -1,6 +1,6 @@ #include "DataFormats/Common/interface/DetSetVectorNew.h" #include "DataFormats/TestObjects/interface/ThingCollection.h" -#include "FWCore/Integration/test/ThingAlgorithm.h" +#include "ThingAlgorithm.h" #include "FWCore/Framework/interface/global/EDProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/FWCore/Integration/test/Doodad.cc b/FWCore/Integration/plugins/Doodad.cc similarity index 88% rename from FWCore/Integration/test/Doodad.cc rename to FWCore/Integration/plugins/Doodad.cc index 1acba7464cd12..4fb029efffd66 100644 --- a/FWCore/Integration/test/Doodad.cc +++ b/FWCore/Integration/plugins/Doodad.cc @@ -13,7 +13,7 @@ // system include files // user include files -#include "FWCore/Integration/test/Doodad.h" +#include "Doodad.h" #include "FWCore/Utilities/interface/typelookup.h" diff --git a/FWCore/Integration/test/Doodad.h b/FWCore/Integration/plugins/Doodad.h similarity index 100% rename from FWCore/Integration/test/Doodad.h rename to FWCore/Integration/plugins/Doodad.h diff --git a/FWCore/Integration/test/DoodadEDLooper.cc b/FWCore/Integration/plugins/DoodadEDLooper.cc similarity index 100% rename from FWCore/Integration/test/DoodadEDLooper.cc rename to FWCore/Integration/plugins/DoodadEDLooper.cc diff --git a/FWCore/Integration/test/DoodadESProducer.cc b/FWCore/Integration/plugins/DoodadESProducer.cc similarity index 94% rename from FWCore/Integration/test/DoodadESProducer.cc rename to FWCore/Integration/plugins/DoodadESProducer.cc index deeb601f1221c..8ba4732ebd352 100644 --- a/FWCore/Integration/test/DoodadESProducer.cc +++ b/FWCore/Integration/plugins/DoodadESProducer.cc @@ -20,8 +20,8 @@ #include "FWCore/Framework/interface/ESProducer.h" #include "FWCore/Framework/interface/ModuleFactory.h" -#include "FWCore/Integration/test/Doodad.h" -#include "FWCore/Integration/test/GadgetRcd.h" +#include "Doodad.h" +#include "GadgetRcd.h" // system include files #include @@ -35,7 +35,7 @@ namespace edmtest { class DoodadESProducer : public edm::ESProducer { public: DoodadESProducer(edm::ParameterSet const&); - ~DoodadESProducer(); + ~DoodadESProducer() override; typedef std::unique_ptr ReturnType; diff --git a/FWCore/Integration/test/DoodadESSource.cc b/FWCore/Integration/plugins/DoodadESSource.cc similarity index 87% rename from FWCore/Integration/test/DoodadESSource.cc rename to FWCore/Integration/plugins/DoodadESSource.cc index 9d4f5974674dc..094f63b2c6a34 100644 --- a/FWCore/Integration/test/DoodadESSource.cc +++ b/FWCore/Integration/plugins/DoodadESSource.cc @@ -19,8 +19,8 @@ #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" -#include "FWCore/Integration/test/GadgetRcd.h" -#include "FWCore/Integration/test/Doodad.h" +#include "GadgetRcd.h" +#include "Doodad.h" #include "FWCore/Utilities/interface/EDMException.h" namespace edmtest { @@ -33,14 +33,14 @@ namespace edmtest { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); protected: - virtual void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&, - const edm::IOVSyncValue& iTime, - edm::ValidityInterval& iInterval); + void setIntervalFor(const edm::eventsetup::EventSetupRecordKey&, + const edm::IOVSyncValue& iTime, + edm::ValidityInterval& iInterval) override; private: - DoodadESSource(const DoodadESSource&); // stop default + DoodadESSource(const DoodadESSource&) = delete; // stop default - const DoodadESSource& operator=(const DoodadESSource&); // stop default + const DoodadESSource& operator=(const DoodadESSource&) = delete; // stop default // ---------- member data -------------------------------- unsigned int nCalls_; diff --git a/FWCore/Integration/test/ESTestAnalyzers.cc b/FWCore/Integration/plugins/ESTestAnalyzers.cc similarity index 98% rename from FWCore/Integration/test/ESTestAnalyzers.cc rename to FWCore/Integration/plugins/ESTestAnalyzers.cc index 068ade2c012ee..2c5c8936b697e 100644 --- a/FWCore/Integration/test/ESTestAnalyzers.cc +++ b/FWCore/Integration/plugins/ESTestAnalyzers.cc @@ -23,7 +23,7 @@ namespace edmtest { class ESTestAnalyzerA : public edm::stream::EDAnalyzer<> { public: explicit ESTestAnalyzerA(edm::ParameterSet const&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); @@ -70,7 +70,7 @@ namespace edmtest { class ESTestAnalyzerB : public edm::one::EDAnalyzer<> { public: explicit ESTestAnalyzerB(edm::ParameterSet const&); - virtual void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); diff --git a/FWCore/Integration/test/ESTestProducers.cc b/FWCore/Integration/plugins/ESTestProducers.cc similarity index 100% rename from FWCore/Integration/test/ESTestProducers.cc rename to FWCore/Integration/plugins/ESTestProducers.cc diff --git a/FWCore/Integration/test/ExceptionThrowingProducer.cc b/FWCore/Integration/plugins/ExceptionThrowingProducer.cc similarity index 100% rename from FWCore/Integration/test/ExceptionThrowingProducer.cc rename to FWCore/Integration/plugins/ExceptionThrowingProducer.cc diff --git a/FWCore/Integration/test/ExistingDictionaryTestModules.cc b/FWCore/Integration/plugins/ExistingDictionaryTestModules.cc similarity index 100% rename from FWCore/Integration/test/ExistingDictionaryTestModules.cc rename to FWCore/Integration/plugins/ExistingDictionaryTestModules.cc diff --git a/FWCore/Integration/test/GadgetRcd.cc b/FWCore/Integration/plugins/GadgetRcd.cc similarity index 87% rename from FWCore/Integration/test/GadgetRcd.cc rename to FWCore/Integration/plugins/GadgetRcd.cc index bf3ba8bbfd9e1..e202af45e35a8 100644 --- a/FWCore/Integration/test/GadgetRcd.cc +++ b/FWCore/Integration/plugins/GadgetRcd.cc @@ -9,7 +9,7 @@ // Author: Chris Jones // Created: Fri Jun 24 13:44:48 EDT 2005 -#include "FWCore/Integration/test/GadgetRcd.h" +#include "GadgetRcd.h" #include "FWCore/Framework/interface/eventsetuprecord_registration_macro.h" EVENTSETUP_RECORD_REG(GadgetRcd); diff --git a/FWCore/Integration/test/GadgetRcd.h b/FWCore/Integration/plugins/GadgetRcd.h similarity index 100% rename from FWCore/Integration/test/GadgetRcd.h rename to FWCore/Integration/plugins/GadgetRcd.h diff --git a/FWCore/Integration/test/HierarchicalAlgorithms.h b/FWCore/Integration/plugins/HierarchicalAlgorithms.h similarity index 100% rename from FWCore/Integration/test/HierarchicalAlgorithms.h rename to FWCore/Integration/plugins/HierarchicalAlgorithms.h diff --git a/FWCore/Integration/test/HierarchicalEDProducer.cc b/FWCore/Integration/plugins/HierarchicalEDProducer.cc similarity index 91% rename from FWCore/Integration/test/HierarchicalEDProducer.cc rename to FWCore/Integration/plugins/HierarchicalEDProducer.cc index 982016e48723e..9492de8bef69d 100644 --- a/FWCore/Integration/test/HierarchicalEDProducer.cc +++ b/FWCore/Integration/plugins/HierarchicalEDProducer.cc @@ -1,5 +1,5 @@ #include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/Integration/test/HierarchicalEDProducer.h" +#include "HierarchicalEDProducer.h" namespace edmtest { diff --git a/FWCore/Integration/test/HierarchicalEDProducer.h b/FWCore/Integration/plugins/HierarchicalEDProducer.h similarity index 92% rename from FWCore/Integration/test/HierarchicalEDProducer.h rename to FWCore/Integration/plugins/HierarchicalEDProducer.h index 85269bb4e0426..8bad6c15ee355 100644 --- a/FWCore/Integration/test/HierarchicalEDProducer.h +++ b/FWCore/Integration/plugins/HierarchicalEDProducer.h @@ -10,7 +10,7 @@ #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/global/EDProducer.h" -#include "FWCore/Integration/test/HierarchicalAlgorithms.h" +#include "HierarchicalAlgorithms.h" namespace edmtest { class HierarchicalEDProducer : public edm::global::EDProducer<> { diff --git a/FWCore/Integration/test/HistProducer.cc b/FWCore/Integration/plugins/HistProducer.cc similarity index 92% rename from FWCore/Integration/test/HistProducer.cc rename to FWCore/Integration/plugins/HistProducer.cc index 72fc81370422b..74ac8be71af7c 100644 --- a/FWCore/Integration/test/HistProducer.cc +++ b/FWCore/Integration/plugins/HistProducer.cc @@ -1,6 +1,6 @@ #include "TH1F.h" -#include "FWCore/Integration/test/HistProducer.h" +#include "HistProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" diff --git a/FWCore/Integration/test/HistProducer.h b/FWCore/Integration/plugins/HistProducer.h similarity index 100% rename from FWCore/Integration/test/HistProducer.h rename to FWCore/Integration/plugins/HistProducer.h diff --git a/FWCore/Integration/test/IOVTestInfo.cc b/FWCore/Integration/plugins/IOVTestInfo.cc similarity index 84% rename from FWCore/Integration/test/IOVTestInfo.cc rename to FWCore/Integration/plugins/IOVTestInfo.cc index 9712976774e37..050dce8b12e43 100644 --- a/FWCore/Integration/test/IOVTestInfo.cc +++ b/FWCore/Integration/plugins/IOVTestInfo.cc @@ -7,7 +7,7 @@ // Created: 21 March 2019 // -#include "FWCore/Integration/test/IOVTestInfo.h" +#include "IOVTestInfo.h" #include "FWCore/Utilities/interface/typelookup.h" diff --git a/FWCore/Integration/test/IOVTestInfo.h b/FWCore/Integration/plugins/IOVTestInfo.h similarity index 100% rename from FWCore/Integration/test/IOVTestInfo.h rename to FWCore/Integration/plugins/IOVTestInfo.h diff --git a/FWCore/Integration/test/IntSource.cc b/FWCore/Integration/plugins/IntSource.cc similarity index 88% rename from FWCore/Integration/test/IntSource.cc rename to FWCore/Integration/plugins/IntSource.cc index 1713ad7232d86..ec5e58735459d 100644 --- a/FWCore/Integration/test/IntSource.cc +++ b/FWCore/Integration/plugins/IntSource.cc @@ -13,12 +13,12 @@ namespace edm { class IntSource : public ProducerSourceBase { public: explicit IntSource(ParameterSet const&, InputSourceDescription const&); - ~IntSource(); + ~IntSource() override; static void fillDescriptions(ConfigurationDescriptions& descriptions); private: - virtual bool setRunAndEventInfo(EventID& id, TimeValue_t& time, edm::EventAuxiliary::ExperimentType& eType); - virtual void produce(Event&); + bool setRunAndEventInfo(EventID& id, TimeValue_t& time, edm::EventAuxiliary::ExperimentType& eType) override; + void produce(Event&) override; }; IntSource::IntSource(ParameterSet const& pset, InputSourceDescription const& desc) diff --git a/FWCore/Integration/test/ManyProductProducer.cc b/FWCore/Integration/plugins/ManyProductProducer.cc similarity index 100% rename from FWCore/Integration/test/ManyProductProducer.cc rename to FWCore/Integration/plugins/ManyProductProducer.cc diff --git a/FWCore/Integration/test/MissingDictionaryTestProducer.cc b/FWCore/Integration/plugins/MissingDictionaryTestProducer.cc similarity index 98% rename from FWCore/Integration/test/MissingDictionaryTestProducer.cc rename to FWCore/Integration/plugins/MissingDictionaryTestProducer.cc index 84d3347c6db22..163d1c3fc8b91 100644 --- a/FWCore/Integration/test/MissingDictionaryTestProducer.cc +++ b/FWCore/Integration/plugins/MissingDictionaryTestProducer.cc @@ -29,7 +29,7 @@ namespace edmtest { class MissingDictionaryTestProducer : public edm::one::EDProducer<> { public: explicit MissingDictionaryTestProducer(edm::ParameterSet const&); - virtual ~MissingDictionaryTestProducer(); + ~MissingDictionaryTestProducer() override; void produce(edm::Event&, edm::EventSetup const&) override; diff --git a/FWCore/Integration/test/OtherThingAlgorithm.cc b/FWCore/Integration/plugins/OtherThingAlgorithm.cc similarity index 97% rename from FWCore/Integration/test/OtherThingAlgorithm.cc rename to FWCore/Integration/plugins/OtherThingAlgorithm.cc index 714cd94662f43..b9945642a0d3d 100644 --- a/FWCore/Integration/test/OtherThingAlgorithm.cc +++ b/FWCore/Integration/plugins/OtherThingAlgorithm.cc @@ -1,4 +1,4 @@ -#include "FWCore/Integration/test/OtherThingAlgorithm.h" +#include "OtherThingAlgorithm.h" #include "FWCore/Framework/interface/Event.h" #include "DataFormats/TestObjects/interface/OtherThing.h" #include "DataFormats/Common/interface/Handle.h" @@ -11,7 +11,7 @@ namespace edmtest { bool refsAreTransient) const { const size_t numToMake = 20; result.reserve(numToMake); - ThingCollection const* null = 0; + ThingCollection const* null = nullptr; ThingCollection const* parent = nullptr; if (useRefs) { parent = parentHandle.product(); diff --git a/FWCore/Integration/test/OtherThingAlgorithm.h b/FWCore/Integration/plugins/OtherThingAlgorithm.h similarity index 100% rename from FWCore/Integration/test/OtherThingAlgorithm.h rename to FWCore/Integration/plugins/OtherThingAlgorithm.h diff --git a/FWCore/Integration/test/OtherThingAnalyzer.cc b/FWCore/Integration/plugins/OtherThingAnalyzer.cc similarity index 99% rename from FWCore/Integration/test/OtherThingAnalyzer.cc rename to FWCore/Integration/plugins/OtherThingAnalyzer.cc index 74a200ef6a58a..23832ea046e46 100644 --- a/FWCore/Integration/test/OtherThingAnalyzer.cc +++ b/FWCore/Integration/plugins/OtherThingAnalyzer.cc @@ -16,7 +16,7 @@ namespace edmtest { public: explicit OtherThingAnalyzer(edm::ParameterSet const& pset); - virtual void analyze(edm::Event const& e, edm::EventSetup const& c) override; + void analyze(edm::Event const& e, edm::EventSetup const& c) override; void doit(edm::Event const& event, std::string const& label); diff --git a/FWCore/Integration/test/OtherThingProducer.cc b/FWCore/Integration/plugins/OtherThingProducer.cc similarity index 98% rename from FWCore/Integration/test/OtherThingProducer.cc rename to FWCore/Integration/plugins/OtherThingProducer.cc index 9e03d2f55cb67..c3d7d9697efb3 100644 --- a/FWCore/Integration/test/OtherThingProducer.cc +++ b/FWCore/Integration/plugins/OtherThingProducer.cc @@ -6,7 +6,7 @@ #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/global/EDProducer.h" -#include "FWCore/Integration/test/OtherThingAlgorithm.h" +#include "OtherThingAlgorithm.h" #include "FWCore/Utilities/interface/EDGetToken.h" #include "FWCore/Utilities/interface/EDPutToken.h" #include "FWCore/Utilities/interface/InputTag.h" diff --git a/FWCore/Integration/test/OtherThingRefComparer.cc b/FWCore/Integration/plugins/OtherThingRefComparer.cc similarity index 97% rename from FWCore/Integration/test/OtherThingRefComparer.cc rename to FWCore/Integration/plugins/OtherThingRefComparer.cc index 110654209f9e3..8eaeeff89694e 100644 --- a/FWCore/Integration/test/OtherThingRefComparer.cc +++ b/FWCore/Integration/plugins/OtherThingRefComparer.cc @@ -17,7 +17,7 @@ namespace edmtest { public: explicit OtherThingRefComparer(edm::ParameterSet const& pset); - virtual void analyze(edm::Event const& e, edm::EventSetup const& c) override; + void analyze(edm::Event const& e, edm::EventSetup const& c) override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); diff --git a/FWCore/Integration/test/PathAnalyzer.cc b/FWCore/Integration/plugins/PathAnalyzer.cc similarity index 92% rename from FWCore/Integration/test/PathAnalyzer.cc rename to FWCore/Integration/plugins/PathAnalyzer.cc index 738fa31ff5f1f..9a5804d651a93 100644 --- a/FWCore/Integration/test/PathAnalyzer.cc +++ b/FWCore/Integration/plugins/PathAnalyzer.cc @@ -15,11 +15,11 @@ namespace edmtest { class PathAnalyzer : public edm::global::EDAnalyzer<> { public: explicit PathAnalyzer(edm::ParameterSet const&); - virtual ~PathAnalyzer(); + ~PathAnalyzer() override; - virtual void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const; - virtual void beginJob(); - virtual void endJob(); + void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override; + void beginJob() override; + void endJob() override; private: void dumpTriggerNamesServiceInfo(char const* where) const; diff --git a/FWCore/Integration/test/PathsAndConsumesOfModulesTestService.cc b/FWCore/Integration/plugins/PathsAndConsumesOfModulesTestService.cc similarity index 100% rename from FWCore/Integration/test/PathsAndConsumesOfModulesTestService.cc rename to FWCore/Integration/plugins/PathsAndConsumesOfModulesTestService.cc diff --git a/FWCore/Integration/test/PluginUsingProducer.cc b/FWCore/Integration/plugins/PluginUsingProducer.cc similarity index 100% rename from FWCore/Integration/test/PluginUsingProducer.cc rename to FWCore/Integration/plugins/PluginUsingProducer.cc diff --git a/FWCore/Integration/test/ProdigalAnalyzer.cc b/FWCore/Integration/plugins/ProdigalAnalyzer.cc similarity index 100% rename from FWCore/Integration/test/ProdigalAnalyzer.cc rename to FWCore/Integration/plugins/ProdigalAnalyzer.cc diff --git a/FWCore/Integration/test/ProdigalAnalyzer.h b/FWCore/Integration/plugins/ProdigalAnalyzer.h similarity index 100% rename from FWCore/Integration/test/ProdigalAnalyzer.h rename to FWCore/Integration/plugins/ProdigalAnalyzer.h diff --git a/FWCore/Integration/test/ProducerUsingCollector.cc b/FWCore/Integration/plugins/ProducerUsingCollector.cc similarity index 100% rename from FWCore/Integration/test/ProducerUsingCollector.cc rename to FWCore/Integration/plugins/ProducerUsingCollector.cc diff --git a/FWCore/Integration/test/ProducerWithPSetDesc.cc b/FWCore/Integration/plugins/ProducerWithPSetDesc.cc similarity index 99% rename from FWCore/Integration/test/ProducerWithPSetDesc.cc rename to FWCore/Integration/plugins/ProducerWithPSetDesc.cc index 2e9d277267989..618708d9b71d4 100644 --- a/FWCore/Integration/test/ProducerWithPSetDesc.cc +++ b/FWCore/Integration/plugins/ProducerWithPSetDesc.cc @@ -1,4 +1,4 @@ -#include "FWCore/Integration/test/ProducerWithPSetDesc.h" +#include "ProducerWithPSetDesc.h" #include "DataFormats/TestObjects/interface/ThingCollection.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/MakerMacros.h" @@ -461,9 +461,8 @@ namespace edmtest { edm::ParameterSet const& psetAllowed = ps.getParameterSet("allowedLabelsPset"); if (testingAutoGeneratedCfi) { - assert(psetAllowed.getParameter>("testAllowedLabels") == std::vector()); - assert(psetAllowed.getUntrackedParameter>("testAllowedLabelsUntracked") == - std::vector()); + assert(psetAllowed.getParameter>("testAllowedLabels").empty()); + assert(psetAllowed.getUntrackedParameter>("testAllowedLabelsUntracked").empty()); assert(!psetAllowed.exists("testOptAllowedLabels")); assert(!psetAllowed.exists("testOptAllowedLabelsUntracked")); } diff --git a/FWCore/Integration/test/ProducerWithPSetDesc.h b/FWCore/Integration/plugins/ProducerWithPSetDesc.h similarity index 100% rename from FWCore/Integration/test/ProducerWithPSetDesc.h rename to FWCore/Integration/plugins/ProducerWithPSetDesc.h diff --git a/FWCore/Integration/test/PutOrMergeTestSource.cc b/FWCore/Integration/plugins/PutOrMergeTestSource.cc similarity index 100% rename from FWCore/Integration/test/PutOrMergeTestSource.cc rename to FWCore/Integration/plugins/PutOrMergeTestSource.cc diff --git a/FWCore/Integration/test/RandomIntProducer.cc b/FWCore/Integration/plugins/RandomIntProducer.cc similarity index 100% rename from FWCore/Integration/test/RandomIntProducer.cc rename to FWCore/Integration/plugins/RandomIntProducer.cc diff --git a/FWCore/Integration/test/RunLumiESAnalyzer.cc b/FWCore/Integration/plugins/RunLumiESAnalyzer.cc similarity index 99% rename from FWCore/Integration/test/RunLumiESAnalyzer.cc rename to FWCore/Integration/plugins/RunLumiESAnalyzer.cc index 116a7388c71b3..e9b06e2310651 100644 --- a/FWCore/Integration/test/RunLumiESAnalyzer.cc +++ b/FWCore/Integration/plugins/RunLumiESAnalyzer.cc @@ -19,7 +19,7 @@ #include "FWCore/Framework/interface/MakerMacros.h" #include "FWCore/Framework/interface/Run.h" #include "FWCore/Integration/interface/ESTestRecords.h" -#include "FWCore/Integration/test/IOVTestInfo.h" +#include "IOVTestInfo.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" diff --git a/FWCore/Integration/test/RunLumiESSource.cc b/FWCore/Integration/plugins/RunLumiESSource.cc similarity index 98% rename from FWCore/Integration/test/RunLumiESSource.cc rename to FWCore/Integration/plugins/RunLumiESSource.cc index 0c64a2ed5a826..fa60087036f25 100644 --- a/FWCore/Integration/test/RunLumiESSource.cc +++ b/FWCore/Integration/plugins/RunLumiESSource.cc @@ -17,7 +17,7 @@ #include "FWCore/Framework/interface/SourceFactory.h" #include "FWCore/Framework/interface/ValidityInterval.h" #include "FWCore/Integration/interface/ESTestRecords.h" -#include "FWCore/Integration/test/IOVTestInfo.h" +#include "IOVTestInfo.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" diff --git a/FWCore/Integration/test/SlimmingDSVThingProducer.cc b/FWCore/Integration/plugins/SlimmingDSVThingProducer.cc similarity index 100% rename from FWCore/Integration/test/SlimmingDSVThingProducer.cc rename to FWCore/Integration/plugins/SlimmingDSVThingProducer.cc diff --git a/FWCore/Integration/test/SlimmingThingProducer.cc b/FWCore/Integration/plugins/SlimmingThingProducer.cc similarity index 98% rename from FWCore/Integration/test/SlimmingThingProducer.cc rename to FWCore/Integration/plugins/SlimmingThingProducer.cc index e85ae666cdce5..81c3cab00c80d 100644 --- a/FWCore/Integration/test/SlimmingThingProducer.cc +++ b/FWCore/Integration/plugins/SlimmingThingProducer.cc @@ -12,8 +12,8 @@ #include "FWCore/Utilities/interface/Exception.h" #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Integration/test/WhatsIt.h" -#include "FWCore/Integration/test/GadgetRcd.h" +#include "WhatsIt.h" +#include "GadgetRcd.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include diff --git a/FWCore/Integration/test/SwitchProducerProvenanceAnalyzer.cc b/FWCore/Integration/plugins/SwitchProducerProvenanceAnalyzer.cc similarity index 100% rename from FWCore/Integration/test/SwitchProducerProvenanceAnalyzer.cc rename to FWCore/Integration/plugins/SwitchProducerProvenanceAnalyzer.cc diff --git a/FWCore/Integration/test/TableTestModules.cc b/FWCore/Integration/plugins/TableTestModules.cc similarity index 99% rename from FWCore/Integration/test/TableTestModules.cc rename to FWCore/Integration/plugins/TableTestModules.cc index ce12b027a565c..f065eab3f7275 100644 --- a/FWCore/Integration/test/TableTestModules.cc +++ b/FWCore/Integration/plugins/TableTestModules.cc @@ -103,7 +103,7 @@ namespace edmtest { private: void write(edm::EventForOutput const& e) override { using namespace edm; - assert(keptProducts()[InEvent].size() > 0); + assert(!keptProducts()[InEvent].empty()); for (auto product : keptProducts()[InEvent]) { BranchDescription const* branchDescription = product.first; TypeID const& tid = branchDescription->unwrappedTypeID(); diff --git a/FWCore/Integration/test/TestDescriptionComments.cc b/FWCore/Integration/plugins/TestDescriptionComments.cc similarity index 98% rename from FWCore/Integration/test/TestDescriptionComments.cc rename to FWCore/Integration/plugins/TestDescriptionComments.cc index 68d281a8a0045..3044a2b0b2251 100644 --- a/FWCore/Integration/test/TestDescriptionComments.cc +++ b/FWCore/Integration/plugins/TestDescriptionComments.cc @@ -16,7 +16,7 @@ namespace edmtest { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override final {} + void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const final {} }; void TestDescriptionComments::fillDescriptions(edm::ConfigurationDescriptions& descriptions) { diff --git a/FWCore/Integration/test/TestESConcurrentSource.cc b/FWCore/Integration/plugins/TestESConcurrentSource.cc similarity index 99% rename from FWCore/Integration/test/TestESConcurrentSource.cc rename to FWCore/Integration/plugins/TestESConcurrentSource.cc index ad50e67ab5359..0049fbccf9c6c 100644 --- a/FWCore/Integration/test/TestESConcurrentSource.cc +++ b/FWCore/Integration/plugins/TestESConcurrentSource.cc @@ -21,7 +21,7 @@ #include "FWCore/Framework/interface/SourceFactory.h" #include "FWCore/Framework/interface/ValidityInterval.h" #include "FWCore/Integration/interface/ESTestRecords.h" -#include "FWCore/Integration/test/IOVTestInfo.h" +#include "IOVTestInfo.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -56,7 +56,7 @@ namespace edmtest { public: using EventSetupRecordKey = edm::eventsetup::EventSetupRecordKey; explicit TestESConcurrentSource(edm::ParameterSet const&); - ~TestESConcurrentSource(); + ~TestESConcurrentSource() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); diff --git a/FWCore/Integration/test/TestESSource.cc b/FWCore/Integration/plugins/TestESSource.cc similarity index 99% rename from FWCore/Integration/test/TestESSource.cc rename to FWCore/Integration/plugins/TestESSource.cc index 7f461928924f8..14f0b22f4f8cd 100644 --- a/FWCore/Integration/test/TestESSource.cc +++ b/FWCore/Integration/plugins/TestESSource.cc @@ -21,7 +21,7 @@ #include "FWCore/Framework/interface/SourceFactory.h" #include "FWCore/Framework/interface/ValidityInterval.h" #include "FWCore/Integration/interface/ESTestRecords.h" -#include "FWCore/Integration/test/IOVTestInfo.h" +#include "IOVTestInfo.h" #include "FWCore/MessageLogger/interface/MessageLogger.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" @@ -57,7 +57,7 @@ namespace edmtest { public: using EventSetupRecordKey = edm::eventsetup::EventSetupRecordKey; explicit TestESSource(edm::ParameterSet const&); - ~TestESSource(); + ~TestESSource() override; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); diff --git a/FWCore/Integration/test/TestFindProduct.cc b/FWCore/Integration/plugins/TestFindProduct.cc similarity index 99% rename from FWCore/Integration/test/TestFindProduct.cc rename to FWCore/Integration/plugins/TestFindProduct.cc index 6d0b1f6724933..ab09b26b611ce 100644 --- a/FWCore/Integration/test/TestFindProduct.cc +++ b/FWCore/Integration/plugins/TestFindProduct.cc @@ -45,7 +45,7 @@ namespace edmtest { edm::InputProcessBlockCache> { public: explicit TestFindProduct(edm::ParameterSet const& pset); - virtual ~TestFindProduct(); + ~TestFindProduct() override; void analyze(edm::Event const& e, edm::EventSetup const& es) override; void beginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) override; diff --git a/FWCore/Integration/test/TestGetByLabelAnalyzer.cc b/FWCore/Integration/plugins/TestGetByLabelAnalyzer.cc similarity index 98% rename from FWCore/Integration/test/TestGetByLabelAnalyzer.cc rename to FWCore/Integration/plugins/TestGetByLabelAnalyzer.cc index 40ae668f2a7d7..3e565ccb424dd 100644 --- a/FWCore/Integration/test/TestGetByLabelAnalyzer.cc +++ b/FWCore/Integration/plugins/TestGetByLabelAnalyzer.cc @@ -27,7 +27,7 @@ namespace edmtest { descriptions.addDefault(desc); } - void analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const { + void analyze(edm::StreamID, edm::Event const& event, edm::EventSetup const&) const override { edm::Handle handle; auto test = [](std::string const& category, std::string const& msg, auto func) { diff --git a/FWCore/Integration/test/TestGetterOfProducts.cc b/FWCore/Integration/plugins/TestGetterOfProducts.cc similarity index 99% rename from FWCore/Integration/test/TestGetterOfProducts.cc rename to FWCore/Integration/plugins/TestGetterOfProducts.cc index 6e605802666bf..74e61ed4e67c8 100644 --- a/FWCore/Integration/test/TestGetterOfProducts.cc +++ b/FWCore/Integration/plugins/TestGetterOfProducts.cc @@ -26,8 +26,8 @@ namespace edmtest { class TestGetterOfProducts : public edm::stream::EDFilter<> { public: explicit TestGetterOfProducts(edm::ParameterSet const&); - ~TestGetterOfProducts(); - virtual bool filter(edm::Event&, edm::EventSetup const&); + ~TestGetterOfProducts() override; + bool filter(edm::Event&, edm::EventSetup const&) override; private: std::string processName_; diff --git a/FWCore/Integration/test/TestGlobalOutput.cc b/FWCore/Integration/plugins/TestGlobalOutput.cc similarity index 100% rename from FWCore/Integration/test/TestGlobalOutput.cc rename to FWCore/Integration/plugins/TestGlobalOutput.cc diff --git a/FWCore/Integration/test/TestHistoryKeeping.cc b/FWCore/Integration/plugins/TestHistoryKeeping.cc similarity index 100% rename from FWCore/Integration/test/TestHistoryKeeping.cc rename to FWCore/Integration/plugins/TestHistoryKeeping.cc diff --git a/FWCore/Integration/test/TestInterProcessProd.cc b/FWCore/Integration/plugins/TestInterProcessProd.cc similarity index 99% rename from FWCore/Integration/test/TestInterProcessProd.cc rename to FWCore/Integration/plugins/TestInterProcessProd.cc index 2cc54c7083c86..634dd34e6f165 100644 --- a/FWCore/Integration/test/TestInterProcessProd.cc +++ b/FWCore/Integration/plugins/TestInterProcessProd.cc @@ -6,7 +6,7 @@ #include "DataFormats/TestObjects/interface/ToyProducts.h" #include "DataFormats/TestObjects/interface/ThingCollection.h" -#include +#include #include #include "FWCore/SharedMemory/interface/ReadBuffer.h" @@ -35,7 +35,7 @@ namespace testinter { std::cout << id_ << " starting external process" << std::endl; pipe_ = popen(("cmsTestInterProcess "s + channel_.sharedMemoryName() + " " + channel_.uniqueID()).c_str(), "w"); - if (NULL == pipe_) { + if (nullptr == pipe_) { abort(); } diff --git a/FWCore/Integration/test/TestInterProcessRandomProd.cc b/FWCore/Integration/plugins/TestInterProcessRandomProd.cc similarity index 99% rename from FWCore/Integration/test/TestInterProcessRandomProd.cc rename to FWCore/Integration/plugins/TestInterProcessRandomProd.cc index c1595acda274f..e6b719a9316e3 100644 --- a/FWCore/Integration/test/TestInterProcessRandomProd.cc +++ b/FWCore/Integration/plugins/TestInterProcessRandomProd.cc @@ -10,7 +10,7 @@ #include "FWCore/ServiceRegistry/interface/Service.h" #include "FWCore/Utilities/interface/RandomNumberGenerator.h" -#include +#include #include #include "FWCore/SharedMemory/interface/ReadBuffer.h" @@ -47,7 +47,7 @@ namespace testinter { pipe_ = popen(("cmsTestInterProcessRandom "s + channel_.sharedMemoryName() + " " + channel_.uniqueID()).c_str(), "w"); - if (NULL == pipe_) { + if (nullptr == pipe_) { abort(); } diff --git a/FWCore/Integration/test/TestLimitedOutput.cc b/FWCore/Integration/plugins/TestLimitedOutput.cc similarity index 100% rename from FWCore/Integration/test/TestLimitedOutput.cc rename to FWCore/Integration/plugins/TestLimitedOutput.cc diff --git a/FWCore/Integration/test/TestOneOutput.cc b/FWCore/Integration/plugins/TestOneOutput.cc similarity index 100% rename from FWCore/Integration/test/TestOneOutput.cc rename to FWCore/Integration/plugins/TestOneOutput.cc diff --git a/FWCore/Integration/test/TestPSetAnalyzer.cc b/FWCore/Integration/plugins/TestPSetAnalyzer.cc similarity index 100% rename from FWCore/Integration/test/TestPSetAnalyzer.cc rename to FWCore/Integration/plugins/TestPSetAnalyzer.cc diff --git a/FWCore/Integration/test/TestParentage.cc b/FWCore/Integration/plugins/TestParentage.cc similarity index 98% rename from FWCore/Integration/test/TestParentage.cc rename to FWCore/Integration/plugins/TestParentage.cc index 97ee3437a2e4d..3ae84c3e9dd11 100644 --- a/FWCore/Integration/test/TestParentage.cc +++ b/FWCore/Integration/plugins/TestParentage.cc @@ -23,7 +23,7 @@ namespace { void getAncestors(edm::Event const& e, edm::BranchID const& branchID, std::set& ancestors) { - edm::Provenance prov = e.getProvenance(branchID); + const edm::Provenance& prov = e.getProvenance(branchID); if (prov.productProvenance()) { for (auto const& parent : prov.productProvenance()->parentage().parents()) { ancestors.insert(parent); diff --git a/FWCore/Integration/test/TestServicesOnNonFrameworkThreadsAnalyzer.cc b/FWCore/Integration/plugins/TestServicesOnNonFrameworkThreadsAnalyzer.cc similarity index 100% rename from FWCore/Integration/test/TestServicesOnNonFrameworkThreadsAnalyzer.cc rename to FWCore/Integration/plugins/TestServicesOnNonFrameworkThreadsAnalyzer.cc diff --git a/FWCore/Integration/test/ThingAlgorithm.cc b/FWCore/Integration/plugins/ThingAlgorithm.cc similarity index 89% rename from FWCore/Integration/test/ThingAlgorithm.cc rename to FWCore/Integration/plugins/ThingAlgorithm.cc index 9594f49655323..87d8a1d01cd7d 100644 --- a/FWCore/Integration/test/ThingAlgorithm.cc +++ b/FWCore/Integration/plugins/ThingAlgorithm.cc @@ -1,4 +1,4 @@ -#include "FWCore/Integration/test/ThingAlgorithm.h" +#include "ThingAlgorithm.h" #include "DataFormats/TestObjects/interface/Thing.h" namespace edmtest { diff --git a/FWCore/Integration/test/ThingAlgorithm.h b/FWCore/Integration/plugins/ThingAlgorithm.h similarity index 100% rename from FWCore/Integration/test/ThingAlgorithm.h rename to FWCore/Integration/plugins/ThingAlgorithm.h diff --git a/FWCore/Integration/test/ThingAnalyzer.cc b/FWCore/Integration/plugins/ThingAnalyzer.cc similarity index 94% rename from FWCore/Integration/test/ThingAnalyzer.cc rename to FWCore/Integration/plugins/ThingAnalyzer.cc index 2537d32513524..ab073311f8b26 100644 --- a/FWCore/Integration/test/ThingAnalyzer.cc +++ b/FWCore/Integration/plugins/ThingAnalyzer.cc @@ -28,12 +28,11 @@ namespace edmtest { public: ThingAnalyzer(edm::ParameterSet const&); - void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const override final; - std::shared_ptr globalBeginRun(edm::Run const&, edm::EventSetup const&) const override final; - void globalEndRun(edm::Run const&, edm::EventSetup const&) const override final; - std::shared_ptr globalBeginLuminosityBlock(edm::LuminosityBlock const&, - edm::EventSetup const&) const override final; - void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const override final; + void analyze(edm::StreamID, edm::Event const&, edm::EventSetup const&) const final; + std::shared_ptr globalBeginRun(edm::Run const&, edm::EventSetup const&) const final; + void globalEndRun(edm::Run const&, edm::EventSetup const&) const final; + std::shared_ptr globalBeginLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const final; + void globalEndLuminosityBlock(edm::LuminosityBlock const&, edm::EventSetup const&) const final; static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); diff --git a/FWCore/Integration/test/ThingExtSource.cc b/FWCore/Integration/plugins/ThingExtSource.cc similarity index 98% rename from FWCore/Integration/test/ThingExtSource.cc rename to FWCore/Integration/plugins/ThingExtSource.cc index 1e3f0908bd918..60a44bceb905c 100644 --- a/FWCore/Integration/test/ThingExtSource.cc +++ b/FWCore/Integration/plugins/ThingExtSource.cc @@ -1,4 +1,4 @@ -#include "FWCore/Integration/test/ThingExtSource.h" +#include "ThingExtSource.h" #include "DataFormats/TestObjects/interface/ThingCollection.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/LuminosityBlock.h" diff --git a/FWCore/Integration/test/ThingExtSource.h b/FWCore/Integration/plugins/ThingExtSource.h similarity index 96% rename from FWCore/Integration/test/ThingExtSource.h rename to FWCore/Integration/plugins/ThingExtSource.h index 63849099cbeae..c977ec0d11864 100644 --- a/FWCore/Integration/test/ThingExtSource.h +++ b/FWCore/Integration/plugins/ThingExtSource.h @@ -10,7 +10,7 @@ #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Sources/interface/ProducerSourceFromFiles.h" -#include "FWCore/Integration/test/ThingAlgorithm.h" +#include "ThingAlgorithm.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" namespace edmtest { diff --git a/FWCore/Integration/test/ThingProducer.cc b/FWCore/Integration/plugins/ThingProducer.cc similarity index 98% rename from FWCore/Integration/test/ThingProducer.cc rename to FWCore/Integration/plugins/ThingProducer.cc index ddce8c61ae48e..e3c991294721f 100644 --- a/FWCore/Integration/test/ThingProducer.cc +++ b/FWCore/Integration/plugins/ThingProducer.cc @@ -1,4 +1,4 @@ -#include "FWCore/Integration/test/ThingProducer.h" +#include "ThingProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/LuminosityBlock.h" #include "FWCore/Framework/interface/Run.h" diff --git a/FWCore/Integration/test/ThingProducer.h b/FWCore/Integration/plugins/ThingProducer.h similarity index 97% rename from FWCore/Integration/test/ThingProducer.h rename to FWCore/Integration/plugins/ThingProducer.h index f364f8ce1c8dd..0059758fcb571 100644 --- a/FWCore/Integration/test/ThingProducer.h +++ b/FWCore/Integration/plugins/ThingProducer.h @@ -10,7 +10,7 @@ #include "FWCore/Framework/interface/Frameworkfwd.h" #include "FWCore/Framework/interface/global/EDProducer.h" -#include "FWCore/Integration/test/ThingAlgorithm.h" +#include "ThingAlgorithm.h" #include "FWCore/Utilities/interface/EDPutToken.h" #include "DataFormats/TestObjects/interface/ThingCollection.h" diff --git a/FWCore/Integration/test/ThingSource.cc b/FWCore/Integration/plugins/ThingSource.cc similarity index 98% rename from FWCore/Integration/test/ThingSource.cc rename to FWCore/Integration/plugins/ThingSource.cc index 31b92b683c9b4..5b2003c434598 100644 --- a/FWCore/Integration/test/ThingSource.cc +++ b/FWCore/Integration/plugins/ThingSource.cc @@ -1,4 +1,4 @@ -#include "FWCore/Integration/test/ThingSource.h" +#include "ThingSource.h" #include "DataFormats/TestObjects/interface/ThingCollection.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/LuminosityBlock.h" diff --git a/FWCore/Integration/test/ThingSource.h b/FWCore/Integration/plugins/ThingSource.h similarity index 96% rename from FWCore/Integration/test/ThingSource.h rename to FWCore/Integration/plugins/ThingSource.h index c699afb26f869..a2e8d186b82c7 100644 --- a/FWCore/Integration/test/ThingSource.h +++ b/FWCore/Integration/plugins/ThingSource.h @@ -9,7 +9,7 @@ ************************************************************/ #include "FWCore/Framework/interface/Frameworkfwd.h" -#include "FWCore/Integration/test/ThingAlgorithm.h" +#include "ThingAlgorithm.h" #include "FWCore/Sources/interface/ProducerSourceBase.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" diff --git a/FWCore/Integration/test/ThingWithMergeProducer.cc b/FWCore/Integration/plugins/ThingWithMergeProducer.cc similarity index 99% rename from FWCore/Integration/test/ThingWithMergeProducer.cc rename to FWCore/Integration/plugins/ThingWithMergeProducer.cc index 0790fc3128924..944b1e7e1af8a 100644 --- a/FWCore/Integration/test/ThingWithMergeProducer.cc +++ b/FWCore/Integration/plugins/ThingWithMergeProducer.cc @@ -7,7 +7,7 @@ // // Original Author: David Dagenhart, Fermilab, February 2008 -#include "FWCore/Integration/test/ThingWithMergeProducer.h" +#include "ThingWithMergeProducer.h" #include "FWCore/Framework/interface/Event.h" #include "FWCore/Framework/interface/LuminosityBlock.h" #include "FWCore/Framework/interface/Run.h" diff --git a/FWCore/Integration/test/ThingWithMergeProducer.h b/FWCore/Integration/plugins/ThingWithMergeProducer.h similarity index 97% rename from FWCore/Integration/test/ThingWithMergeProducer.h rename to FWCore/Integration/plugins/ThingWithMergeProducer.h index 6f4cb53652b89..75131ea9a4cf4 100644 --- a/FWCore/Integration/test/ThingWithMergeProducer.h +++ b/FWCore/Integration/plugins/ThingWithMergeProducer.h @@ -17,7 +17,7 @@ namespace edmtest { public: explicit ThingWithMergeProducer(edm::ParameterSet const& ps); - virtual ~ThingWithMergeProducer(); + ~ThingWithMergeProducer() override; void produce(edm::Event& e, edm::EventSetup const& c) override; diff --git a/FWCore/Integration/test/ThinnedRefFromTestAnalyzer.cc b/FWCore/Integration/plugins/ThinnedRefFromTestAnalyzer.cc similarity index 100% rename from FWCore/Integration/test/ThinnedRefFromTestAnalyzer.cc rename to FWCore/Integration/plugins/ThinnedRefFromTestAnalyzer.cc diff --git a/FWCore/Integration/test/ThinningDSVTestAnalyzer.cc b/FWCore/Integration/plugins/ThinningDSVTestAnalyzer.cc similarity index 99% rename from FWCore/Integration/test/ThinningDSVTestAnalyzer.cc rename to FWCore/Integration/plugins/ThinningDSVTestAnalyzer.cc index 21c89edcd6744..7fad80b70e216 100644 --- a/FWCore/Integration/test/ThinningDSVTestAnalyzer.cc +++ b/FWCore/Integration/plugins/ThinningDSVTestAnalyzer.cc @@ -26,7 +26,7 @@ namespace edmtest { static void fillDescriptions(edm::ConfigurationDescriptions& descriptions); - virtual void analyze(edm::StreamID, edm::Event const& e, edm::EventSetup const& c) const override; + void analyze(edm::StreamID, edm::Event const& e, edm::EventSetup const& c) const override; private: void incrementExpectedValue(std::vector::const_iterator& iter) const; diff --git a/FWCore/Integration/test/ThinningDSVThingProducer.cc b/FWCore/Integration/plugins/ThinningDSVThingProducer.cc similarity index 100% rename from FWCore/Integration/test/ThinningDSVThingProducer.cc rename to FWCore/Integration/plugins/ThinningDSVThingProducer.cc diff --git a/FWCore/Integration/test/ThinningTestAnalyzer.cc b/FWCore/Integration/plugins/ThinningTestAnalyzer.cc similarity index 100% rename from FWCore/Integration/test/ThinningTestAnalyzer.cc rename to FWCore/Integration/plugins/ThinningTestAnalyzer.cc diff --git a/FWCore/Integration/test/ThinningThingProducer.cc b/FWCore/Integration/plugins/ThinningThingProducer.cc similarity index 98% rename from FWCore/Integration/test/ThinningThingProducer.cc rename to FWCore/Integration/plugins/ThinningThingProducer.cc index 1345c5e32e537..f2587b820a0c5 100644 --- a/FWCore/Integration/test/ThinningThingProducer.cc +++ b/FWCore/Integration/plugins/ThinningThingProducer.cc @@ -17,8 +17,8 @@ #include "FWCore/Utilities/interface/Exception.h" #include "FWCore/Utilities/interface/InputTag.h" #include "FWCore/Framework/interface/ESHandle.h" -#include "FWCore/Integration/test/WhatsIt.h" -#include "FWCore/Integration/test/GadgetRcd.h" +#include "WhatsIt.h" +#include "GadgetRcd.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" #include diff --git a/FWCore/Integration/test/ThrowingSource.cc b/FWCore/Integration/plugins/ThrowingSource.cc similarity index 99% rename from FWCore/Integration/test/ThrowingSource.cc rename to FWCore/Integration/plugins/ThrowingSource.cc index 373348197b289..007043495afbd 100644 --- a/FWCore/Integration/test/ThrowingSource.cc +++ b/FWCore/Integration/plugins/ThrowingSource.cc @@ -10,7 +10,7 @@ namespace edm { class ThrowingSource : public ProducerSourceBase { public: explicit ThrowingSource(ParameterSet const&, InputSourceDescription const&); - ~ThrowingSource() noexcept(false); + ~ThrowingSource() noexcept(false) override; void beginJob() override; void endJob() override; diff --git a/FWCore/Integration/test/TrackOfDSVThingsProducer.cc b/FWCore/Integration/plugins/TrackOfDSVThingsProducer.cc similarity index 100% rename from FWCore/Integration/test/TrackOfDSVThingsProducer.cc rename to FWCore/Integration/plugins/TrackOfDSVThingsProducer.cc diff --git a/FWCore/Integration/test/TrackOfThingsProducer.cc b/FWCore/Integration/plugins/TrackOfThingsProducer.cc similarity index 98% rename from FWCore/Integration/test/TrackOfThingsProducer.cc rename to FWCore/Integration/plugins/TrackOfThingsProducer.cc index 1a62abcd81940..c471add6da94a 100644 --- a/FWCore/Integration/test/TrackOfThingsProducer.cc +++ b/FWCore/Integration/plugins/TrackOfThingsProducer.cc @@ -20,7 +20,7 @@ namespace edmtest { class TrackOfThingsProducer : public edm::one::EDProducer<> { public: explicit TrackOfThingsProducer(edm::ParameterSet const&); - virtual ~TrackOfThingsProducer(); + ~TrackOfThingsProducer() override; void produce(edm::Event&, edm::EventSetup const&) override; diff --git a/FWCore/Integration/test/TransformAsyncIntProducer.cc b/FWCore/Integration/plugins/TransformAsyncIntProducer.cc similarity index 100% rename from FWCore/Integration/test/TransformAsyncIntProducer.cc rename to FWCore/Integration/plugins/TransformAsyncIntProducer.cc diff --git a/FWCore/Integration/test/TransformAsyncIntStreamProducer.cc b/FWCore/Integration/plugins/TransformAsyncIntStreamProducer.cc similarity index 100% rename from FWCore/Integration/test/TransformAsyncIntStreamProducer.cc rename to FWCore/Integration/plugins/TransformAsyncIntStreamProducer.cc diff --git a/FWCore/Integration/test/TransformIntProducer.cc b/FWCore/Integration/plugins/TransformIntProducer.cc similarity index 100% rename from FWCore/Integration/test/TransformIntProducer.cc rename to FWCore/Integration/plugins/TransformIntProducer.cc diff --git a/FWCore/Integration/test/TransformIntStreamProducer.cc b/FWCore/Integration/plugins/TransformIntStreamProducer.cc similarity index 100% rename from FWCore/Integration/test/TransformIntStreamProducer.cc rename to FWCore/Integration/plugins/TransformIntStreamProducer.cc diff --git a/FWCore/Integration/test/UseValueExampleAnalyzer.cc b/FWCore/Integration/plugins/UseValueExampleAnalyzer.cc similarity index 97% rename from FWCore/Integration/test/UseValueExampleAnalyzer.cc rename to FWCore/Integration/plugins/UseValueExampleAnalyzer.cc index d3efa3c6af506..ea89fdaa13049 100644 --- a/FWCore/Integration/test/UseValueExampleAnalyzer.cc +++ b/FWCore/Integration/plugins/UseValueExampleAnalyzer.cc @@ -25,7 +25,7 @@ Description: #include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/Integration/test/ValueExample.h" +#include "ValueExample.h" #include "FWCore/ServiceRegistry/interface/Service.h" // diff --git a/FWCore/Integration/test/ValueExample.cc b/FWCore/Integration/plugins/ValueExample.cc similarity index 93% rename from FWCore/Integration/test/ValueExample.cc rename to FWCore/Integration/plugins/ValueExample.cc index 50a61eb9f3ee6..b5705fa56bd30 100644 --- a/FWCore/Integration/test/ValueExample.cc +++ b/FWCore/Integration/plugins/ValueExample.cc @@ -10,7 +10,7 @@ // Created: Mon Sep 5 19:52:01 EDT 2005 // -#include "FWCore/Integration/test/ValueExample.h" +#include "ValueExample.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" diff --git a/FWCore/Integration/test/ValueExample.h b/FWCore/Integration/plugins/ValueExample.h similarity index 87% rename from FWCore/Integration/test/ValueExample.h rename to FWCore/Integration/plugins/ValueExample.h index 99166e7129e67..ae5a5cef9ae24 100644 --- a/FWCore/Integration/test/ValueExample.h +++ b/FWCore/Integration/plugins/ValueExample.h @@ -37,9 +37,9 @@ class ValueExample { // ---------- member functions --------------------------- private: - ValueExample(const ValueExample&); // stop default + ValueExample(const ValueExample&) = delete; // stop default - const ValueExample& operator=(const ValueExample&); // stop default + const ValueExample& operator=(const ValueExample&) = delete; // stop default // ---------- member data -------------------------------- int value_; diff --git a/FWCore/Integration/test/ValueExamplePlugin.cc b/FWCore/Integration/plugins/ValueExamplePlugin.cc similarity index 89% rename from FWCore/Integration/test/ValueExamplePlugin.cc rename to FWCore/Integration/plugins/ValueExamplePlugin.cc index 39ed6d87a5834..095261a1c7ea5 100644 --- a/FWCore/Integration/test/ValueExamplePlugin.cc +++ b/FWCore/Integration/plugins/ValueExamplePlugin.cc @@ -13,7 +13,7 @@ // system include files // user include files -#include "FWCore/Integration/test/ValueExample.h" +#include "ValueExample.h" #include "FWCore/ServiceRegistry/interface/ServiceMaker.h" using namespace edm::serviceregistry; DEFINE_FWK_SERVICE_MAKER(ValueExample, ParameterSetMaker); diff --git a/FWCore/Integration/test/ViewAnalyzer.cc b/FWCore/Integration/plugins/ViewAnalyzer.cc similarity index 99% rename from FWCore/Integration/test/ViewAnalyzer.cc rename to FWCore/Integration/plugins/ViewAnalyzer.cc index 07f04c48672b7..2bbdd8e1943e4 100644 --- a/FWCore/Integration/test/ViewAnalyzer.cc +++ b/FWCore/Integration/plugins/ViewAnalyzer.cc @@ -29,7 +29,7 @@ namespace edmtest { class ViewAnalyzer : public edm::global::EDAnalyzer<> { public: explicit ViewAnalyzer(edm::ParameterSet const& /* no parameters*/); - virtual void analyze(edm::StreamID, edm::Event const& e, edm::EventSetup const& /* unused */) const override; + void analyze(edm::StreamID, edm::Event const& e, edm::EventSetup const& /* unused */) const override; template void testProduct(edm::Event const& e, std::string const& moduleLabel) const; diff --git a/FWCore/Integration/test/WaitingServer.cc b/FWCore/Integration/plugins/WaitingServer.cc similarity index 97% rename from FWCore/Integration/test/WaitingServer.cc rename to FWCore/Integration/plugins/WaitingServer.cc index 6ff186e547981..70b036baa1247 100644 --- a/FWCore/Integration/test/WaitingServer.cc +++ b/FWCore/Integration/plugins/WaitingServer.cc @@ -1,5 +1,5 @@ -#include "FWCore/Integration/test/WaitingServer.h" +#include "WaitingServer.h" #include diff --git a/FWCore/Integration/test/WaitingServer.h b/FWCore/Integration/plugins/WaitingServer.h similarity index 100% rename from FWCore/Integration/test/WaitingServer.h rename to FWCore/Integration/plugins/WaitingServer.h diff --git a/FWCore/Integration/test/WaitingService.cc b/FWCore/Integration/plugins/WaitingService.cc similarity index 96% rename from FWCore/Integration/test/WaitingService.cc rename to FWCore/Integration/plugins/WaitingService.cc index 3bed9bd6e8853..dace67285832a 100644 --- a/FWCore/Integration/test/WaitingService.cc +++ b/FWCore/Integration/plugins/WaitingService.cc @@ -1,4 +1,4 @@ -#include "FWCore/Integration/test/WaitingService.h" +#include "WaitingService.h" #include "FWCore/ParameterSet/interface/ParameterSet.h" #include "FWCore/ServiceRegistry/interface/ActivityRegistry.h" #include "FWCore/ServiceRegistry/interface/ServiceMaker.h" diff --git a/FWCore/Integration/test/WaitingService.h b/FWCore/Integration/plugins/WaitingService.h similarity index 96% rename from FWCore/Integration/test/WaitingService.h rename to FWCore/Integration/plugins/WaitingService.h index 262c7eb9b61bf..5ad8cf9e0429d 100644 --- a/FWCore/Integration/test/WaitingService.h +++ b/FWCore/Integration/plugins/WaitingService.h @@ -1,7 +1,7 @@ #ifndef FWCore_Integration_WaitingService_h #define FWCore_Integration_WaitingService_h -#include "FWCore/Integration/test/WaitingServer.h" +#include "WaitingServer.h" #include #include diff --git a/FWCore/Integration/test/WhatsIt.cc b/FWCore/Integration/plugins/WhatsIt.cc similarity index 88% rename from FWCore/Integration/test/WhatsIt.cc rename to FWCore/Integration/plugins/WhatsIt.cc index a86b5fc928716..6158292b6e7eb 100644 --- a/FWCore/Integration/test/WhatsIt.cc +++ b/FWCore/Integration/plugins/WhatsIt.cc @@ -13,7 +13,7 @@ // system include files // user include files -#include "FWCore/Integration/test/WhatsIt.h" +#include "WhatsIt.h" #include "FWCore/Utilities/interface/typelookup.h" diff --git a/FWCore/Integration/test/WhatsIt.h b/FWCore/Integration/plugins/WhatsIt.h similarity index 100% rename from FWCore/Integration/test/WhatsIt.h rename to FWCore/Integration/plugins/WhatsIt.h diff --git a/FWCore/Integration/test/WhatsItAnalyzer.cc b/FWCore/Integration/plugins/WhatsItAnalyzer.cc similarity index 94% rename from FWCore/Integration/test/WhatsItAnalyzer.cc rename to FWCore/Integration/plugins/WhatsItAnalyzer.cc index 6b41976599f28..5ac0f135566ee 100644 --- a/FWCore/Integration/test/WhatsItAnalyzer.cc +++ b/FWCore/Integration/plugins/WhatsItAnalyzer.cc @@ -26,8 +26,8 @@ #include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/Integration/test/WhatsIt.h" -#include "FWCore/Integration/test/GadgetRcd.h" +#include "WhatsIt.h" +#include "GadgetRcd.h" #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/EventSetup.h" @@ -42,9 +42,9 @@ namespace edmtest { class WhatsItAnalyzer : public edm::one::EDAnalyzer<> { public: explicit WhatsItAnalyzer(const edm::ParameterSet&); - ~WhatsItAnalyzer(); + ~WhatsItAnalyzer() override; - virtual void analyze(const edm::Event&, const edm::EventSetup&); + void analyze(const edm::Event&, const edm::EventSetup&) override; private: void getAndTest(edm::EventSetup const&, diff --git a/FWCore/Integration/test/WhatsItESProducer.cc b/FWCore/Integration/plugins/WhatsItESProducer.cc similarity index 97% rename from FWCore/Integration/test/WhatsItESProducer.cc rename to FWCore/Integration/plugins/WhatsItESProducer.cc index 079212c6ecc98..10f1a40a3634c 100644 --- a/FWCore/Integration/test/WhatsItESProducer.cc +++ b/FWCore/Integration/plugins/WhatsItESProducer.cc @@ -26,9 +26,9 @@ #include "FWCore/Framework/interface/ESHandle.h" #include "FWCore/Framework/interface/TriggerNamesService.h" -#include "FWCore/Integration/test/WhatsIt.h" -#include "FWCore/Integration/test/Doodad.h" -#include "FWCore/Integration/test/GadgetRcd.h" +#include "WhatsIt.h" +#include "Doodad.h" +#include "GadgetRcd.h" #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h" #include "FWCore/ParameterSet/interface/ParameterSetDescription.h" @@ -45,7 +45,7 @@ namespace edmtest { class WhatsItESProducer : public edm::ESProducer { public: WhatsItESProducer(edm::ParameterSet const& pset); - ~WhatsItESProducer(); + ~WhatsItESProducer() override; typedef std::unique_ptr ReturnType; typedef std::unique_ptr ReturnTypeA; diff --git a/FWCore/Integration/test/WhatsItWatcherAnalyzer.cc b/FWCore/Integration/plugins/WhatsItWatcherAnalyzer.cc similarity index 96% rename from FWCore/Integration/test/WhatsItWatcherAnalyzer.cc rename to FWCore/Integration/plugins/WhatsItWatcherAnalyzer.cc index 09ad3dbc7cab0..9875951f30616 100644 --- a/FWCore/Integration/test/WhatsItWatcherAnalyzer.cc +++ b/FWCore/Integration/plugins/WhatsItWatcherAnalyzer.cc @@ -25,8 +25,8 @@ #include "FWCore/Framework/interface/MakerMacros.h" -#include "FWCore/Integration/test/WhatsIt.h" -#include "FWCore/Integration/test/GadgetRcd.h" +#include "WhatsIt.h" +#include "GadgetRcd.h" #include "FWCore/Framework/interface/ESHandle.h" diff --git a/FWCore/Integration/test/BuildFile.xml b/FWCore/Integration/test/BuildFile.xml index 574af23633549..3287541c6ebe0 100644 --- a/FWCore/Integration/test/BuildFile.xml +++ b/FWCore/Integration/test/BuildFile.xml @@ -198,253 +198,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -576,12 +329,6 @@ - - - - - -