Skip to content

Commit

Permalink
Replacing GoogleTest with XSTest.
Browse files Browse the repository at this point in the history
  • Loading branch information
@macmade
macmade committed Nov 28, 2018
1 parent 764934b commit 14341d5
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 108 deletions.
6 changes: 3 additions & 3 deletions .gitmodules
View file
@@ -1,6 +1,6 @@
[submodule "Submodules/gmock-xcode"]
path = Submodules/gmock-xcode
url = https://github.com/macmade/gmock-xcode.git
[submodule "Submodules/xcconfig"]
path = Submodules/xcconfig
url = https://github.com/macmade/xcconfig.git
[submodule "Submodules/XSTest"]
path = Submodules/XSTest
url = https://github.com/macmade/XSTest.git
101 changes: 28 additions & 73 deletions CPPTraits.xcodeproj/project.pbxproj
View file
Expand Up @@ -9,45 +9,24 @@
/* Begin PBXBuildFile section */
050B83E11EB917D90090EA12 /* libc++.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 050B83E01EB917D90090EA12 /* libc++.tbd */; };
051F9C7D1C19C3EE005D471A /* XS-TypeTraits.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 051F9C771C19C3EE005D471A /* XS-TypeTraits.cpp */; };
053BEDC41B8EFDF3007D82A4 /* GoogleMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 053BEDBD1B8EFDE6007D82A4 /* GoogleMock.framework */; };
0536381021AF346A0015CFA9 /* XSTest.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0536380F21AF345D0015CFA9 /* XSTest.framework */; };
053BEDEC1B90ABB2007D82A4 /* travis-after.sh in Resources */ = {isa = PBXBuildFile; fileRef = 053BEDE71B90ABB2007D82A4 /* travis-after.sh */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
053BEDBC1B8EFDE6007D82A4 /* PBXContainerItemProxy */ = {
0536380E21AF345D0015CFA9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 053BEDB51B8EFDE6007D82A4 /* GoogleMock.xcodeproj */;
containerPortal = 0536380A21AF345D0015CFA9 /* XSTest.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 05818F861A685AEA0072A469;
remoteInfo = GoogleMock;
remoteGlobalIDString = 05D526E721A864BC0025CCEB;
remoteInfo = XSTest;
};
053BEDBE1B8EFDE6007D82A4 /* PBXContainerItemProxy */ = {
0536381121AF346E0015CFA9 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 053BEDB51B8EFDE6007D82A4 /* GoogleMock.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 05E96ABD1A68600C00204102;
remoteInfo = gmock;
};
053BEDC01B8EFDE6007D82A4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 053BEDB51B8EFDE6007D82A4 /* GoogleMock.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 05E96B1F1A68634900204102;
remoteInfo = gtest;
};
053BEDC21B8EFDE6007D82A4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 053BEDB51B8EFDE6007D82A4 /* GoogleMock.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 05818F901A685AEA0072A469;
remoteInfo = GoogleMockTests;
};
053BEDC51B8EFDF9007D82A4 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 053BEDB51B8EFDE6007D82A4 /* GoogleMock.xcodeproj */;
containerPortal = 0536380A21AF345D0015CFA9 /* XSTest.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 05818F851A685AEA0072A469;
remoteInfo = GoogleMock;
remoteGlobalIDString = 05D526E621A864BC0025CCEB;
remoteInfo = XSTest;
};
/* End PBXContainerItemProxy section */

Expand All @@ -56,8 +35,8 @@
05110D041C1F121C00EE6851 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
05110D051C1F121C00EE6851 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = "<group>"; };
051F9C771C19C3EE005D471A /* XS-TypeTraits.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "XS-TypeTraits.cpp"; sourceTree = "<group>"; };
0536380A21AF345D0015CFA9 /* XSTest.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = XSTest.xcodeproj; path = Submodules/XSTest/XSTest.xcodeproj; sourceTree = "<group>"; };
053BEDAC1B8EFDC1007D82A4 /* CPPTraits-Tests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "CPPTraits-Tests.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
053BEDB51B8EFDE6007D82A4 /* GoogleMock.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = GoogleMock.xcodeproj; path = "Submodules/gmock-xcode/GoogleMock.xcodeproj"; sourceTree = "<group>"; };
053BEDC71B8EFE1E007D82A4 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
053BEDE71B90ABB2007D82A4 /* travis-after.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "travis-after.sh"; sourceTree = "<group>"; };
056D31EF1C20304F000E1219 /* TypeTraits.hpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.h; path = TypeTraits.hpp; sourceTree = "<group>"; };
Expand Down Expand Up @@ -108,8 +87,8 @@
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
0536381021AF346A0015CFA9 /* XSTest.framework in Frameworks */,
050B83E11EB917D90090EA12 /* libc++.tbd in Frameworks */,
053BEDC41B8EFDF3007D82A4 /* GoogleMock.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -124,24 +103,21 @@
name = Frameworks;
sourceTree = "<group>";
};
053BEDA51B8EFCB6007D82A4 /* Unit-Tests */ = {
0536380B21AF345D0015CFA9 /* Products */ = {
isa = PBXGroup;
children = (
051F9C771C19C3EE005D471A /* XS-TypeTraits.cpp */,
053BEDC71B8EFE1E007D82A4 /* Info.plist */,
0536380F21AF345D0015CFA9 /* XSTest.framework */,
);
path = "Unit-Tests";
name = Products;
sourceTree = "<group>";
};
053BEDB61B8EFDE6007D82A4 /* Products */ = {
053BEDA51B8EFCB6007D82A4 /* Unit-Tests */ = {
isa = PBXGroup;
children = (
053BEDBD1B8EFDE6007D82A4 /* GoogleMock.framework */,
053BEDBF1B8EFDE6007D82A4 /* gmock.framework */,
053BEDC11B8EFDE6007D82A4 /* gtest.framework */,
053BEDC31B8EFDE6007D82A4 /* GoogleMockTests.xctest */,
051F9C771C19C3EE005D471A /* XS-TypeTraits.cpp */,
053BEDC71B8EFE1E007D82A4 /* Info.plist */,
);
name = Products;
path = "Unit-Tests";
sourceTree = "<group>";
};
053BEDE51B90ABB2007D82A4 /* Scripts */ = {
Expand Down Expand Up @@ -179,10 +155,10 @@
05BD89491A13FF4700A43CD8 = {
isa = PBXGroup;
children = (
0536380A21AF345D0015CFA9 /* XSTest.xcodeproj */,
05110D041C1F121C00EE6851 /* LICENSE */,
05110D051C1F121C00EE6851 /* README.md */,
05DBA1A4201E45A600638A44 /* xcconfig */,
053BEDB51B8EFDE6007D82A4 /* GoogleMock.xcodeproj */,
05A6C6801C18ADC1002C6A44 /* CPPTraits */,
053BEDA51B8EFCB6007D82A4 /* Unit-Tests */,
053BEDE51B90ABB2007D82A4 /* Scripts */,
Expand Down Expand Up @@ -326,7 +302,7 @@
buildRules = (
);
dependencies = (
053BEDC61B8EFDF9007D82A4 /* PBXTargetDependency */,
0536381221AF346E0015CFA9 /* PBXTargetDependency */,
);
name = "CPPTraits-Tests";
productName = "PIMPL-Tests";
Expand Down Expand Up @@ -361,8 +337,8 @@
projectDirPath = "";
projectReferences = (
{
ProductGroup = 053BEDB61B8EFDE6007D82A4 /* Products */;
ProjectRef = 053BEDB51B8EFDE6007D82A4 /* GoogleMock.xcodeproj */;
ProductGroup = 0536380B21AF345D0015CFA9 /* Products */;
ProjectRef = 0536380A21AF345D0015CFA9 /* XSTest.xcodeproj */;
},
);
projectRoot = "";
Expand All @@ -373,32 +349,11 @@
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
053BEDBD1B8EFDE6007D82A4 /* GoogleMock.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = GoogleMock.framework;
remoteRef = 053BEDBC1B8EFDE6007D82A4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
053BEDBF1B8EFDE6007D82A4 /* gmock.framework */ = {
0536380F21AF345D0015CFA9 /* XSTest.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = gmock.framework;
remoteRef = 053BEDBE1B8EFDE6007D82A4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
053BEDC11B8EFDE6007D82A4 /* gtest.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = gtest.framework;
remoteRef = 053BEDC01B8EFDE6007D82A4 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
053BEDC31B8EFDE6007D82A4 /* GoogleMockTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = GoogleMockTests.xctest;
remoteRef = 053BEDC21B8EFDE6007D82A4 /* PBXContainerItemProxy */;
path = XSTest.framework;
remoteRef = 0536380E21AF345D0015CFA9 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
Expand Down Expand Up @@ -442,10 +397,10 @@
/* End PBXSourcesBuildPhase section */

/* Begin PBXTargetDependency section */
053BEDC61B8EFDF9007D82A4 /* PBXTargetDependency */ = {
0536381221AF346E0015CFA9 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = GoogleMock;
targetProxy = 053BEDC51B8EFDF9007D82A4 /* PBXContainerItemProxy */;
name = XSTest;
targetProxy = 0536381121AF346E0015CFA9 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */

Expand Down
8 changes: 8 additions & 0 deletions CPPTraits.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
View file
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDEDidComputeMac32BitWarning</key>
<true/>
</dict>
</plist>
1 change: 1 addition & 0 deletions Submodules/XSTest
Submodule XSTest added at dfe518
1 change: 0 additions & 1 deletion Submodules/gmock-xcode
Submodule gmock-xcode deleted from 6b21de
33 changes: 2 additions & 31 deletions Unit-Tests/XS-TypeTraits.cpp
View file
Expand Up @@ -27,39 +27,10 @@
* @brief Test case XS::TypeTraits
*/


#define XSTEST_GTEST_COMPAT
#include <XSTest/XSTest.hpp>
#include <XS/TypeTraits.hpp>

#ifdef _WIN32

#include <gtest/gtest.h>

#else

/* Disabled warnings for GoogleMock */
#ifdef __clang__
#pragma clang diagnostic ignored "-Wglobal-constructors"
#pragma clang diagnostic ignored "-Wpadded"
#pragma clang diagnostic push
#if __clang_major__ >= 7
#pragma clang diagnostic ignored "-Wreserved-id-macro"
#endif
#pragma clang diagnostic ignored "-Wmissing-noreturn"
#pragma clang diagnostic ignored "-Wpadded"
#pragma clang diagnostic ignored "-Wused-but-marked-unused"
#pragma clang diagnostic ignored "-Wdeprecated"
#endif

#include <GoogleMock/GoogleMock.h>

#ifdef __clang__
#pragma clang diagnostic pop
#endif

#endif

using namespace testing;

class C1
{
public:
Expand Down

0 comments on commit 14341d5

Please sign in to comment.