openstudiocoalition · macumber · Nov 28, 2021 · Nov 28, 2021 · Nov 28, 2021 · Nov 28, 2021
diff --git a/.github/workflows/app_build.yml b/.github/workflows/app_build.yml
@@ -42,10 +42,11 @@ jobs:
       # fail-fast: Default is true, switch to false to allow one platform to fail and still run others
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04, windows-2019, macos-10.15]
+        conf: [ubuntu-20.04, windows-msvc-2019, windows-clang-2019, macos-10.15]
         include:
-        - os: ubuntu-20.04
-          allow_failure: true
+        - conf: ubuntu-20.04
+          os: ubuntu-20.04
+          allow_failure: false
           PLATFORM_NAME: Linux
           CPACK_BINARY_DEB: ON
           CPACK_BINARY_IFW: OFF
@@ -57,7 +58,8 @@ jobs:
           COMPRESSED_PKG_PATH: _CPack_Packages/Linux/TGZ
           QT_OS_NAME: linux
           QT_ARCH: gcc_64
-        - os: macos-10.15
+        - conf: macos-10.15
+          os: macos-10.15
           allow_failure: false
           PLATFORM_NAME: Darwin
           CPACK_BINARY_DEB: OFF
@@ -72,7 +74,8 @@ jobs:
           SDKROOT: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk
           QT_OS_NAME: mac
           QT_ARCH: clang_64
-        - os: windows-2019
+        - conf: windows-msvc-2019
+          os: windows-2019
           allow_failure: false
           PLATFORM_NAME: Windows
           CPACK_BINARY_DEB: OFF
@@ -85,6 +88,20 @@ jobs:
           COMPRESSED_PKG_PATH: _CPack_Packages/win64/ZIP
           QT_OS_NAME: windows
           QT_ARCH: win64_msvc2019_64
+        - conf: windows-clang-2019
+          os: windows-2019
+          allow_failure: true
+          PLATFORM_NAME: WindowsClang
+          CPACK_BINARY_DEB: OFF
+          CPACK_BINARY_IFW: ON
+          CPACK_BINARY_TGZ: OFF
+          CPACK_BINARY_ZIP: ON
+          BINARY_EXT: exe
+          COMPRESSED_EXT: zip
+          BINARY_PKG_PATH: _CPack_Packages/win64/IFW
+          COMPRESSED_PKG_PATH: _CPack_Packages/win64/ZIP
+          QT_OS_NAME: windows
+          QT_ARCH: win64_msvc2019_64
 
     steps:
     - uses: actions/checkout@v2
@@ -241,6 +258,12 @@ jobs:
           dir "C:/Qt/"
           echo "C:/Qt/QtIFW-4.3.0/bin" >> $GITHUB_PATH
 
+          if [ "${{ matrix.PLATFORM_NAME }}" == "WindowsClang" ]; then
+            echo CMAKE_GENERATOR_ARCH_TOOLSET="-G \"Visual Studio 16 2019\" -A x64 -T ClangCL" >> $GITHUB_ENV
+          else
+            echo CMAKE_GENERATOR_ARCH_TOOLSET="-G \"Visual Studio 16 2019\" -A x64" >> $GITHUB_ENV
+          fi;
+
           echo "Using chocolatey to install ninja"
           choco install ninja
           # C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise
@@ -249,6 +272,7 @@ jobs:
           echo "MSVC_DIR=$MSVC_DIR" >> $GITHUB_ENV
           # add folder containing vcvarsall.bat
           echo "$MSVC_DIR\VC\Auxiliary\Build" >> $GITHUB_PATH
+
         elif [ "$RUNNER_OS" == "macOS" ]; then
           echo MACOSX_DEPLOYMENT_TARGET=${{ matrix.MACOSX_DEPLOYMENT_TARGET }} >> $GITHUB_ENV
           echo SDKROOT=${{ matrix.SDKROOT }} >> $GITHUB_ENV
@@ -319,7 +343,7 @@ jobs:
       uses: actions/cache@v2
       with:
         path: OpenStudio-${{ env.OS_SDK_VERSION }}
-        key: OpenStudio-SDK-${{ matrix.os }}-${{ env.OS_SDK_VERSION }}-${{ secrets.CACHE_KEY }}
+        key: OpenStudio-SDK-${{ matrix.conf }}-${{ env.OS_SDK_VERSION }}-${{ secrets.CACHE_KEY }}
 
     - name: Did restoring the build-cache or OpenStudioSDK cache work? Yes
       # If it wasn't found in the cache
@@ -382,7 +406,7 @@ jobs:
     #  with:
     #    path: |
     #      ~/.conan
-    #    key: ${{ matrix.os }}-conan-cache-${{ env.CONAN_INSTALL_MD5 }}-${{ secrets.CACHE_KEY }}
+    #    key: ${{ matrix.conf }}-conan-cache-${{ env.CONAN_INSTALL_MD5 }}-${{ secrets.CACHE_KEY }}
 
     - name: Did restoring the conan-cache work? No
       # If the SDK wasn't found in the cache
@@ -447,7 +471,7 @@ jobs:
       #uses: actions/cache@v2
       #with:
         #path: build/qt_5_11_*.tar.gz
-        #key: ${{ matrix.os }}-qt-5-11-cache
+        #key: ${{ matrix.conf }}-qt-5-11-cache
 
     #- name: Did restoring the qt cache work?
       ## If the SDK wasn't found in the cache
@@ -474,9 +498,9 @@ jobs:
       run: |
         echo "Using vcvarsall to initialize the development environment"
         call vcvarsall.bat x64
