Commit d9ddf706 authored by Robert Maynard's avatar Robert Maynard
Browse files

Move model tests to all be under testing/<lang> directories.

At the same time we move them into a language specific directory that follows
parent 69e42558
......@@ -16,7 +16,7 @@
#include "smtk/model/Volume.h"
#include "smtk/util/testing/cxx/helpers.h"
#include "smtk/model/testing/helpers.h"
#include "smtk/model/testing/cxx/helpers.h"
#include "smtk/options.h"
......
......@@ -69,11 +69,6 @@ if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/smtk.py"
"${SMTK_BINARY_DIR}/smtk.py" @ONLY)
if(SMTK_ENABLE_TESTING)
get_filename_component(SHIBOKEN_LIBRARY_PATH ${SHIBOKEN_LIBRARY} PATH)
add_subdirectory(model/PythonTesting)
endif(SMTK_ENABLE_TESTING)
#todo we need to install this file in such a way that it can resolve
#the location of shiboken, which is going to mean running fixup bundle
#on the mac, and than fixing up the smtk.py package script
......
......@@ -8,7 +8,7 @@
#include "smtk/model/EntityListPhrase.h"
#include "smtk/model/SimpleModelSubphrases.h"
#include "smtk/util/testing/cxx/helpers.h"
#include "smtk/model/testing/helpers.h"
#include "smtk/model/testing/cxx/helpers.h"
#include "smtk/extension/qt/testing/cxx/ModelBrowser.h"
......
################################################################################
# Make a library of some utility functions for tests to use:
################################################################################
add_library(SMTKCoreModelTesting STATIC helpers.cxx)
smtk_public_headers(helpers.h)
target_link_libraries(SMTKCoreModelTesting LINK_PRIVATE SMTKCore)
smtk_install_library(SMTKCoreModelTesting)
add_subdirectory(cxx)
################################################################################
# Tools and demos
################################################################################
add_executable(demoReportArrangements demoReportArrangements.cxx)
target_link_libraries(demoReportArrangements SMTKCore SMTKCoreModelTesting)
################################################################################
# Tests
################################################################################
add_executable(unitManager unitManager.cxx)
target_link_libraries(unitManager SMTKCore SMTKCoreModelTesting)
add_test(unitManager ${EXECUTABLE_OUTPUT_PATH}/unitManager)
add_executable(unitOperator unitOperator.cxx)
smtk_operator_xml( "${CMAKE_CURRENT_SOURCE_DIR}/unitOutcomeOperator.sbt" unitOperatorXML)
target_link_libraries(unitOperator SMTKCore SMTKCoreModelTesting)
if (SMTK_BUILD_CGM)
target_link_libraries(unitOperator cgmSMTK)
endif (SMTK_BUILD_CGM)
add_test(unitOperator ${EXECUTABLE_OUTPUT_PATH}/unitOperator)
add_executable(unitCursor unitCursor.cxx)
target_link_libraries(unitCursor SMTKCore SMTKCoreModelTesting)
add_test(unitCursor ${EXECUTABLE_OUTPUT_PATH}/unitCursor)
add_executable(unitDefaultBridge unitDefaultBridge.cxx)
smtk_operator_xml( "${CMAKE_CURRENT_SOURCE_DIR}/unitForwardingOperator.sbt" unitOperatorXML)
target_link_libraries(unitDefaultBridge SMTKCore SMTKCoreModelTesting)
add_test(unitDefaultBridge ${EXECUTABLE_OUTPUT_PATH}/unitDefaultBridge)
add_executable(unitDescriptivePhrase unitDescriptivePhrase.cxx)
target_link_libraries(unitDescriptivePhrase SMTKCore SMTKCoreModelTesting)
add_executable(unitImportExportJSON unitImportExportJSON.cxx)
target_link_libraries(unitImportExportJSON SMTKCore)
add_executable(unitArrangement unitArrangement.cxx)
target_link_libraries(unitArrangement SMTKCore)
add_test(unitArrangement ${EXECUTABLE_OUTPUT_PATH}/unitArrangement)
add_executable(unitEntity unitEntity.cxx)
target_link_libraries(unitEntity SMTKCore SMTKCoreModelTesting)
add_test(unitEntity ${EXECUTABLE_OUTPUT_PATH}/unitEntity)
add_executable(benchmarkModel benchmarkModel.cxx)
target_link_libraries(benchmarkModel SMTKCore SMTKCoreModelTesting)
#add_test(benchmarkModel ${EXECUTABLE_OUTPUT_PATH}/benchmarkModel)
################################################################################
# Tests that require SMTK_DATA_DIR
################################################################################
if (SMTK_DATA_DIR AND EXISTS ${SMTK_DATA_DIR}/ReadMe.mkd)
add_test(unitDescriptivePhrase ${EXECUTABLE_OUTPUT_PATH}/unitDescriptivePhrase
"${SMTK_DATA_DIR}/smtk/simple.json")
add_test(unitImportExportJSON ${EXECUTABLE_OUTPUT_PATH}/unitImportExportJSON
"${SMTK_DATA_DIR}/smtk/simple.json")
endif()
if(SMTK_BUILD_PYTHON_WRAPPINGS AND Shiboken_FOUND)
add_subdirectory(python)
endif()
\ No newline at end of file
################################################################################
# Make a library of some utility functions for tests to use:
################################################################################
add_library(SMTKCoreModelTesting STATIC helpers.cxx)
smtk_public_headers(helpers.h)
target_link_libraries(SMTKCoreModelTesting LINK_PRIVATE SMTKCore)
smtk_install_library(SMTKCoreModelTesting)
################################################################################
# Tools and demos
################################################################################
add_executable(demoReportArrangements demoReportArrangements.cxx)
target_link_libraries(demoReportArrangements SMTKCore SMTKCoreModelTesting)
################################################################################
# Tests
################################################################################
add_executable(unitManager unitManager.cxx)
target_link_libraries(unitManager SMTKCore SMTKCoreModelTesting)
add_test(unitManager ${EXECUTABLE_OUTPUT_PATH}/unitManager)
add_executable(unitOperator unitOperator.cxx)
smtk_operator_xml( "${CMAKE_CURRENT_SOURCE_DIR}/unitOutcomeOperator.sbt" unitOperatorXML)
target_link_libraries(unitOperator SMTKCore SMTKCoreModelTesting)
if (SMTK_BUILD_CGM)
target_link_libraries(unitOperator cgmSMTK)
endif (SMTK_BUILD_CGM)
add_test(unitOperator ${EXECUTABLE_OUTPUT_PATH}/unitOperator)
add_executable(unitCursor unitCursor.cxx)
target_link_libraries(unitCursor SMTKCore SMTKCoreModelTesting)
add_test(unitCursor ${EXECUTABLE_OUTPUT_PATH}/unitCursor)
add_executable(unitDefaultBridge unitDefaultBridge.cxx)
smtk_operator_xml( "${CMAKE_CURRENT_SOURCE_DIR}/unitForwardingOperator.sbt" unitOperatorXML)
target_link_libraries(unitDefaultBridge SMTKCore SMTKCoreModelTesting)
add_test(unitDefaultBridge ${EXECUTABLE_OUTPUT_PATH}/unitDefaultBridge)
add_executable(unitDescriptivePhrase unitDescriptivePhrase.cxx)
target_link_libraries(unitDescriptivePhrase SMTKCore SMTKCoreModelTesting)
add_executable(unitImportExportJSON unitImportExportJSON.cxx)
target_link_libraries(unitImportExportJSON SMTKCore)
add_executable(unitArrangement unitArrangement.cxx)
target_link_libraries(unitArrangement SMTKCore)
add_test(unitArrangement ${EXECUTABLE_OUTPUT_PATH}/unitArrangement)
add_executable(unitEntity unitEntity.cxx)
target_link_libraries(unitEntity SMTKCore SMTKCoreModelTesting)
add_test(unitEntity ${EXECUTABLE_OUTPUT_PATH}/unitEntity)
add_executable(benchmarkModel benchmarkModel.cxx)
target_link_libraries(benchmarkModel SMTKCore SMTKCoreModelTesting)
#add_test(benchmarkModel ${EXECUTABLE_OUTPUT_PATH}/benchmarkModel)
################################################################################
# Tests that require SMTK_DATA_DIR
################################################################################
if (SMTK_DATA_DIR AND EXISTS ${SMTK_DATA_DIR}/ReadMe.mkd)
add_test(unitDescriptivePhrase ${EXECUTABLE_OUTPUT_PATH}/unitDescriptivePhrase
"${SMTK_DATA_DIR}/smtk/simple.json")
add_test(unitImportExportJSON ${EXECUTABLE_OUTPUT_PATH}/unitImportExportJSON
"${SMTK_DATA_DIR}/smtk/simple.json")
endif()
#include "smtk/model/Manager.h"
#include "smtk/model/ExportJSON.h"
#include "smtk/model/ImportJSON.h"
#include "smtk/model/testing/helpers.h"
#include "smtk/model/testing/cxx/helpers.h"
#include "cJSON.h"
......
......@@ -7,7 +7,7 @@
#include "smtk/model/UseEntity.h"
#include "smtk/model/Vertex.h"
#include "smtk/model/testing/helpers.h"
#include "smtk/model/testing/cxx/helpers.h"
#include <fstream>
#include <string>
......
......@@ -13,7 +13,7 @@
#include "smtk/model/DescriptivePhrase.h"
#include "smtk/model/testing/helpers.h"
#include "smtk/model/testing/cxx/helpers.h"
#include <iomanip>
......
......@@ -19,7 +19,7 @@
#include "smtk/model/Volume.h"
#include "smtk/util/testing/cxx/helpers.h"
#include "smtk/model/testing/helpers.h"
#include "smtk/model/testing/cxx/helpers.h"
#include <fstream>
#include <sstream>
......
......@@ -21,7 +21,7 @@
#include "smtk/util/AutoInit.h"
#include "smtk/util/testing/cxx/helpers.h"
#include "smtk/model/testing/helpers.h"
#include "smtk/model/testing/cxx/helpers.h"
#include "smtk/options.h"
......
......@@ -5,7 +5,7 @@
#include "smtk/model/ImportJSON.h"
#include "smtk/model/testing/helpers.h"
#include "smtk/model/testing/cxx/helpers.h"
#include <fstream>
#include <iostream>
......
#include "smtk/model/Entity.h"
#include "smtk/model/EntityTypeBits.h"
#include "smtk/model/testing/helpers.h"
#include "smtk/model/testing/cxx/helpers.h"
#include "smtk/model/ImportJSON.h"
#include "smtk/model/IntegerData.h"
......
......@@ -4,7 +4,7 @@
#include "smtk/model/ExportJSON.h"
#include "smtk/model/Volume.h"
#include "smtk/model/testing/helpers.h"
#include "smtk/model/testing/cxx/helpers.h"
#include <smtk/util/testing/cxx/helpers.h>
#include "cJSON.h"
......
......@@ -13,7 +13,7 @@
#include "smtk/model/Manager.h"
#include "smtk/util/testing/cxx/helpers.h"
#include "smtk/model/testing/helpers.h"
#include "smtk/model/testing/cxx/helpers.h"
#include "smtk/options.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment