Rename the test scenarios to what they are - tests

cms-sw · Jun 3, 2020 · dc29cb9 · dc29cb9
1 parent 85b70fa
commit dc29cb9
Show file tree

Hide file tree

Showing 19 changed files with 328 additions and 24 deletions.
diff --git a/DetectorDescription/DDCMS/data/cms-test-ddvectors.xml b/DetectorDescription/DDCMS/data/cms-test-ddvectors.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0"?>
 <DDDefinition>
   <debug>
-    <debug_shapes/>
-    <!--debug_includes/>
+    <!--debug_shapes/>
+    <debug_includes/>
     <debug_rotations/>
-    <debug_includes/-->
+    <debug_includes/>
     <debug_volumes/>
     <debug_constants/>
     <debug_materials/>
     <debug_namespaces/>
     <debug_placements/>
     <debug_algorithms/>
-    <!--debug_visattr/-->
-    <debug_specpars/>
+    <debug_visattr/>
+    <debug_specpars/-->
   </debug>
 
   <open_geometry/>

diff --git a/...cription/DDCMS/data/cms-geometry-2021.xml → ...ion/DDCMS/data/cms-test-geometry-2021.xml b/...cription/DDCMS/data/cms-geometry-2021.xml → ...ion/DDCMS/data/cms-test-geometry-2021.xml
diff --git a/...ion/DDCMS/data/cms-2015-muon-geometry.xml → ...DCMS/data/cms-test-muon-geometry-2015.xml b/...ion/DDCMS/data/cms-2015-muon-geometry.xml → ...DCMS/data/cms-test-muon-geometry-2015.xml
diff --git a/DetectorDescription/DDCMS/test/DDCompactView.cppunit.cc b/DetectorDescription/DDCMS/test/DDCompactView.cppunit.cc
@@ -31,7 +31,7 @@ class testDDCompactView : public CppUnit::TestFixture {
 CPPUNIT_TEST_SUITE_REGISTRATION(testDDCompactView);
 
 void testDDCompactView::setUp() {
-  fileName_ = edm::FileInPath("DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml").fullPath();
+  fileName_ = edm::FileInPath("DetectorDescription/DDCMS/data/cms-test-muon-geometry-2015.xml").fullPath();
 }
 
 void testDDCompactView::checkCompactView() {

diff --git a/DetectorDescription/DDCMS/test/DDExpandedView.cppunit.cc b/DetectorDescription/DDCMS/test/DDExpandedView.cppunit.cc
@@ -32,7 +32,7 @@ class testDDExpandedView : public CppUnit::TestFixture {
 CPPUNIT_TEST_SUITE_REGISTRATION(testDDExpandedView);
 
 void testDDExpandedView::setUp() {
-  fileName_ = edm::FileInPath("DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml").fullPath();
+  fileName_ = edm::FileInPath("DetectorDescription/DDCMS/data/cms-test-muon-geometry-2015.xml").fullPath();
 }
 
 void testDDExpandedView::checkExpandedView() {

diff --git a/DetectorDescription/DDCMS/test/DDFilteredView.cppunit.cc b/DetectorDescription/DDCMS/test/DDFilteredView.cppunit.cc
@@ -35,7 +35,7 @@ class testDDFilteredView : public CppUnit::TestFixture {
 CPPUNIT_TEST_SUITE_REGISTRATION(testDDFilteredView);
 
 void testDDFilteredView::setUp() {
-  fileName_ = edm::FileInPath("DetectorDescription/DDCMS/data/cms-geometry-2021.xml").fullPath();
+  fileName_ = edm::FileInPath("DetectorDescription/DDCMS/data/cms-test-geometry-2021.xml").fullPath();
   refdattl_ = {0.000809653, 0.000713002, 0.000654918, 0.000602767, 0.000566295, 0.000541647, 0.000516174, 0.000502512,
                0.000504225, 0.000506212, 0.000506275, 0.000487621, 0.000473034, 0.000454002, 0.000442383, 0.000441043,
                0.000443609, 0.000433124, 0.000440188, 0.000435257, 0.000439224, 0.000431385, 0.00041707,  0.000415677,

diff --git a/DetectorDescription/DDCMS/test/python/dump.py b/DetectorDescription/DDCMS/test/python/dump.py
@@ -8,7 +8,7 @@
     )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-geometry-2021.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-test-geometry-2021.xml'),
                                             appendToDataLabel = cms.string('CMS')
                                             )
 

diff --git a/DetectorDescription/DDCMS/test/python/testDDCompactView.py b/DetectorDescription/DDCMS/test/python/testDDCompactView.py
@@ -38,7 +38,7 @@
     )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-test-muon-geometry-2015.xml'),
                                             appendToDataLabel = cms.string('MUON')
                                             )
 

diff --git a/DetectorDescription/DDCMS/test/python/testDDDetectorESProducer.py b/DetectorDescription/DDCMS/test/python/testDDDetectorESProducer.py
@@ -39,7 +39,7 @@
     )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-test-muon-geometry-2015.xml'),
                                             appendToDataLabel = cms.string('MUON')
                                             )
 

diff --git a/DetectorDescription/DDCMS/test/python/testDDFilteredView.py b/DetectorDescription/DDCMS/test/python/testDDFilteredView.py
@@ -38,7 +38,7 @@
     )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-test-muon-geometry-2015.xml'),
                                             appendToDataLabel = cms.string('MUON')
                                             )
 