-        cmake -G Ninja -DQT_INSTALL_DIR=${{ env.QT_INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DBUILD_DOCUMENTATION=${{ env.BUILD_DOCUMENTATION }} -DBUILD_TESTING=${{ env.BUILD_TESTING }} -DBUILD_BENCHMARK=${{ env.BUILD_BENCHMARK}} -DBUILD_PACKAGE=${{ env.BUILD_PACKAGE }} -DCPACK_BINARY_DEB=${{ env.CPACK_BINARY_DEB }} -DCPACK_BINARY_IFW=${{ env.CPACK_BINARY_IFW }} -DCPACK_BINARY_NSIS=${{ env.CPACK_BINARY_NSIS }} -DCPACK_BINARY_RPM=${{ env.CPACK_BINARY_RPM }} -DCPACK_BINARY_STGZ=${{ env.CPACK_BINARY_STGZ }} -DCPACK_BINARY_TBZ2=${{ env.CPACK_BINARY_TBZ2 }} -DCPACK_BINARY_TGZ=${{ env.CPACK_BINARY_TGZ }} -DCPACK_BINARY_ZIP=${{ env.CPACK_BINARY_ZIP }} -DCPACK_BINARY_TXZ=${{ env.CPACK_BINARY_TXZ }} -DCPACK_BINARY_TZ=${{ env.CPACK_BINARY_TZ }} -DCPACK_SOURCE_RPM=${{ env.CPACK_SOURCE_RPM }} -DCPACK_SOURCE_TBZ2=${{ env.CPACK_SOURCE_TBZ2 }} -DCPACK_SOURCE_TGZ=${{ env.CPACK_SOURCE_TGZ }} -DCPACK_SOURCE_TXZ=${{ env.CPACK_SOURCE_TXZ }} -DCPACK_SOURCE_TZ=${{ env.CPACK_SOURCE_TZ }} -DCPACK_SOURCE_ZIP=${{ env.CPACK_SOURCE_ZIP }} ../
-        ninja
-        ninja package
+        cmake ${{ env.CMAKE_GENERATOR_ARCH_TOOLSET }} -DQT_INSTALL_DIR=${{ env.QT_INSTALL_DIR }} -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DBUILD_DOCUMENTATION=${{ env.BUILD_DOCUMENTATION }} -DBUILD_TESTING=${{ env.BUILD_TESTING }} -DBUILD_BENCHMARK=${{ env.BUILD_BENCHMARK}} -DBUILD_PACKAGE=${{ env.BUILD_PACKAGE }} -DCPACK_BINARY_DEB=${{ env.CPACK_BINARY_DEB }} -DCPACK_BINARY_IFW=${{ env.CPACK_BINARY_IFW }} -DCPACK_BINARY_NSIS=${{ env.CPACK_BINARY_NSIS }} -DCPACK_BINARY_RPM=${{ env.CPACK_BINARY_RPM }} -DCPACK_BINARY_STGZ=${{ env.CPACK_BINARY_STGZ }} -DCPACK_BINARY_TBZ2=${{ env.CPACK_BINARY_TBZ2 }} -DCPACK_BINARY_TGZ=${{ env.CPACK_BINARY_TGZ }} -DCPACK_BINARY_ZIP=${{ env.CPACK_BINARY_ZIP }} -DCPACK_BINARY_TXZ=${{ env.CPACK_BINARY_TXZ }} -DCPACK_BINARY_TZ=${{ env.CPACK_BINARY_TZ }} -DCPACK_SOURCE_RPM=${{ env.CPACK_SOURCE_RPM }} -DCPACK_SOURCE_TBZ2=${{ env.CPACK_SOURCE_TBZ2 }} -DCPACK_SOURCE_TGZ=${{ env.CPACK_SOURCE_TGZ }} -DCPACK_SOURCE_TXZ=${{ env.CPACK_SOURCE_TXZ }} -DCPACK_SOURCE_TZ=${{ env.CPACK_SOURCE_TZ }} -DCPACK_SOURCE_ZIP=${{ env.CPACK_SOURCE_ZIP }} ../
+        cmake --build . -j 2 --config ${{ env.BUILD_TYPE }}
+        cmake --build . --target package -j 2 --config ${{ env.BUILD_TYPE }}
 
     # Debug CPack:
     # "C:\Program Files\CMake\bin\cpack.exe" --debug --verbose --config CPackConfig.cmake
@@ -506,7 +530,7 @@ jobs:
       #if: ${{ failure() }}
       #uses: actions/upload-artifact@v2
       #with:
-          #name: ${{ matrix.os }}-gdbm_config.log
+          #name: ${{ matrix.conf }}-gdbm_config.log
           #path: ~/.conan/data/gdbm/1.18.1/_/_/build/**/source_subfolder/config.log
 
     - name: Build (Unix)
@@ -565,14 +589,14 @@ jobs:
       # build/_CPack_Packages/Linux/DEB/*.deb
       # build/_CPack_Packages/Darwin/IFW/*.dmg
       with:
-          name: OpenStudioApplication-${{ env.OS_APP_VERSION }}.${{ github.sha }}-${{ matrix.os }}.${{ env.BINARY_EXT }}
+          name: OpenStudioApplication-${{ env.OS_APP_VERSION }}.${{ github.sha }}-${{ matrix.conf }}.${{ env.BINARY_EXT }}
           path: build/${{ matrix.BINARY_PKG_PATH }}/*.${{ env.BINARY_EXT }}
           # path: build/_CPack_Packages/*/*/*.${{ env.BINARY_EXT }}
 
     - name: Archive TGZ or ZIP artifacts
       uses: actions/upload-artifact@v2
       with:
-          name: OpenStudioApplication-${{ env.OS_APP_VERSION }}.${{ github.sha }}-${{ matrix.os }}.${{ env.COMPRESSED_EXT }}
+          name: OpenStudioApplication-${{ env.OS_APP_VERSION }}.${{ github.sha }}-${{ matrix.conf }}.${{ env.COMPRESSED_EXT }}
           path: build/${{ matrix.COMPRESSED_PKG_PATH }}/*.${{ env.COMPRESSED_EXT }}
 
     - name: Test
@@ -588,7 +612,7 @@ jobs:
     - name: Archive test results?
       uses: actions/upload-artifact@v2
       with:
-          name: OpenStudioApplication-${{ env.OS_APP_VERSION }}.${{ github.sha }}-${{ matrix.os }}-Test.xml
+          name: OpenStudioApplication-${{ env.OS_APP_VERSION }}.${{ github.sha }}-${{ matrix.conf }}-Test.xml
           path: build/Testing/**/*.xml
 
     - name: Benchmark
@@ -604,7 +628,7 @@ jobs:
     - name: Archive benchmark results?
       uses: actions/upload-artifact@v2
       with:
-          name: OpenStudioApplication-${{ env.OS_APP_VERSION }}.${{ github.sha }}-${{ matrix.os }}-bench_results.csv
+          name: OpenStudioApplication-${{ env.OS_APP_VERSION }}.${{ github.sha }}-${{ matrix.conf }}-bench_results.csv
           path: build/bench_results_*.csv
 
     #- name: Create a release if triggered by a tag

diff --git a/.gitignore b/.gitignore
@@ -23,6 +23,8 @@ debug/
 release/
 relwithdebinfo/
 profile/
+debugllvm/
+releasellvm/
 /super-build-shared/
 /super-build-static/
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -415,6 +415,23 @@ if(MSVC)
     set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /DEBUG /OPT:REF /OPT:ICF")
   endif()
 
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    # 'openstudio::detail::WorkspaceObjectOrder_Impl::less' hides overloaded virtual function
+    add_definitions(-Wno-overloaded-virtual)
+
+    # unqualified friend declaration referring to type outside of the nearest enclosing namespace is a Microsoft extension; add a nested name specifier LayeredConstruction_Impl.hpp
+    add_definitions(-Wno-microsoft-unqualified-friend)
+
+    # function declared 'noreturn' should not return
+    add_definitions(-Wno-invalid-noreturn)
+
+    # QXmlDefaultHandler, QXmlInputSource, QXmlSimpleReader, QXmlParseException
+    add_definitions(-Wno-deprecated-declarations)
+
+    # Add XRay instrumentation, not supported on Windows
+    #add_definitions(/clang:-fxray-instrument)
+  endif()
+
 endif()
 
 # Check version of gcc
@@ -425,7 +442,7 @@ endif()
 
 # compiler id for about boxes
 if(MSVC)
-  set(ABOUT_COMPILER "${CMAKE_GENERATOR}")
+  set(ABOUT_COMPILER "${CMAKE_GENERATOR} ${CMAKE_CXX_COMPILER_ID}")
 elseif(APPLE)
   set(ABOUT_COMPILER "${CMAKE_CXX_COMPILER_ID} ${CMAKE_OSX_ARCHITECTURES}")
 else()

diff --git a/ConanInstall.cmake b/ConanInstall.cmake
@@ -35,6 +35,14 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
 
   message(STATUS "openstudio: RUNNING CONAN")
 
+  # if(WIN32)
+  #   # Use MSVC for dependencies on Windows
+  #   set(CMAKE_CXX_COMPILER_ID_TMP "${CMAKE_CXX_COMPILER_ID}")
+  #   set(CMAKE_CXX_COMPILER_ID "MSVC")
+  #   set(CMAKE_GENERATOR_TOOLSET_TMP "${CMAKE_GENERATOR_TOOLSET}")
+  #   set(CMAKE_GENERATOR_TOOLSET "")
+  # endif()
+
   # Add NREL remote and place it first in line, since we vendored dependencies to NREL's repo, they will be picked first
   # TJC 2021-04-27 bintray.com is decommissioned as of 2021-05-01. See commercialbuildings as replacement below.
   conan_add_remote(NAME nrel INDEX 0
@@ -105,13 +113,19 @@ if(NOT CONAN_OPENSTUDIO_ALREADY_RUN)
     #"libyaml/0.2.5#9e234874df88c3ba7249f6d1368fceaf"
     BASIC_SETUP CMAKE_TARGETS NO_OUTPUT_DIRS
     OPTIONS ${CONAN_OPTIONS}
+    SETTINGS ${CONAN_SETTINGS}
     BUILD ${CONAN_BUILD}
     # Passes `-u, --update`    to conan install: Check updates exist from upstream remotes
     # That and build=outdated should ensure we track the right
     # Now that we pin dependencies, there is no point looking upstream really, so we'll save valuable configuration time by not doing it
     UPDATE
   )
 
+  # if(WIN32)
+  #    set(CMAKE_CXX_COMPILER_ID "${CMAKE_CXX_COMPILER_ID_TMP}")
+  #    set(CMAKE_GENERATOR_TOOLSET "${CMAKE_GENERATOR_TOOLSET_TMP}")
+  #  endif()
+
   set(CONAN_OPENSTUDIO_ALREADY_RUN TRUE)
 
   #message("CONAN_TARGETS = ${CONAN_TARGETS}")

diff --git a/ruby/CMakeLists.txt b/ruby/CMakeLists.txt
@@ -1,4 +1,11 @@
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "^(Apple)?Clang$")
+if(MSVC)
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    add_definitions(-Wno-reserved-user-defined-literal)
+    add_definitions(-Wno-ignored-pragma-optimize)
+    add_definitions(-Wno-unused-variable)
+    add_definitions(-Wno-unused-function)
+  endif()
+elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "^(Apple)?Clang$")
   # using Clang
   set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -undefined dynamic_lookup")
 elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")

