Skip to content

Fix method -increaseRef on PhxSocket, add tests #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gskbyte wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Fix method -increaseRef on PhxSocket, add tests #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
12e8e87
Add nullability specifiers
Feb 22, 2016
753a013
Set type of timeIntervals to NSTimeInterval
Feb 22, 2016
4861c5a
Uncrustify all files
Feb 22, 2016
6030cfb
Uncrustify all files
Feb 22, 2016
e2fbe9c
Revert "Uncrustify all files"
Feb 22, 2016
ede2edd
Add strong property modifiers, rename ms parameters to timeInterval
Feb 22, 2016
4895288
Merge pull request #1 from xing/modernize_objc
gskbyte Feb 22, 2016
e6038eb
Remove unneeded strong modifiers
Feb 22, 2016
4f46b87
Merge branch 'modernize_objc'
Feb 22, 2016
7730071
Fix reference generation on PhxSocket
Feb 22, 2016
023551f
Update project structure to be able to add tests, add tests for PhxSo…
Feb 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 34 additions & 7 deletions Example/ChannelDemo/ChannelDemo.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@

/* Begin PBXBuildFile section */
1CA202C385D53C0106993074 /* libPods.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C10C6B517F156A7FEEBBCDD4 /* libPods.a */; };
285A656BF2E1213C3B7D40F7 /* libPods-ChannelDemo.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 53FA6C2F617F1CC930A14647 /* libPods-ChannelDemo.a */; };
C0127C321C7B305300D305EA /* PhxSocketTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C0127C311C7B305300D305EA /* PhxSocketTests.m */; };
C8A2C2DF1B83D2E3007CF006 /* Interface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C8A2C2DD1B83D2E3007CF006 /* Interface.storyboard */; };
C8A2C2E11B83D2E3007CF006 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C8A2C2E01B83D2E3007CF006 /* Assets.xcassets */; };
C8A2C2E81B83D2E3007CF006 /* WatchChannel Extension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = C8A2C2E71B83D2E3007CF006 /* WatchChannel Extension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
Expand All @@ -22,7 +24,6 @@
C8FD276A1B824CBB0030D3A1 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = C8FD27681B824CBB0030D3A1 /* Main.storyboard */; };
C8FD276C1B824CBB0030D3A1 /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = C8FD276B1B824CBB0030D3A1 /* Images.xcassets */; };
C8FD276F1B824CBB0030D3A1 /* LaunchScreen.xib in Resources */ = {isa = PBXBuildFile; fileRef = C8FD276D1B824CBB0030D3A1 /* LaunchScreen.xib */; };
C8FD277B1B824CBB0030D3A1 /* ChannelDemoTests.m in Sources */ = {isa = PBXBuildFile; fileRef = C8FD277A1B824CBB0030D3A1 /* ChannelDemoTests.m */; };
C8FD27861B824F2D0030D3A1 /* RootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = C8FD27851B824F2D0030D3A1 /* RootViewController.m */; };
/* End PBXBuildFile section */

Expand Down Expand Up @@ -76,6 +77,10 @@
/* End PBXCopyFilesBuildPhase section */