diff --git a/DetectorDescription/DDCMS/test/python/testDDSpecPars.py b/DetectorDescription/DDCMS/test/python/testDDSpecPars.py
@@ -39,7 +39,7 @@
     )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-geometry-2021.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-test-geometry-2021.xml'),
                                             appendToDataLabel = cms.string('CMS')
                                             )
 

diff --git a/DetectorDescription/DDCMS/test/python/testDDSpecParsFilter.py b/DetectorDescription/DDCMS/test/python/testDDSpecParsFilter.py
@@ -38,7 +38,7 @@
     )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-geometry-2021.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-test-geometry-2021.xml'),
                                             appendToDataLabel = cms.string('CMS')
                                             )
 

diff --git a/DetectorDescription/DDCMS/test/python/testDDSpecParsFilterG4ProdCuts.py b/DetectorDescription/DDCMS/test/python/testDDSpecParsFilterG4ProdCuts.py
@@ -39,7 +39,7 @@
 )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-test-muon-geometry-2015.xml'),
                                             appendToDataLabel = cms.string('MUON')
                                         )
 

diff --git a/DetectorDescription/DDCMS/test/python/testGeometry2021.py b/DetectorDescription/DDCMS/test/python/testGeometry2021.py
@@ -8,7 +8,7 @@
     )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-geometry-2021.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-test-geometry-2021.xml'),
                                             appendToDataLabel = cms.string('CMS')
                                             )
 

diff --git a/DetectorDescription/DDCMS/test/python/testGeometry2021FromDB.py b/DetectorDescription/DDCMS/test/python/testGeometry2021FromDB.py
@@ -12,7 +12,7 @@
     )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-geometry-2021.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-test-geometry-2021.xml'),
                                             rootDDName = cms.string('cms:OCMS'),
                                             label = cms.string('Extended'),
                                             fromDB = cms.bool(True),

diff --git a/DetectorDescription/DDCMS/test/python/testNavigateGeometry.py b/DetectorDescription/DDCMS/test/python/testNavigateGeometry.py
@@ -39,7 +39,7 @@
     )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-test-muon-geometry-2015.xml'),
                                             appendToDataLabel = cms.string('MUON')
                                             )
 process.DDVectorRegistryESProducer = cms.ESProducer("DDVectorRegistryESProducer",

diff --git a/DetectorDescription/DDCMS/test/python/testTGeoIterator.py b/DetectorDescription/DDCMS/test/python/testTGeoIterator.py
@@ -39,7 +39,7 @@
     )
 
 process.DDDetectorESProducer = cms.ESSource("DDDetectorESProducer",
-                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-2015-muon-geometry.xml'),
+                                            confGeomXMLFiles = cms.FileInPath('DetectorDescription/DDCMS/data/cms-test-muon-geometry-2015.xml'),
                                             appendToDataLabel = cms.string('CMS')
                                             )
 process.test = cms.EDAnalyzer("DDTestDumpGeometry",

diff --git a/DetectorDescription/DDCMS/test/runTest.sh b/DetectorDescription/DDCMS/test/runTest.sh
@@ -5,14 +5,12 @@ function die { echo $1: status $2 ; exit $2; }
 F1=${LOCAL_TEST_DIR}/python/dump.py
 F2=${LOCAL_TEST_DIR}/python/dumpDDShapes.py
 
-F4=${LOCAL_TEST_DIR}/python/dumpMuonGeometry.py
 F5=${LOCAL_TEST_DIR}/python/testDDAngularAlgorithm.py
 F6=${LOCAL_TEST_DIR}/python/testDDDetectorESProducer.py
 F7=${LOCAL_TEST_DIR}/python/testDDPseudoTrapShapes.py
 F8=${LOCAL_TEST_DIR}/python/testDDSpecPars.py
 F9=${LOCAL_TEST_DIR}/python/testDDVectors.py
 
-
 F12=${LOCAL_TEST_DIR}/python/testShapes.py
 F13=${LOCAL_TEST_DIR}/python/testNavigateGeometry.py
 F14=${LOCAL_TEST_DIR}/python/testTGeoIterator.py
@@ -30,14 +28,12 @@ echo " testing DetectorDescription/DDCMS"
 
 export tmpdir=${LOCAL_TMP_DIR:-/tmp}
 echo "===== Test \"python UnitsCheck.py cms.xml\" ===="
-python ${LOCAL_TEST_DIR}/python/UnitsCheck.py ${LOCAL_TEST_DIR}/data/mf.xml
+python ${LOCAL_TEST_DIR}/python/UnitsCheck.py ${LOCAL_TEST_DIR}/data/vacuum.xml
 echo "===== Test \"cmsRun dump.py\" ===="
 (cmsRun $F1) || die "Failure using cmsRun $F1" $?
 echo "===== Test \"cmsRun dumpDDShapes.py\" ===="
 (cmsRun $F2) || die "Failure using cmsRun $F2" $?
 
-echo "===== Test \"cmsRun dumpMuonGeometry.py\" ===="
-(cmsRun $F4) || die "Failure using cmsRun $F4" $?
 echo "===== Test \"cmsRun testDDAngularAlgorithm.py\" ===="
 (cmsRun $F5) || die "Failure using cmsRun $F5" $?
 echo "===== Test \"cmsRun testDDDetectorESProducer.py\" ===="