diff --git a/src/model_editor/CMakeLists.txt b/src/model_editor/CMakeLists.txt
@@ -131,6 +131,14 @@ set(${target_name}_swig_src
   Qt.i
 )
 
+if(MSVC)
+  if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+    add_definitions(-Wno-reserved-user-defined-literal)
+    add_definitions(-Wno-ignored-pragma-optimize)
+    add_definitions(-Wno-unused-variable)
+    add_definitions(-Wno-unused-function)
+  endif()
+endif()
+
 set(swig_target_name ${target_name})
 MAKE_SWIG_TARGET_OSAPP(OpenStudioModelEditor modeleditor "${CMAKE_CURRENT_SOURCE_DIR}/ModelEditor.i" "${${target_name}_swig_src}" ${swig_target_name} "")
-
diff --git a/src/model_editor/InspectorDialog.cpp b/src/model_editor/InspectorDialog.cpp
@@ -493,8 +493,6 @@ void InspectorDialog::init(InspectorDialogClient client) {
 
   QFile sketchUpPluginPolicy(":/SketchUpPluginPolicy.xml");
 
-  const auto toVector = [](const auto& data) { return std::vector<char>(data.begin(), data.end()); };
-
   switch (client.value()) {
     case InspectorDialogClient::AllOpenStudio:
 

diff --git a/src/openstudio_app/CMakeLists.txt b/src/openstudio_app/CMakeLists.txt
@@ -16,13 +16,6 @@ set(${target_name}_SRC
   LibraryDialog.cpp
   ExternalToolsDialog.hpp
   ExternalToolsDialog.cpp
-
-  ../shared_gui_components/BusyWidget.cpp
-  ../shared_gui_components/BusyWidget.hpp
-  ../shared_gui_components/OSDialog.cpp
-  ../shared_gui_components/OSDialog.hpp
-  ../shared_gui_components/WaitDialog.cpp
-  ../shared_gui_components/WaitDialog.hpp
 )
 
 # moc files
@@ -32,10 +25,6 @@ set(${target_name}_moc
   StartupMenu.hpp
   LibraryDialog.hpp
   ExternalToolsDialog.hpp
-
-  ../shared_gui_components/BusyWidget.hpp
-  ../shared_gui_components/OSDialog.hpp
-  ../shared_gui_components/WaitDialog.hpp
 )
 
 ## Qt UI generation

diff --git a/src/openstudio_app/LibraryDialog.cpp b/src/openstudio_app/LibraryDialog.cpp
@@ -105,7 +105,7 @@ void LibraryDialog::onRemove() {
 void LibraryDialog::onRestore() {
   m_list->clear();
 
-  for (const auto path : m_defaultPaths) {
+  for (const auto& path : m_defaultPaths) {
     m_list->addItem(QString::fromStdString(toString(path)));
   }
 }

diff --git a/src/openstudio_app/OpenStudioApp.cpp b/src/openstudio_app/OpenStudioApp.cpp
@@ -1347,7 +1347,7 @@ void OpenStudioApp::writeLibraryPaths(std::vector<openstudio::path> paths) {
     auto resPath = resourcesPath();
     std::string s_resPath = toString(resPath);
 
-    for (const auto path : paths) {
+    for (const auto& path : paths) {
       settings.setArrayIndex(i);
 
       // If this is one of the defaultPaths

diff --git a/src/openstudio_lib/EMSInspectorView.cpp b/src/openstudio_lib/EMSInspectorView.cpp
@@ -238,7 +238,7 @@ void EMSInspectorView::layoutModelObject(const model::ModelObject& modelObject)
 
       const auto actuatorNames = objecti.emsActuatorNames();
 
-      for (const auto actuator : actuatorNames) {
+      for (const auto& actuator : actuatorNames) {
         auto actuatorWidget = new EMSInspectorActuator(actuator, objecti);
         m_layout->addWidget(actuatorWidget);
       }
@@ -253,7 +253,7 @@ void EMSInspectorView::layoutModelObject(const model::ModelObject& modelObject)
 
       const auto sensorNames = objecti.outputVariableNames();
 
-      for (const auto sensor : sensorNames) {
+      for (const auto& sensor : sensorNames) {
         auto sensorWidget = new EMSInspectorSensor(sensor, objecti);
         m_layout->addWidget(sensorWidget);
       }

diff --git a/src/openstudio_lib/LocationTabView.cpp b/src/openstudio_lib/LocationTabView.cpp
@@ -92,7 +92,6 @@ static constexpr auto LATITUDE("Latitude: ");
 static constexpr auto LONGITUDE("Longitude: ");
 static constexpr auto ELEVATION("Elevation: ");
 static constexpr auto TIME_ZONE("Time Zone: ");
-static constexpr auto NUM_DESIGN_DAYS("Number of Design Days: ");
 static constexpr auto SETWEATHERFILE("Set Weather File");
 static constexpr auto CHANGEWEATHERFILE("Change Weather File");
 

diff --git a/src/openstudio_lib/SpaceTypesGridView.cpp b/src/openstudio_lib/SpaceTypesGridView.cpp
@@ -1298,7 +1298,7 @@ void SpaceTypesGridController::addColumns(const QString& category, std::vector<Q
         return t_spaceType->standardsTemplate();
       };
 
-      std::function<bool(model::SpaceType*, std::string)> setter = [this](model::SpaceType* t_spaceType, std::string t_value) {
+      std::function<bool(model::SpaceType*, std::string)> setter = [](model::SpaceType* t_spaceType, std::string t_value) {
         // We start by resetting the Standards Building Type and SpaceType
         t_spaceType->resetStandardsSpaceType();
         t_spaceType->resetStandardsBuildingType();
@@ -1380,7 +1380,7 @@ void SpaceTypesGridController::addColumns(const QString& category, std::vector<Q
         return t_spaceType->standardsBuildingType();
       };
 
-      std::function<bool(model::SpaceType*, std::string)> setter = [this](model::SpaceType* t_spaceType, std::string t_value) {
+      std::function<bool(model::SpaceType*, std::string)> setter = [](model::SpaceType* t_spaceType, std::string t_value) {
         // We start by resetting the Standards SpaceType
         t_spaceType->resetStandardsSpaceType();
         bool success = t_spaceType->setStandardsBuildingType(t_value);

diff --git a/src/openstudio_lib/test/FacilityStories_GTest.cpp b/src/openstudio_lib/test/FacilityStories_GTest.cpp
@@ -120,7 +120,7 @@ TEST_F(OpenStudioLibFixture, FacilityStoriesGridView) {
     }
   }
 
-  gridController->setObjectFilter([upperLimit, lowerLimit](const model::ModelObject& obj) -> bool { return true; });
+  gridController->setObjectFilter([](const model::ModelObject& obj) -> bool { return true; });
 
   for (const auto& locationInfoPair : locationToInfoMap) {
     if (locationInfoPair.first->modelRow >= 0) {

diff --git a/src/openstudio_lib/test/SpacesSurfaces_GTest.cpp b/src/openstudio_lib/test/SpacesSurfaces_GTest.cpp
@@ -123,6 +123,7 @@ TEST_F(OpenStudioLibFixture, SpacesSurfacesGridView) {
     auto surfaceObj = obj->cast<model::Surface>();
     ASSERT_TRUE(surfaceObj.space());
     EXPECT_EQ(spaceObj, surfaceObj.space());
+    EXPECT_EQ(surface.handle(), surfaceObj.handle());
 
     i += 1;
   }
@@ -142,6 +143,7 @@ TEST_F(OpenStudioLibFixture, SpacesSurfacesGridView) {
     auto surfaceObj = obj->cast<model::Surface>();
     ASSERT_TRUE(surfaceObj.space());
     EXPECT_EQ(spaceObj, surfaceObj.space());
+    EXPECT_EQ(surface.handle(), surfaceObj.handle());
 
     i += 1;
   }
@@ -179,6 +181,7 @@ TEST_F(OpenStudioLibFixture, SpacesSurfacesGridView) {
     auto surfaceObj = obj->cast<model::Surface>();
     ASSERT_TRUE(surfaceObj.space());
     EXPECT_EQ(spaceObj, surfaceObj.space());
+    EXPECT_EQ(surface.handle(), surfaceObj.handle());
 
     i += 1;
   }