colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-08-25 21:17:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Finished unit test based on Cocoa example With And Without Bindings 02.

Browse Source
This commit is contained in:
Alexander Ljungberg
2010-12-14 23:57:51 +01:00
parent c65726fb12
commit 244ff0d846
5 changed files with 101 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Tests/AppKit/WithAndWithoutBindingsIntegration/02_WithBindings/MyDocument.j
+6
View File
@@ -31,8 +31,14 @@
CPArray collection @accessors;
@outlet CPTableView tableView;
// For debugging only.
@outlet CPTextField nameField;
@outlet CPButton addButton;
@outlet CPButton removeButton;
@outlet MyArrayController arrayController;
@outlet CPTextField selectedBookmarkTitleField;
@outlet CPTextField selectedBookmarkURLField;
}
Tests/AppKit/WithAndWithoutBindingsIntegration/02_WithBindings/Resources/02_WithBindings.cib
+1 -1
View File
File diff suppressed because one or more lines are too long
Tests/AppKit/WithAndWithoutBindingsIntegration/02_WithBindings/Resources/02_WithBindings.xib
+80 -34
View File
@@ -383,12 +383,13 @@
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
</object>
<object class="NSArrayController" id="875350520">
<object class="NSArrayController" id="672964204">
<object class="NSMutableArray" key="NSDeclaredKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>title</string>
<string>URL</string>
</object>
<string key="NSObjectClassName">Bookmark</string>
<bool key="NSEditable">YES</bool>
<object class="_NSManagedProxy" key="_NSManagedProxy"/>
<bool key="NSAvoidsEmptySelection">YES</bool>
@@ -453,10 +454,10 @@
<object class="IBBindingConnection" key="connection">
<string key="label">value: arrangedObjects.title</string>
<reference key="source" ref="99307196"/>
<reference key="destination" ref="875350520"/>
<reference key="destination" ref="672964204"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="99307196"/>
<reference key="NSDestination" ref="875350520"/>
<reference key="NSDestination" ref="672964204"/>
<string key="NSLabel">value: arrangedObjects.title</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">arrangedObjects.title</string>
@@ -468,10 +469,10 @@
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">contentArray: collection</string>
<reference key="source" ref="875350520"/>
<reference key="source" ref="672964204"/>
<reference key="destination" ref="1001"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="875350520"/>
<reference key="NSSource" ref="672964204"/>
<reference key="NSDestination" ref="1001"/>
<string key="NSLabel">contentArray: collection</string>
<string key="NSBinding">contentArray</string>
@@ -485,10 +486,10 @@
<object class="IBBindingConnection" key="connection">
<string key="label">value: selection.title</string>
<reference key="source" ref="912895224"/>
<reference key="destination" ref="875350520"/>
<reference key="destination" ref="672964204"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="912895224"/>
<reference key="NSDestination" ref="875350520"/>
<reference key="NSDestination" ref="672964204"/>
<string key="NSLabel">value: selection.title</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">selection.title</string>
@@ -497,31 +498,11 @@
</object>
<int key="connectionID">48</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: selection.title</string>
<reference key="source" ref="384957067"/>
<reference key="destination" ref="875350520"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="384957067"/>
<reference key="NSDestination" ref="875350520"/>
<string key="NSLabel">value: selection.title</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">selection.title</string>
<object class="NSDictionary" key="NSOptions">
<string key="NS.key.0">NSValueTransformerName</string>
<string key="NS.object.0">StringToURLTransformer</string>
</object>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">53</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">dataSource</string>
<reference key="source" ref="555316680"/>
<reference key="destination" ref="875350520"/>
<reference key="destination" ref="672964204"/>
</object>
<int key="connectionID">54</int>
</object>
@@ -529,14 +510,14 @@
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="555316680"/>
<reference key="destination" ref="875350520"/>
<reference key="destination" ref="672964204"/>
</object>
<int key="connectionID">55</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">tableView</string>
<reference key="source" ref="875350520"/>
<reference key="source" ref="672964204"/>
<reference key="destination" ref="555316680"/>
</object>
<int key="connectionID">56</int>
@@ -544,7 +525,7 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">add:</string>
<reference key="source" ref="875350520"/>
<reference key="source" ref="672964204"/>
<reference key="destination" ref="739944512"/>
</object>
<int key="connectionID">57</int>
@@ -552,11 +533,55 @@
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">remove:</string>
<reference key="source" ref="875350520"/>
<reference key="source" ref="672964204"/>
<reference key="destination" ref="987622507"/>
</object>
<int key="connectionID">58</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">addButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="739944512"/>
</object>
<int key="connectionID">59</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">removeButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="987622507"/>
</object>
<int key="connectionID">60</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">arrayController</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="672964204"/>
</object>
<int key="connectionID">61</int>
</object>
<object class="IBConnectionRecord">
<object class="IBBindingConnection" key="connection">
<string key="label">value: selection.URL</string>
<reference key="source" ref="384957067"/>
<reference key="destination" ref="672964204"/>
<object class="NSNibBindingConnector" key="connector">
<reference key="NSSource" ref="384957067"/>
<reference key="NSDestination" ref="672964204"/>
<string key="NSLabel">value: selection.URL</string>
<string key="NSBinding">value</string>
<string key="NSKeyPath">selection.URL</string>
<object class="NSDictionary" key="NSOptions">
<string key="NS.key.0">NSValueTransformerName</string>
<string key="NS.object.0">StringToURLTransformer</string>
</object>
<int key="NSNibBindingConnectorVersion">2</int>
</object>
</object>
<int key="connectionID">64</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -777,7 +802,7 @@
</object>
<object class="IBObjectRecord">
<int key="objectID">41</int>
<reference key="object" ref="875350520"/>
<reference key="object" ref="672964204"/>
<reference key="parent" ref="0"/>
<string key="objectName">My Array Controller</string>
</object>
@@ -934,7 +959,7 @@
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">58</int>
<int key="maxID">64</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -998,14 +1023,20 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addButton</string>
<string>arrayController</string>
<string>nameField</string>
<string>removeButton</string>
<string>selectedBookmarkTitleField</string>
<string>selectedBookmarkURLField</string>
<string>tableView</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSButton</string>
<string>MyArrayController</string>
<string>NSTextField</string>
<string>NSButton</string>
<string>NSTextField</string>
<string>NSTextField</string>
<string>NSTableView</string>
@@ -1015,17 +1046,32 @@
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addButton</string>
<string>arrayController</string>
<string>nameField</string>
<string>removeButton</string>
<string>selectedBookmarkTitleField</string>
<string>selectedBookmarkURLField</string>
<string>tableView</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">addButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">arrayController</string>
<string key="candidateClassName">MyArrayController</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">nameField</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">removeButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">selectedBookmarkTitleField</string>
<string key="candidateClassName">NSTextField</string>
Tests/AppKit/WithAndWithoutBindingsIntegration/02_WithBindings/StringToURLTransformer.j
+3 -3
View File
@@ -22,7 +22,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
@implementation StringToURLTransformer
@implementation StringToURLTransformer : CPValueTransformer
+ (void)initialize
{
@@ -42,12 +42,12 @@
- (id)transformedValue:(id)value
{
return value ? [value absoluteString] : nil;
return (value && ![value isEqual:[CPNull null]]) ? [value absoluteString] : nil;
}
- (id)reverseTransformedValue:(id)value
{
return value ? [CPURL URLWithString:value] : nil;
return (value && ![value isEqual:[CPNull null]]) ? [CPURL URLWithString:value] : nil;
}
@end
Tests/AppKit/WithAndWithoutBindingsIntegration/02_WithBindings/WithBindingsTest.j
+11 -11
View File
@@ -21,6 +21,7 @@
*/
@import "MyDocument.j"
@import "StringToURLTransformer.j"
/*!
Bindings test exercising the functionality seen in the Cocoa example "WithAndWithoutBindings" part 1. Part 1 does in fact not use bindings and serves only as a base line test case.
@@ -39,7 +40,7 @@
- (void)test
{
var theDocument = [MyDocument new],
cib = [CPBundle loadCibFile:[[CPBundle bundleForClass:WithoutBindingsTest] pathForResource:"01_WithoutBindings.cib"] externalNameTable:[CPDictionary dictionaryWithObject:theDocument forKey:CPCibOwner]];
cib = [CPBundle loadCibFile:[[CPBundle bundleForClass:WithBindingsTest] pathForResource:"02_WithBindings.cib"] externalNameTable:[CPDictionary dictionaryWithObject:theDocument forKey:CPCibOwner]];
[theDocument windowControllerDidLoadCib:self];
@@ -47,23 +48,22 @@
[theDocument.nameField performClick:self];
[self assert:@"Document A" equals:[theDocument name]];
[self assert:@"No selection" equals:[theDocument.selectedBookmarkTitleField stringValue]];
[self assert:@"No selection" equals:[theDocument.selectedBookmarkURLField stringValue]];
[self assert:@"No Selection" equals:[theDocument.selectedBookmarkTitleField placeholderString]];
[self assert:@"No Selection" equals:[theDocument.selectedBookmarkURLField placeholderString]];
// Action taken when the Add button is clicked.
[theDocument addBookmark:nil];
[theDocument addBookmark:nil];
[self assert:2 equals:[theDocument numberOfRowsInTableView:theDocument.tableView]];
[theDocument.addButton performClick:self];
[theDocument.addButton performClick:self];
[self assert:2 equals:[theDocument.collection count]];
[theDocument.tableView selectRowIndexes:[CPIndexSet indexSetWithIndex:0] byExtendingSelection:NO]
[self assert:@"new title" equals:[theDocument.selectedBookmarkTitleField stringValue]];
[self assert:@"No URL" equals:[theDocument.selectedBookmarkURLField stringValue]];
[self assert:@"" equals:[theDocument.selectedBookmarkURLField stringValue]];
// Edit the selected entry.
[theDocument.selectedBookmarkTitleField setStringValue:@"A Title"];
[theDocument.selectedBookmarkTitleField performClick:self];
[self assert:@"A Title" equals:[theDocument.collection[0] title]];
[self assert:@"A Title" equals:[theDocument.collection[0] title] message:"changing selectedBookmarkTitleField updated the model title"];
[theDocument.selectedBookmarkURLField setStringValue:@"http://www.slevenbits.com"];
[theDocument.selectedBookmarkURLField performClick:self];
@@ -81,11 +81,11 @@
// Verify the first entry remains.
[theDocument.tableView selectRowIndexes:[CPIndexSet indexSetWithIndex:0] byExtendingSelection:NO]
[self assert:@"A Title" equals:[theDocument.selectedBookmarkTitleField stringValue]];
[self assert:@"A Title" equals:[theDocument.selectedBookmarkTitleField stringValue] message:"first entry should not change when the second is deleted"];
[self assert:@"http://www.slevenbits.com" equals:[theDocument.selectedBookmarkURLField stringValue]];
// Remove it.
[theDocument removeSelectedBookmarks:self];
[theDocument.removeButton performClick:self];
[self assert:@"Another Title" equals:[theDocument.selectedBookmarkTitleField stringValue]];
[self assert:@"http://www.cappuccino.org" equals:[theDocument.selectedBookmarkURLField stringValue]];
}