Testing - Remove QANCollection package (#718)

- Removes all QANCollection header and source files that contained collection type definitions and test utilities
- Updates the build configuration to remove QANCollection from the package list
- Removes the QANCollection integration from the main QADraw factory

diff --git a/src/Draw/TKQADraw/PACKAGES.cmake b/src/Draw/TKQADraw/PACKAGES.cmake
index cecd38b003dc44f2b03004c543ee81917249dbf2..05f9a6a5bb7248d1ab19084d1d935d9d5ff4f308 100644 (file)
--- a/src/Draw/TKQADraw/PACKAGES.cmake
+++ b/src/Draw/TKQADraw/PACKAGES.cmake
@@ -3,5 +3,4 @@ set(OCCT_TKQADraw_LIST_OF_PACKAGES
   QABugs
   QADNaming
   QADraw
-  QANCollection
 )

diff --git a/src/Draw/TKQADraw/QADraw/QADraw.cxx b/src/Draw/TKQADraw/QADraw/QADraw.cxx
index 65f12d33d96263120296711bc0e7d377c5df9332..58ab87e4ad387b3ce5ba525973b13e0ae1af41db 100644 (file)
--- a/src/Draw/TKQADraw/QADraw/QADraw.cxx
+++ b/src/Draw/TKQADraw/QADraw/QADraw.cxx
@@ -18,7 +18,6 @@
 #include <QABugs.hxx>
 #include <QADraw.hxx>
 #include <QADNaming.hxx>
-#include <QANCollection.hxx>
 
 #include <AIS_InteractiveContext.hxx>
 #include <Bnd_Box.hxx>
@@ -175,7 +174,6 @@ void QADraw::Factory(Draw_Interpretor& theCommands)
 
   QABugs::Commands(theCommands);
   QADNaming::AllCommands(theCommands);
-  QANCollection::Commands(theCommands);
 }
 
 // Declare entry point PLUGINFACTORY

diff --git a/src/Draw/TKQADraw/QANCollection/FILES.cmake b/src/Draw/TKQADraw/QANCollection/FILES.cmake
deleted file mode 100644 (file)
index 5d65ef6..0000000
--- a/src/Draw/TKQADraw/QANCollection/FILES.cmake
+++ /dev/null
@@ -1,17 +0,0 @@
-# Source files for QANCollection package
-set(OCCT_QANCollection_FILES_LOCATION "${CMAKE_CURRENT_LIST_DIR}")
-
-set(OCCT_QANCollection_FILES
-  FILES
-  QANCollection.cxx
-  QANCollection.hxx
-  QANCollection_Common.cxx
-  QANCollection_Common.hxx
-  QANCollection_DataMapIteratorOfDataMapOfRealPnt.hxx
-  QANCollection_DataMapOfRealPnt.hxx
-  QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger.hxx
-  QANCollection_DoubleMapOfRealInteger.hxx
-  QANCollection_IndexedDataMapOfRealPnt.hxx
-  QANCollection_ListIteratorOfListOfPnt.hxx
-  QANCollection_ListOfPnt.hxx
-)

diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection.cxx b/src/Draw/TKQADraw/QANCollection/QANCollection.cxx
deleted file mode 100644 (file)
index d2abbd2..0000000
--- a/src/Draw/TKQADraw/QANCollection/QANCollection.cxx
+++ /dev/null
@@ -1,24 +0,0 @@
-// Created on: 2004-03-05
-// Created by: Mikhail KUZMITCHEV
-// Copyright (c) 2004-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#include <QANCollection.hxx>
-#include <Draw_Interpretor.hxx>
-
-void QANCollection::Commands(Draw_Interpretor& theCommands)
-{
-  // All QANCollection commands have been migrated to GTest format
-  // This function is kept for compatibility but does nothing
-  (void)theCommands; // Avoid unused parameter warning
-}

diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection.hxx
deleted file mode 100644 (file)
index 2268a07..0000000
--- a/src/Draw/TKQADraw/QANCollection/QANCollection.hxx
+++ /dev/null
@@ -1,33 +0,0 @@
-// Created on: 2004-03-05
-// Created by: Mikhail KUZMITCHEV
-// Copyright (c) 2004-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef _QANCollection_HeaderFile
-#define _QANCollection_HeaderFile
-
-#include <Standard.hxx>
-#include <Standard_DefineAlloc.hxx>
-#include <Standard_Handle.hxx>
-
-#include <Draw_Interpretor.hxx>
-
-class QANCollection
-{
-public:
-  DEFINE_STANDARD_ALLOC
-
-  Standard_EXPORT static void Commands(Draw_Interpretor& DI);
-};
-
-#endif // _QANCollection_HeaderFile

diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_Common.cxx b/src/Draw/TKQADraw/QANCollection/QANCollection_Common.cxx
deleted file mode 100644 (file)
index b505356..0000000
--- a/src/Draw/TKQADraw/QANCollection/QANCollection_Common.cxx
+++ /dev/null
@@ -1,55 +0,0 @@
-// Created on: 2002-04-30
-// Created by: Alexander KARTOMIN (akm)
-// Copyright (c) 2002-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-// Purpose:     To test all methods of all NCollection classes
-
-#include <QANCollection_Common.hxx>
-#include <stdio.h>
-
-void PrintItem(const gp_Pnt& thePnt)
-{
-  printf("   (%5.1f %5.1f %5.1f)\n", thePnt.X(), thePnt.Y(), thePnt.Z());
-}
-
-void PrintItem(const Standard_Real theDbl)
-{
-  printf("   (%5.1f)\n", theDbl);
-}
-
-void Random(Standard_Real& theValue)
-{
-  static Standard_Real dfV = 0.14159265358979323846;
-  dfV *= 37.;
-  dfV -= Floor(dfV);
-  theValue = dfV;
-  // theValue=drand48();
-}
-
-void Random(Standard_Integer& theValue, const Standard_Integer theMax)
-{
-  Standard_Real dfR;
-  Random(dfR);
-  theValue = RealToInt(theMax * dfR);
-}
-
-void Random(gp_Pnt& thePnt)
-{
-  // thePnt.SetCoord(drand48(),drand48(),drand48());
-  Standard_Real dfX, dfY, dfZ;
-  Random(dfX);
-  Random(dfY);
-  Random(dfZ);
-  thePnt.SetCoord(dfX, dfY, dfZ);
-}

diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_Common.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_Common.hxx
deleted file mode 100644 (file)
index 5e0fb32..0000000
--- a/src/Draw/TKQADraw/QANCollection/QANCollection_Common.hxx
+++ /dev/null
@@ -1,34 +0,0 @@
-// Created on: 2002-05-15
-// Created by: Alexander KARTOMIN (akm)
-// Copyright (c) 2002-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef QANCollection_Common_HeaderFile
-#define QANCollection_Common_HeaderFile
-
-#include <gp_Pnt.hxx>
-
-// ===================== Methods for accessing items/keys =====================
-
-// To print other type of items define PrintItem for it
-
-Standard_EXPORT void PrintItem(const gp_Pnt& thePnt);
-Standard_EXPORT void PrintItem(const Standard_Real theDbl);
-
-// So do for the pseudo-random generation
-
-Standard_EXPORT void Random(Standard_Real& theValue);
-Standard_EXPORT void Random(Standard_Integer& theValue, const Standard_Integer theMax = RAND_MAX);
-Standard_EXPORT void Random(gp_Pnt& thePnt);
-
-#endif

diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_DataMapIteratorOfDataMapOfRealPnt.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_DataMapIteratorOfDataMapOfRealPnt.hxx
deleted file mode 100644 (file)
index 43b4132..0000000
--- a/src/Draw/TKQADraw/QANCollection/QANCollection_DataMapIteratorOfDataMapOfRealPnt.hxx
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2015 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef QANCollection_DataMapIteratorOfDataMapOfRealPnt_HeaderFile
-#define QANCollection_DataMapIteratorOfDataMapOfRealPnt_HeaderFile
-
-#include <QANCollection_DataMapOfRealPnt.hxx>
-
-#endif

diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_DataMapOfRealPnt.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_DataMapOfRealPnt.hxx
deleted file mode 100644 (file)
index 6a6f9d6..0000000
--- a/src/Draw/TKQADraw/QANCollection/QANCollection_DataMapOfRealPnt.hxx
+++ /dev/null
@@ -1,26 +0,0 @@
-// Created on: 2004-03-05
-// Created by: Mikhail KUZMITCHEV
-// Copyright (c) 2004-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef QANCollection_DataMapOfRealPnt_HeaderFile
-#define QANCollection_DataMapOfRealPnt_HeaderFile
-
-#include <gp_Pnt.hxx>
-#include <NCollection_DataMap.hxx>
-
-typedef NCollection_DataMap<Standard_Real, gp_Pnt> QANCollection_DataMapOfRealPnt;
-typedef NCollection_DataMap<Standard_Real, gp_Pnt>::Iterator
-  QANCollection_DataMapIteratorOfDataMapOfRealPnt;
-
-#endif

diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger.hxx
deleted file mode 100644 (file)
index da6a22a..0000000
--- a/src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger.hxx
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2015 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger_HeaderFile
-#define QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger_HeaderFile
-
-#include <QANCollection_DoubleMapOfRealInteger.hxx>
-
-#endif

diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapOfRealInteger.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapOfRealInteger.hxx
deleted file mode 100644 (file)
index 7f75f66..0000000
--- a/src/Draw/TKQADraw/QANCollection/QANCollection_DoubleMapOfRealInteger.hxx
+++ /dev/null
@@ -1,26 +0,0 @@
-// Created on: 2004-03-05
-// Created by: Mikhail KUZMITCHEV
-// Copyright (c) 2004-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef QANCollection_DoubleMapOfRealInteger_HeaderFile
-#define QANCollection_DoubleMapOfRealInteger_HeaderFile
-
-#include <Standard_Integer.hxx>
-#include <NCollection_DoubleMap.hxx>
-
-typedef NCollection_DoubleMap<Standard_Real, Standard_Integer> QANCollection_DoubleMapOfRealInteger;
-typedef NCollection_DoubleMap<Standard_Real, Standard_Integer>::Iterator
-  QANCollection_DoubleMapIteratorOfDoubleMapOfRealInteger;
-
-#endif

diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_IndexedDataMapOfRealPnt.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_IndexedDataMapOfRealPnt.hxx
deleted file mode 100644 (file)
index 61311f5..0000000
--- a/src/Draw/TKQADraw/QANCollection/QANCollection_IndexedDataMapOfRealPnt.hxx
+++ /dev/null
@@ -1,24 +0,0 @@
-// Created on: 2004-03-05
-// Created by: Mikhail KUZMITCHEV
-// Copyright (c) 2004-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef QANCollection_IndexedDataMapOfRealPnt_HeaderFile
-#define QANCollection_IndexedDataMapOfRealPnt_HeaderFile
-
-#include <gp_Pnt.hxx>
-#include <NCollection_IndexedDataMap.hxx>
-
-typedef NCollection_IndexedDataMap<Standard_Real, gp_Pnt> QANCollection_IndexedDataMapOfRealPnt;
-
-#endif

diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_ListIteratorOfListOfPnt.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_ListIteratorOfListOfPnt.hxx
deleted file mode 100644 (file)
index b92a1cf..0000000
--- a/src/Draw/TKQADraw/QANCollection/QANCollection_ListIteratorOfListOfPnt.hxx
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2015 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef QANCollection_ListIteratorOfListOfPnt_HeaderFile
-#define QANCollection_ListIteratorOfListOfPnt_HeaderFile
-
-#include <QANCollection_ListOfPnt.hxx>
-
-#endif

diff --git a/src/Draw/TKQADraw/QANCollection/QANCollection_ListOfPnt.hxx b/src/Draw/TKQADraw/QANCollection/QANCollection_ListOfPnt.hxx
deleted file mode 100644 (file)
index bfc0ad5..0000000
--- a/src/Draw/TKQADraw/QANCollection/QANCollection_ListOfPnt.hxx
+++ /dev/null
@@ -1,25 +0,0 @@
-// Created on: 2004-03-05
-// Created by: Mikhail KUZMITCHEV
-// Copyright (c) 2004-2014 OPEN CASCADE SAS
-//
-// This file is part of Open CASCADE Technology software library.
-//
-// This library is free software; you can redistribute it and/or modify it under
-// the terms of the GNU Lesser General Public License version 2.1 as published
-// by the Free Software Foundation, with special exception defined in the file
-// OCCT_LGPL_EXCEPTION.txt. Consult the file LICENSE_LGPL_21.txt included in OCCT
-// distribution for complete text of the license and disclaimer of any warranty.
-//
-// Alternatively, this file may be used under the terms of Open CASCADE
-// commercial license or contractual agreement.
-
-#ifndef QANCollection_ListOfPnt_HeaderFile
-#define QANCollection_ListOfPnt_HeaderFile
-
-#include <gp_Pnt.hxx>
-#include <NCollection_List.hxx>
-
-typedef NCollection_List<gp_Pnt>           QANCollection_ListOfPnt;
-typedef NCollection_List<gp_Pnt>::Iterator QANCollection_ListIteratorOfListOfPnt;
-
-#endif