Skip to content
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.

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

Greatly simplified CocoaAMF module with tests without client and other tools #17

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion CocoaAMF-Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleIdentifier</key>
<string>com.nesium.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
Expand Down
1,308 changes: 582 additions & 726 deletions CocoaAMF.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Binary file not shown.
99 changes: 99 additions & 0 deletions CocoaAMF.xcodeproj/xcshareddata/xcschemes/CocoaAMF.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "ED17596A21932E4A00FB6017"
BuildableName = "CocoaAMF.framework"
BlueprintName = "CocoaAMF"
ReferencedContainer = "container:CocoaAMF.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "ED17597221932E4A00FB6017"
BuildableName = "CocoaAMFTests.xctest"
BlueprintName = "CocoaAMFTests"
ReferencedContainer = "container:CocoaAMF.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "ED17596A21932E4A00FB6017"
BuildableName = "CocoaAMF.framework"
BlueprintName = "CocoaAMF"
ReferencedContainer = "container:CocoaAMF.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "ED17596A21932E4A00FB6017"
BuildableName = "CocoaAMF.framework"
BlueprintName = "CocoaAMF"
ReferencedContainer = "container:CocoaAMF.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "ED17596A21932E4A00FB6017"
BuildableName = "CocoaAMF.framework"
BlueprintName = "CocoaAMF"
ReferencedContainer = "container:CocoaAMF.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
56 changes: 56 additions & 0 deletions CocoaAMF.xcodeproj/xcshareddata/xcschemes/CocoaAMFTests.xcscheme
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1010"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "ED17597221932E4A00FB6017"
BuildableName = "CocoaAMFTests.xctest"
BlueprintName = "CocoaAMFTests"
ReferencedContainer = "container:CocoaAMF.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
<Bucket
type = "1"
version = "2.0">
<Breakpoints>
<BreakpointProxy
BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
<BreakpointContent
shouldBeEnabled = "Yes"
ignoreCount = "0"
continueAfterRunningActions = "No"
filePath = "Tests/AbstractAMFTest.m"
timestampString = "563295758.9258029"
startingColumnNumber = "9223372036854775807"
endingColumnNumber = "9223372036854775807"
startingLineNumber = "53"
endingLineNumber = "53"
landmarkName = "-fullPathForTestFile:version:"
landmarkType = "7">
</BreakpointContent>
</BreakpointProxy>
</Breakpoints>
</Bucket>
14 changes: 7 additions & 7 deletions CocoaAMF/AMFActionMessage.m
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ - (NSData *)data{
[headerBa encodeUnsignedChar:kAMF0AVMPlusObjectType];
}
[headerBa encodeObject:header.data];
[ba encodeUnsignedInt:[headerBa.data length]];
[ba encodeUnsignedInt:(uint32_t)[headerBa.data length]];
[ba encodeDataObject:headerBa.data];
[headerBa release];
}
Expand All @@ -87,7 +87,7 @@ - (NSData *)data{
[bodyBa encodeUnsignedChar:kAMF0AVMPlusObjectType];
}
[bodyBa encodeObject:body.data];
[ba encodeUnsignedInt:[bodyBa.data length]];
[ba encodeUnsignedInt:(uint32_t)[bodyBa.data length]];
[ba encodeDataObject:bodyBa.data];
[bodyBa release];
}
Expand Down Expand Up @@ -136,8 +136,8 @@ - (void)mergeActionMessage:(AMFActionMessage *)message{
}

- (NSString *)description{
return [NSString stringWithFormat:@"<%@ = 0x%08X | version: %d | headers: %d bodies: %d>\nheaders:\n%@\nbodies:\n%@",
[self class], (long)self, m_version, [m_headers count], [m_bodies count],
return [NSString stringWithFormat:@"<%@ = 0x%08lX | version: %d | headers: %lu bodies: %lu>\nheaders:\n%@\nbodies:\n%@",
[self class], (long)self, m_version, (unsigned long)[m_headers count], (unsigned long)[m_bodies count],
m_headers, m_bodies];
}

Expand Down Expand Up @@ -223,7 +223,7 @@ - (void)dealloc{
}

- (NSString *)description{
return [NSString stringWithFormat:@"<%@ = 0x%08X | name: %@ | mustUnderstand: %d>\n%@",
return [NSString stringWithFormat:@"<%@ = 0x%08lX | name: %@ | mustUnderstand: %d>\n%@",
[self class], (long)self, m_name, m_mustUnderstand, m_data];
}

Expand Down Expand Up @@ -261,8 +261,8 @@ - (void)dealloc{
}

- (NSString *)description{
return [NSString stringWithFormat:@"<%@ = 0x%08X | targetURI: %@ | responseURI: %@>\n%@",
return [NSString stringWithFormat:@"<%@ = 0x%08lX | targetURI: %@ | responseURI: %@>\n%@",
[self class], (long)self, m_targetURI, m_responseURI, m_data];
}

@end
@end
Loading