/* Begin PBXFileReference section */
2E381E80AE016A9BEFD73936 /* Pods-ChannelDemo.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ChannelDemo.debug.xcconfig"; path = "Pods/Target Support Files/Pods-ChannelDemo/Pods-ChannelDemo.debug.xcconfig"; sourceTree = "<group>"; };
4EA520D21236A441376C9496 /* Pods-ChannelDemo.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ChannelDemo.release.xcconfig"; path = "Pods/Target Support Files/Pods-ChannelDemo/Pods-ChannelDemo.release.xcconfig"; sourceTree = "<group>"; };
53FA6C2F617F1CC930A14647 /* libPods-ChannelDemo.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ChannelDemo.a"; sourceTree = BUILT_PRODUCTS_DIR; };
C0127C311C7B305300D305EA /* PhxSocketTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PhxSocketTests.m; sourceTree = "<group>"; };
C10C6B517F156A7FEEBBCDD4 /* libPods.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libPods.a; sourceTree = BUILT_PRODUCTS_DIR; };
C8A2C2DB1B83D2E3007CF006 /* WatchChannel.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = WatchChannel.app; sourceTree = BUILT_PRODUCTS_DIR; };
C8A2C2DE1B83D2E3007CF006 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Interface.storyboard; sourceTree = "<group>"; };
Expand Down Expand Up @@ -103,7 +108,6 @@
C8FD276E1B824CBB0030D3A1 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/LaunchScreen.xib; sourceTree = "<group>"; };
C8FD27741B824CBB0030D3A1 /* ChannelDemoTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ChannelDemoTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
C8FD27791B824CBB0030D3A1 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
C8FD277A1B824CBB0030D3A1 /* ChannelDemoTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ChannelDemoTests.m; sourceTree = "<group>"; };
C8FD27841B824F2D0030D3A1 /* RootViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RootViewController.h; sourceTree = "<group>"; };
C8FD27851B824F2D0030D3A1 /* RootViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RootViewController.m; sourceTree = "<group>"; };
CB0937933B6AFAAAF9AE0C73 /* Pods.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = Pods.release.xcconfig; path = "Pods/Target Support Files/Pods/Pods.release.xcconfig"; sourceTree = "<group>"; };
Expand All @@ -123,6 +127,7 @@
buildActionMask = 2147483647;
files = (
1CA202C385D53C0106993074 /* libPods.a in Frameworks */,
285A656BF2E1213C3B7D40F7 /* libPods-ChannelDemo.a in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand All @@ -141,6 +146,8 @@
children = (
E859913CBF06D5994D3F6F9F /* Pods.debug.xcconfig */,
CB0937933B6AFAAAF9AE0C73 /* Pods.release.xcconfig */,
2E381E80AE016A9BEFD73936 /* Pods-ChannelDemo.debug.xcconfig */,
4EA520D21236A441376C9496 /* Pods-ChannelDemo.release.xcconfig */,
);
name = Pods;
sourceTree = "<group>";
Expand All @@ -149,6 +156,7 @@
isa = PBXGroup;
children = (
C10C6B517F156A7FEEBBCDD4 /* libPods.a */,
53FA6C2F617F1CC930A14647 /* libPods-ChannelDemo.a */,
);
name = Frameworks;
sourceTree = "<group>";
Expand Down Expand Up @@ -240,8 +248,8 @@
C8FD27771B824CBB0030D3A1 /* ChannelDemoTests */ = {
isa = PBXGroup;
children = (
C8FD277A1B824CBB0030D3A1 /* ChannelDemoTests.m */,
C8FD27781B824CBB0030D3A1 /* Supporting Files */,
C0127C311C7B305300D305EA /* PhxSocketTests.m */,
);
path = ChannelDemoTests;
sourceTree = "<group>";
Expand Down Expand Up @@ -301,6 +309,7 @@
C8FD27561B824CBB0030D3A1 /* Resources */,
74047D023A8B11609688717A /* Copy Pods Resources */,
C8A2C3041B83D2E3007CF006 /* Embed Watch Content */,
25E1943152DE11671E8C6136 /* Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -418,6 +427,21 @@
/* End PBXResourcesBuildPhase section */

/* Begin PBXShellScriptBuildPhase section */
25E1943152DE11671E8C6136 /* Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputPaths = (
);
name = "Embed Pods Frameworks";
outputPaths = (
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ChannelDemo/Pods-ChannelDemo-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
39425A3292C4C6D3DAD77294 /* Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -445,7 +469,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods/Pods-resources.sh\"\n";
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-ChannelDemo/Pods-ChannelDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
Expand Down Expand Up @@ -476,7 +500,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
C8FD277B1B824CBB0030D3A1 /* ChannelDemoTests.m in Sources */,
C0127C321C7B305300D305EA /* PhxSocketTests.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -672,7 +696,7 @@
};
C8FD277F1B824CBB0030D3A1 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = E859913CBF06D5994D3F6F9F /* Pods.debug.xcconfig */;
baseConfigurationReference = 2E381E80AE016A9BEFD73936 /* Pods-ChannelDemo.debug.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = ChannelDemo/Info.plist;
Expand All @@ -683,7 +707,7 @@
};
C8FD27801B824CBB0030D3A1 /* Release */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = CB0937933B6AFAAAF9AE0C73 /* Pods.release.xcconfig */;
baseConfigurationReference = 4EA520D21236A441376C9496 /* Pods-ChannelDemo.release.xcconfig */;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
INFOPLIST_FILE = ChannelDemo/Info.plist;
Expand All @@ -694,6 +718,7 @@
};
C8FD27821B824CBB0030D3A1 /* Debug */ = {
isa = XCBuildConfiguration;
baseConfigurationReference = 2E381E80AE016A9BEFD73936 /* Pods-ChannelDemo.debug.xcconfig */;
buildSettings = {
BUNDLE_LOADER = "$(TEST_HOST)";
FRAMEWORK_SEARCH_PATHS = (
Expand Down Expand Up @@ -736,6 +761,7 @@
C8A2C3001B83D2E3007CF006 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C8A2C3031B83D2E3007CF006 /* Build configuration list for PBXNativeTarget "WatchChannel" */ = {
isa = XCConfigurationList;
Expand All @@ -744,6 +770,7 @@
C8A2C2FE1B83D2E3007CF006 /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
C8FD27531B824CBB0030D3A1 /* Build configuration list for PBXProject "ChannelDemo" */ = {
isa = XCConfigurationList;
Expand Down
30 changes: 30 additions & 0 deletions Example/ChannelDemo/ChannelDemo.xcworkspace/xcshareddata/ChannelDemo.xcscmblueprint
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{
"DVTSourceControlWorkspaceBlueprintPrimaryRemoteRepositoryKey" : "CADD452DA44BF6FB92BE421609755AA0B0272379",
"DVTSourceControlWorkspaceBlueprintWorkingCopyRepositoryLocationsKey" : {

},
"DVTSourceControlWorkspaceBlueprintWorkingCopyStatesKey" : {
"CADD452DA44BF6FB92BE421609755AA0B0272379" : 0,
"199C7AE3B07D8A440AD065D13101EE9D7E799F10" : 0
},
"DVTSourceControlWorkspaceBlueprintIdentifierKey" : "934898A3-4DCF-4E03-B853-DB9C7D3B77AE",
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"CADD452DA44BF6FB92BE421609755AA0B0272379" : "ObjCPhoenixClient\/",
"199C7AE3B07D8A440AD065D13101EE9D7E799F10" : ""
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "ChannelDemo",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
"DVTSourceControlWorkspaceBlueprintRelativePathToProjectKey" : "Example\/ChannelDemo\/ChannelDemo.xcworkspace",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoriesKey" : [
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/source.xing.com\/ios\/XNGMessenger.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "199C7AE3B07D8A440AD065D13101EE9D7E799F10"
},
{
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryURLKey" : "https:\/\/github.com\/xing\/ObjCPhoenixClient.git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositorySystemKey" : "com.apple.dt.Xcode.sourcecontrol.Git",
"DVTSourceControlWorkspaceBlueprintRemoteRepositoryIdentifierKey" : "CADD452DA44BF6FB92BE421609755AA0B0272379"
}
]
}
40 changes: 0 additions & 40 deletions Example/ChannelDemo/ChannelDemoTests/ChannelDemoTests.m
View file
Open in desktop

This file was deleted.

31 changes: 31 additions & 0 deletions Example/ChannelDemo/ChannelDemoTests/PhxSocketTests.m
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
//
// PhxSocketTests.m
// ChannelDemo
//
// Created by Jose Alcalá-Correa on 22/02/16.
// Copyright © 2016 PhoenixFramework. All rights reserved.
//

#import <XCTest/XCTest.h>
#import <PhoenixClient/PhoenixClient.h>

@interface PhxSocketTests : XCTestCase

@end

@implementation PhxSocketTests

- (void)testIncreasingReference {
PhxSocket *socket = [[PhxSocket alloc] initWithURL:[NSURL URLWithString:@"http://test.com/socket"]];

NSString *ref = [socket makeRef];
XCTAssertEqualObjects(ref, @"1");

ref = [socket makeRef];
XCTAssertEqualObjects(ref, @"2");

ref = [socket makeRef];
XCTAssertEqualObjects(ref, @"3");
}

@end
10 changes: 10 additions & 0 deletions Example/ChannelDemo/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,14 @@
source 'https://github.com/CocoaPods/Specs.git'

platform :ios, '8.0'

workspace '../../PhoenixClient'
xcodeproj 'ChannelDemo.xcodeproj'

target "ChannelDemo" do
pod 'PhoenixClient', :path => '../../'
end

target "ChannelDemoTests" do

end
12 changes: 6 additions & 6 deletions Example/ChannelDemo/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PODS:
- PhoenixClient (0.1.0):
- SocketRocket (= 0.3.1-beta2)
- SocketRocket (0.3.1-beta2)
- PhoenixClient (1.1.0):
- SocketRocket (= 0.4.2)
- SocketRocket (0.4.2)

DEPENDENCIES:
- PhoenixClient (from `../../`)
Expand All @@ -11,7 +11,7 @@ EXTERNAL SOURCES:
:path: "../../"

SPEC CHECKSUMS:
PhoenixClient: a769f4a0103e87720f5b652185dd9a15079e9c28
SocketRocket: 7284ab9370a06c99aba92b2fe3a32aedd0f9a6fa
PhoenixClient: bb4b343dc16df49ad168c7833a06b0953f991df3
SocketRocket: ffe08119b00ef982f6c37052a4705a057c8494ad

COCOAPODS: 0.38.2
COCOAPODS: 0.39.0
1 change: 1 addition & 0 deletions Example/ChannelDemo/Pods/Headers/Private/PhoenixClient/NSString+URLEncoding.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Example/ChannelDemo/Pods/Headers/Private/SocketRocket/NSData+SRB64Additions.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Example/ChannelDemo/Pods/Headers/Private/SocketRocket/base64.h
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions Example/ChannelDemo/Pods/Headers/Public/PhoenixClient/NSString+URLEncoding.h
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Example/ChannelDemo/Pods/Headers/Public/SocketRocket/NSData+SRB64Additions.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Example/ChannelDemo/Pods/Headers/Public/SocketRocket/base64.h
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions Example/ChannelDemo/Pods/Local Podspecs/PhoenixClient.podspec.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Example/ChannelDemo/Pods/Manifest.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading