Browse Source

rm none compiling test code

MOS-7
Andreas Buff 2 years ago
parent
commit
54f27d4022
15 changed files with 19 additions and 565 deletions
  1. +0
    -82
      Submodules/downloadclient/Makefile
  2. +0
    -7
      Submodules/downloadclient/Makefile.conf
  3. +0
    -0
      Submodules/downloadclient/tests/Resources/public.der
  4. +0
    -0
      Submodules/downloadclient/tests/run_tests.sh
  5. +0
    -0
      Submodules/downloadclient/tests/test_https.cc
  6. +0
    -0
      Submodules/downloadclient/tests/test_noupdate.cc
  7. +0
    -0
      Submodules/downloadclient/tests/test_split_url.cc
  8. +0
    -0
      Submodules/downloadclient/tests/test_updater.cc
  9. +0
    -117
      Submodules/pEpNotifications/pEpNotifications.xcodeproj/project.pbxproj
  10. +0
    -261
      pEpMacOSAdapter.xcodeproj/project.pbxproj
  11. +19
    -0
      pEpMacOSAdapter.xcodeproj/xcshareddata/xcschemes/pEpUpdater Test.xcscheme
  12. +0
    -22
      pEpUpdater Test/Info.plist
  13. +0
    -66
      pEpUpdater Test/pEpUpdater_Test.m
  14. BIN
      pEpUpdater Test/test.der
  15. +0
    -10
      pEpUpdater Test/test.plist

+ 0
- 82
Submodules/downloadclient/Makefile View File

@ -1,82 +0,0 @@
# this file is under GNU GPL 3.0, see LICENSE.txt
# see LICENSE.txt
PREFIX=$(HOME)
PEP=$(HOME)
BOOST_INCLUDE=$(HOME)/dev/boost_1_72_0
BOOST_LIB=$(HOME)/dev/boost_1_72_0/stage/lib
CRYPTOPP_INCLUDE?=/opt/local/include
CRYPTOPP_LIB?=/opt/local/lib
OPENSSL_INCLUDE?=$(HOME)/include
OPENSSL_LIB?=$(HOME)/lib
ifeq ($(wildcard local.conf),local.conf)
-include local.conf
endif
CXXFLAGS += -std=c++14 -O0 -g
CXXFLAGS += -I$(BOOST_INCLUDE) -I$(CRYPTOPP_INCLUDE)
LDFLAGS+=$(BOOST_LIB)/libboost_regex.a $(BOOST_LIB)/libboost_iostreams.a $(BOOST_LIB)/libboost_system.a
LDFLAGS+=$(CRYPTOPP_LIB)/libcryptopp.a
LDFLAGS+=$(OPENSSL_LIB)/libssl.a $(OPENSSL_LIB)/libcrypto.a
TARGET=libdownloadclient.a
SOURCE=$(wildcard *.cc)
HEADERS=$(wildcard *.hh *.hxx)
OBJECTS=$(subst .cc,.o,$(SOURCE))
WITHOUT_TESTS=$(patsubst test_%.o,,$(OBJECTS))
TESTSOURCE=$(wildcard test_*.cc)
TESTOBJECTS=$(subst .cc,.o,$(TESTSOURCE))
TESTS=$(subst .cc,,$(TESTSOURCE))
all: $(TARGET)
%.o: %.cc %.hh
$(CXX) $(CXXFLAGS) -c $<
$(TARGET): $(WITHOUT_TESTS)
ar -rc $@ $^
.PHONY: clean install uninstall test
clean:
rm -f $(TARGET) *.o *.a
rm -f $(TESTS)
install: $(TARGET)
-mkdir -p $(PEP)/include/pEp
cp $(HEADERS) $(PEP)/include/pEp/
cp $(TARGET) $(PEP)/lib/
uninstall:
cd $(PEP)/include && rm -f $(HEADERS)
cd $(PEP)/lib && rm -f $(TARGET)
test_%: test_%.o $(TARGET)
$(CXX) $(LDFLAGS) $< $(TARGET) -o $@
test: $(TESTS)
. run_tests.sh $(TESTS)
tags: $(SOURCE) $(HEADERS)
ctags $(SOURCE) $(HEADERS)
local.conf:
@echo PREFIX=$(PREFIX) > local.conf
@echo PEP=$(PEP) >> local.conf
@echo >> local.conf
@echo BOOST_INCLUDE=$(BOOST_INCLUDE) >> local.conf
@echo BOOST_LIB=$(BOOST_LIB) >> local.conf
@echo >> local.conf
@echo CRYPTOPP_INCLUDE=$(CRYPTOPP_INCLUDE) >> local.conf
@echo CRYPTOPP_LIB=$(CRYPTOPP_LIB) >> local.conf
@echo >> local.conf
@echo OPENSSL_INCLUDE=$(OPENSSL_INCLUDE) >> local.conf
@echo OPENSSL_LIB=$(OPENSSL_LIB) >> local.conf

+ 0
- 7
Submodules/downloadclient/Makefile.conf View File

@ -1,7 +0,0 @@
# this file is under GNU GPL 3.0, see LICENSE.txt
# see LICENSE.txt
TARGET=libdownloadclient.a
PREFIX=$(HOME)
PEP=$(HOME)

Submodules/downloadclient/public.der → Submodules/downloadclient/tests/Resources/public.der View File


Submodules/downloadclient/run_tests.sh → Submodules/downloadclient/tests/run_tests.sh View File


Submodules/downloadclient/test_https.cc → Submodules/downloadclient/tests/test_https.cc View File


Submodules/downloadclient/test_noupdate.cc → Submodules/downloadclient/tests/test_noupdate.cc View File


Submodules/downloadclient/test_split_url.cc → Submodules/downloadclient/tests/test_split_url.cc View File


Submodules/downloadclient/test_updater.cc → Submodules/downloadclient/tests/test_updater.cc View File


+ 0
- 117
Submodules/pEpNotifications/pEpNotifications.xcodeproj/project.pbxproj View File

@ -10,21 +10,10 @@
3527B2B224802F84007A6276 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3527B2B124802F84007A6276 /* AppDelegate.swift */; };
3527B2B624802F87007A6276 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3527B2B524802F87007A6276 /* Assets.xcassets */; };
3527B2B924802F87007A6276 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 3527B2B824802F87007A6276 /* Preview Assets.xcassets */; };
3527B2C824802F87007A6276 /* pEpNotificationsTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3527B2C724802F87007A6276 /* pEpNotificationsTests.swift */; };
3594303F2483011000DCBD65 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 3594303D2483011000DCBD65 /* Main.storyboard */; };
359430482483264F00DCBD65 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 3594304A2483264F00DCBD65 /* Localizable.strings */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
3527B2C424802F87007A6276 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3527B2A624802F84007A6276 /* Project object */;
proxyType = 1;
remoteGlobalIDString = 3527B2AD24802F84007A6276;
remoteInfo = pEpNotifications;
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
3527B2AE24802F84007A6276 /* p≡p updates.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "p≡p updates.app"; sourceTree = BUILT_PRODUCTS_DIR; };
3527B2B124802F84007A6276 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
@ -32,7 +21,6 @@
3527B2B824802F87007A6276 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
3527B2BD24802F87007A6276 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3527B2BE24802F87007A6276 /* pEpNotifications.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = pEpNotifications.entitlements; sourceTree = "<group>"; };
3527B2C324802F87007A6276 /* pEpNotificationsTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = pEpNotificationsTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
3527B2C724802F87007A6276 /* pEpNotificationsTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = pEpNotificationsTests.swift; sourceTree = "<group>"; };
3527B2C924802F87007A6276 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
3594303E2483011000DCBD65 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = "<group>"; };
@ -50,13 +38,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
3527B2C024802F87007A6276 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
@ -73,7 +54,6 @@
isa = PBXGroup;
children = (
3527B2AE24802F84007A6276 /* p≡p updates.app */,
3527B2C324802F87007A6276 /* pEpNotificationsTests.xctest */,
);
name = Products;
sourceTree = "<group>";
@ -130,24 +110,6 @@
productReference = 3527B2AE24802F84007A6276 /* p≡p updates.app */;
productType = "com.apple.product-type.application";
};
3527B2C224802F87007A6276 /* pEpNotificationsTests */ = {
isa = PBXNativeTarget;
buildConfigurationList = 3527B2DA24802F87007A6276 /* Build configuration list for PBXNativeTarget "pEpNotificationsTests" */;
buildPhases = (
3527B2BF24802F87007A6276 /* Sources */,
3527B2C024802F87007A6276 /* Frameworks */,
3527B2C124802F87007A6276 /* Resources */,
);
buildRules = (
);
dependencies = (
3527B2C524802F87007A6276 /* PBXTargetDependency */,
);
name = pEpNotificationsTests;
productName = pEpNotificationsTests;
productReference = 3527B2C324802F87007A6276 /* pEpNotificationsTests.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@ -161,10 +123,6 @@
3527B2AD24802F84007A6276 = {
CreatedOnToolsVersion = 11.5;
};
3527B2C224802F87007A6276 = {
CreatedOnToolsVersion = 11.5;
TestTargetID = 3527B2AD24802F84007A6276;
};
};
};
buildConfigurationList = 3527B2A924802F84007A6276 /* Build configuration list for PBXProject "pEpNotifications" */;
@ -182,7 +140,6 @@
projectRoot = "";
targets = (
3527B2AD24802F84007A6276 /* p≡p updates */,
3527B2C224802F87007A6276 /* pEpNotificationsTests */,
);
};
/* End PBXProject section */
@ -199,13 +156,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
3527B2C124802F87007A6276 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
@ -238,24 +188,8 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
3527B2BF24802F87007A6276 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
3527B2C824802F87007A6276 /* pEpNotificationsTests.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
3527B2C524802F87007A6276 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
target = 3527B2AD24802F84007A6276 /* p≡p updates */;
targetProxy = 3527B2C424802F87007A6276 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin PBXVariantGroup section */
3594303D2483011000DCBD65 /* Main.storyboard */ = {
isa = PBXVariantGroup;
@ -447,48 +381,6 @@
};
name = Release;
};
3527B2DB24802F87007A6276 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = pEpNotificationsTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
PRODUCT_BUNDLE_IDENTIFIER = pEp.foundation.pEpNotificationsTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/pEpNotifications.app/Contents/MacOS/pEpNotifications";
};
name = Debug;
};
3527B2DC24802F87007A6276 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
INFOPLIST_FILE = pEpNotificationsTests/Info.plist;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
);
MACOSX_DEPLOYMENT_TARGET = 10.15;
PRODUCT_BUNDLE_IDENTIFIER = pEp.foundation.pEpNotificationsTests;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_VERSION = 5.0;
TEST_HOST = "$(BUILT_PRODUCTS_DIR)/pEpNotifications.app/Contents/MacOS/pEpNotifications";
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@ -510,15 +402,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
3527B2DA24802F87007A6276 /* Build configuration list for PBXNativeTarget "pEpNotificationsTests" */ = {
isa = XCConfigurationList;
buildConfigurations = (
3527B2DB24802F87007A6276 /* Debug */,
3527B2DC24802F87007A6276 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 3527B2A624802F84007A6276 /* Project object */;


+ 0
- 261
pEpMacOSAdapter.xcodeproj/project.pbxproj View File

@ -10,61 +10,15 @@
15CC85A72546D71A00DC43A1 /* libdownloadclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 15CC85A62546D71A00DC43A1 /* libdownloadclient.a */; };
35380AE7247BD13A004A08A6 /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = 35380AE6247BD13A004A08A6 /* README.md */; };
35380AEA247C784E004A08A6 /* pEpUpdater.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35380AE9247C784E004A08A6 /* pEpUpdater.mm */; };
35942FBC2482A12A00DCBD65 /* test.plist in Resources */ = {isa = PBXBuildFile; fileRef = 35942FBB2482A12A00DCBD65 /* test.plist */; };
35DC18D8244DA19100FB2002 /* pEpMacOSAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 35DC18D7244DA19100FB2002 /* pEpMacOSAdapter.m */; };
35DC18DA244DA19100FB2002 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 35DC18D9244DA19100FB2002 /* main.m */; };
35F0697A247DC95A00543884 /* pEpUpdater_Test.m in Sources */ = {isa = PBXBuildFile; fileRef = 35F06979247DC95A00543884 /* pEpUpdater_Test.m */; };
35F06980247DD05F00543884 /* pEpUpdater.mm in Sources */ = {isa = PBXBuildFile; fileRef = 35380AE9247C784E004A08A6 /* pEpUpdater.mm */; };
35F06985247DD17400543884 /* libdownloadclient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 35380AD9247BBB04004A08A6 /* libdownloadclient.a */; };
35F06993247F013300543884 /* test.der in Resources */ = {isa = PBXBuildFile; fileRef = 35F06990247F00E500543884 /* test.der */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
3527B2E624802F88007A6276 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3527B2E024802F87007A6276 /* pEpNotifications.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3527B2AE24802F84007A6276;
remoteInfo = pEpNotifications;
};
3527B2E824802F88007A6276 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3527B2E024802F87007A6276 /* pEpNotifications.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3527B2C324802F87007A6276;
remoteInfo = pEpNotificationsTests;
};
3527B2EA24802F88007A6276 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 3527B2E024802F87007A6276 /* pEpNotifications.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 3527B2CE24802F87007A6276;
remoteInfo = pEpNotificationsUITests;
};
35380AD8247BBB04004A08A6 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 35380AD4247BBB03004A08A6 /* downloadclient.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 35380AC6247BBB03004A08A6;
remoteInfo = downloadclient;
};
35F0698C247E31F900543884 /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 35380AD4247BBB03004A08A6 /* downloadclient.xcodeproj */;
proxyType = 1;
remoteGlobalIDString = 35380AC5247BBB03004A08A6;
remoteInfo = downloadclient;
};
/* End PBXContainerItemProxy section */
/* Begin PBXFileReference section */
15CC85A62546D71A00DC43A1 /* libdownloadclient.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; path = libdownloadclient.a; sourceTree = BUILT_PRODUCTS_DIR; };
3527B2E024802F87007A6276 /* pEpNotifications.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = pEpNotifications.xcodeproj; path = pEpNotifications/pEpNotifications.xcodeproj; sourceTree = "<group>"; };
35380AD4247BBB03004A08A6 /* downloadclient.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = downloadclient.xcodeproj; path = ../downloadclient/downloadclient/downloadclient.xcodeproj; sourceTree = "<group>"; };
35380AE6247BD13A004A08A6 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
35380AE8247C784E004A08A6 /* pEpUpdater.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pEpUpdater.h; sourceTree = "<group>"; };
35380AE9247C784E004A08A6 /* pEpUpdater.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = pEpUpdater.mm; sourceTree = "<group>"; };
35942FBB2482A12A00DCBD65 /* test.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = test.plist; sourceTree = "<group>"; };
35BE8E4424856B9B006038C4 /* Subscriber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Subscriber.h; sourceTree = "<group>"; };
35DC18D2244DA19100FB2002 /* pEpMacOSAdapter.xpc */ = {isa = PBXFileReference; explicitFileType = "wrapper.xpc-service"; includeInIndex = 0; path = pEpMacOSAdapter.xpc; sourceTree = BUILT_PRODUCTS_DIR; };
35DC18D5244DA19100FB2002 /* pEpMacOSAdapterProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = pEpMacOSAdapterProtocol.h; sourceTree = "<group>"; };
@ -72,10 +26,6 @@
35DC18D7244DA19100FB2002 /* pEpMacOSAdapter.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = pEpMacOSAdapter.m; sourceTree = "<group>"; };
35DC18D9244DA19100FB2002 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
35DC18DB244DA19100FB2002 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
35F06977247DC95A00543884 /* pEpUpdater Test.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "pEpUpdater Test.xctest"; sourceTree = BUILT_PRODUCTS_DIR; };
35F06979247DC95A00543884 /* pEpUpdater_Test.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = pEpUpdater_Test.m; sourceTree = "<group>"; };
35F0697B247DC95A00543884 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
35F06990247F00E500543884 /* test.der */ = {isa = PBXFileReference; lastKnownFileType = file; path = test.der; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@ -87,42 +37,13 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
35F06974247DC95A00543884 /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
35F06985247DD17400543884 /* libdownloadclient.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
3527B2E124802F87007A6276 /* Products */ = {
isa = PBXGroup;
children = (
3527B2E724802F88007A6276 /* p≡p updates.app */,
3527B2E924802F88007A6276 /* pEpNotificationsTests.xctest */,
3527B2EB24802F88007A6276 /* pEpNotificationsUITests.xctest */,
);
name = Products;
sourceTree = "<group>";
};
35380AD5247BBB03004A08A6 /* Products */ = {
isa = PBXGroup;
children = (
35380AD9247BBB04004A08A6 /* libdownloadclient.a */,
);
name = Products;
sourceTree = "<group>";
};
35DC18C9244DA19100FB2002 = {
isa = PBXGroup;
children = (
3527B2E024802F87007A6276 /* pEpNotifications.xcodeproj */,
35380AD4247BBB03004A08A6 /* downloadclient.xcodeproj */,
35DC18D4244DA19100FB2002 /* pEpMacOSAdapter */,
35F06978247DC95A00543884 /* pEpUpdater Test */,
35DC18D3244DA19100FB2002 /* Products */,
35F06969247D58C800543884 /* Frameworks */,
);
@ -132,7 +53,6 @@
isa = PBXGroup;
children = (
35DC18D2244DA19100FB2002 /* pEpMacOSAdapter.xpc */,
35F06977247DC95A00543884 /* pEpUpdater Test.xctest */,
);
name = Products;
sourceTree = "<group>";
@ -161,17 +81,6 @@
name = Frameworks;
sourceTree = "<group>";
};
35F06978247DC95A00543884 /* pEpUpdater Test */ = {
isa = PBXGroup;
children = (
35F06990247F00E500543884 /* test.der */,
35F06979247DC95A00543884 /* pEpUpdater_Test.m */,
35F0697B247DC95A00543884 /* Info.plist */,
35942FBB2482A12A00DCBD65 /* test.plist */,
);
path = "pEpUpdater Test";
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@ -193,24 +102,6 @@
productReference = 35DC18D2244DA19100FB2002 /* pEpMacOSAdapter.xpc */;
productType = "com.apple.product-type.xpc-service";
};
35F06976247DC95A00543884 /* pEpUpdater Test */ = {
isa = PBXNativeTarget;
buildConfigurationList = 35F0697C247DC95A00543884 /* Build configuration list for PBXNativeTarget "pEpUpdater Test" */;
buildPhases = (
35F06973247DC95A00543884 /* Sources */,
35F06974247DC95A00543884 /* Frameworks */,
35F06975247DC95A00543884 /* Resources */,
);
buildRules = (
);
dependencies = (
35F0698D247E31F900543884 /* PBXTargetDependency */,
);
name = "pEpUpdater Test";
productName = "pEpUpdater Test";
productReference = 35F06977247DC95A00543884 /* pEpUpdater Test.xctest */;
productType = "com.apple.product-type.bundle.unit-test";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
@ -223,9 +114,6 @@
35DC18D1244DA19100FB2002 = {
CreatedOnToolsVersion = 11.4.1;
};
35F06976247DC95A00543884 = {
CreatedOnToolsVersion = 11.5;
};
};
};
buildConfigurationList = 35DC18CD244DA19100FB2002 /* Build configuration list for PBXProject "pEpMacOSAdapter" */;
@ -239,55 +127,13 @@
mainGroup = 35DC18C9244DA19100FB2002;
productRefGroup = 35DC18D3244DA19100FB2002 /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 35380AD5247BBB03004A08A6 /* Products */;
ProjectRef = 35380AD4247BBB03004A08A6 /* downloadclient.xcodeproj */;
},
{
ProductGroup = 3527B2E124802F87007A6276 /* Products */;
ProjectRef = 3527B2E024802F87007A6276 /* pEpNotifications.xcodeproj */;
},
);
projectRoot = "";
targets = (
35DC18D1244DA19100FB2002 /* pEpMacOSAdapter */,
35F06976247DC95A00543884 /* pEpUpdater Test */,
);
};
/* End PBXProject section */
/* Begin PBXReferenceProxy section */
3527B2E724802F88007A6276 /* p≡p updates.app */ = {
isa = PBXReferenceProxy;
fileType = wrapper.application;
path = "p≡p updates.app";
remoteRef = 3527B2E624802F88007A6276 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3527B2E924802F88007A6276 /* pEpNotificationsTests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = pEpNotificationsTests.xctest;
remoteRef = 3527B2E824802F88007A6276 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
3527B2EB24802F88007A6276 /* pEpNotificationsUITests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = pEpNotificationsUITests.xctest;
remoteRef = 3527B2EA24802F88007A6276 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
35380AD9247BBB04004A08A6 /* libdownloadclient.a */ = {
isa = PBXReferenceProxy;
fileType = archive.ar;
path = libdownloadclient.a;
remoteRef = 35380AD8247BBB04004A08A6 /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */
/* Begin PBXResourcesBuildPhase section */
35DC18D0244DA19100FB2002 /* Resources */ = {
isa = PBXResourcesBuildPhase;
@ -297,15 +143,6 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
35F06975247DC95A00543884 /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
35942FBC2482A12A00DCBD65 /* test.plist in Resources */,
35F06993247F013300543884 /* test.der in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
@ -340,25 +177,8 @@
);
runOnlyForDeploymentPostprocessing = 0;
};
35F06973247DC95A00543884 /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
35F0697A247DC95A00543884 /* pEpUpdater_Test.m in Sources */,
35F06980247DD05F00543884 /* pEpUpdater.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin PBXTargetDependency section */
35F0698D247E31F900543884 /* PBXTargetDependency */ = {
isa = PBXTargetDependency;
name = downloadclient;
targetProxy = 35F0698C247E31F900543884 /* PBXContainerItemProxy */;
};
/* End PBXTargetDependency section */
/* Begin XCBuildConfiguration section */
35DC18DC244DA19100FB2002 /* Debug */ = {
isa = XCBuildConfiguration;
@ -529,78 +349,6 @@
};
name = Release;
};
35F0697D247DC95A00543884 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Users/vb/dev/boost_1_72_0,
/opt/local/include,
);
INFOPLIST_FILE = "pEpUpdater Test/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
"/Users/vb/dev/boost_1_72_0/stage/lib\n/Users/vb/dev/boost_1_72_0/stage/lib\n/Users/vb/dev/boost_1_72_0/stage/lib",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/Users/vb/dev/boost_1_72_0/stage/lib,
/opt/local/lib,
);
OTHER_LDFLAGS = (
"-lssl",
"-lcrypto",
"-lboost_regex",
"-lcryptopp",
);
PRODUCT_BUNDLE_IDENTIFIER = "pEp.foundation.pEpUpdater-Test";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
USE_HEADERMAP = YES;
VALID_ARCHS = x86_64;
};
name = Debug;
};
35F0697E247DC95A00543884 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
HEADER_SEARCH_PATHS = (
"$(inherited)",
/Users/vb/dev/boost_1_72_0,
/opt/local/include,
);
INFOPLIST_FILE = "pEpUpdater Test/Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/../Frameworks",
"@loader_path/../Frameworks",
"/Users/vb/dev/boost_1_72_0/stage/lib\n/Users/vb/dev/boost_1_72_0/stage/lib\n/Users/vb/dev/boost_1_72_0/stage/lib",
);
LIBRARY_SEARCH_PATHS = (
"$(inherited)",
/Users/vb/dev/boost_1_72_0/stage/lib,
/opt/local/lib,
);
OTHER_LDFLAGS = (
"-lssl",
"-lcrypto",
"-lboost_regex",
"-lcryptopp",
);
PRODUCT_BUNDLE_IDENTIFIER = "pEp.foundation.pEpUpdater-Test";
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
USE_HEADERMAP = YES;
VALID_ARCHS = x86_64;
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
@ -622,15 +370,6 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
35F0697C247DC95A00543884 /* Build configuration list for PBXNativeTarget "pEpUpdater Test" */ = {
isa = XCConfigurationList;
buildConfigurations = (
35F0697D247DC95A00543884 /* Debug */,
35F0697E247DC95A00543884 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 35DC18CA244DA19100FB2002 /* Project object */;


+ 19
- 0
pEpMacOSAdapter.xcodeproj/xcshareddata/xcschemes/pEpUpdater Test.xcscheme View File

@ -34,6 +34,16 @@
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<BuildableProductRunnable
runnableDebuggingMode = "0">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3527B2AD24802F84007A6276"
BuildableName = "p&#x2261;p updates.app"
BlueprintName = "p&#x2261;p updates"
ReferencedContainer = "container:Submodules/pEpNotifications/pEpNotifications.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
@ -41,6 +51,15 @@
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "3527B2AD24802F84007A6276"
BuildableName = "p&#x2261;p updates.app"
BlueprintName = "p&#x2261;p updates"
ReferencedContainer = "container:Submodules/pEpNotifications/pEpNotifications.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">


+ 0
- 22
pEpUpdater Test/Info.plist View File

@ -1,22 +0,0 @@
<?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>CFBundleDevelopmentRegion</key>
<string>$(DEVELOPMENT_LANGUAGE)</string>
<key>CFBundleExecutable</key>
<string>$(EXECUTABLE_NAME)</string>
<key>CFBundleIdentifier</key>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>$(PRODUCT_NAME)</string>
<key>CFBundlePackageType</key>
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
<string>1</string>
</dict>
</plist>

+ 0
- 66
pEpUpdater Test/pEpUpdater_Test.m View File

@ -1,66 +0,0 @@
//
// pEpUpdater_Test.m
// pEpUpdater Test
//
// Created by Volker Birk on 27.05.20.
// Copyright © 2020 pp foundation. All rights reserved.
// This file is under GNU General Public License 3.0
//
#import <XCTest/XCTest.h>
#import "../pEpMacOSAdapter/pEpUpdater.h"
@interface pEpUpdater_Test : XCTestCase
@end
@implementation pEpUpdater_Test
pEpUpdater* updater;
XCTestExpectation* downloadingExpectation;
- (void)setUp {
downloadingExpectation = [XCTestExpectation alloc];
updater = [[pEpUpdater alloc] initWithSubscriber:^(enum DNType notification, NSString* name, NSString* download) { NSLog(@"notification: %d %@", notification, download); [downloadingExpectation fulfill]; }];
NSString *path = [[NSBundle bundleForClass:[pEpUpdater_Test class]] pathForResource:@"test.der" ofType:nil];
updater.configPath = [path stringByDeletingLastPathComponent];
}
- (void)tearDown {
}
- (void)testUpdate {
[updater update:@"test" usingUrl:@"https://fdik.org/cgidownload?hash=42232323234242"];
}
- (void)testUpdateWithFile {
NSError *err = nil;
[updater updateWithFile:[NSString stringWithFormat:@"%@/%@", updater.configPath, @"test.plist"] error:&err];
XCTAssertNil(err);
}
- (void)testUpdateAll {
[updater updateAll:nil];
}
- (void)testScheduleUpdate {
downloadingExpectation = [[XCTestExpectation alloc] initWithDescription:@"downloading update"];
XCTWaiter* waiter = [XCTWaiter new];
waiter.delegate = self;
[updater scheduleUpdates];
[updater.timer fire]; // don't wait 2 hours now
[waiter waitForExpectations:@[downloadingExpectation] timeout:30];
}
/*
- (void)testPerformanceExample {
// This is an example of a performance test case.
[self measureBlock:^{
// Put the code you want to measure the time of here.
}];
}
*/
@end

BIN
pEpUpdater Test/test.der View File


+ 0
- 10
pEpUpdater Test/test.plist View File

@ -1,10 +0,0 @@
<?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>name</key>
<string>test</string>
<key>url</key>
<string>https://fdik.org/cgidownload?hash=42232323234242</string>
</dict>
</plist>

Loading…
Cancel
Save