diff --git a/Tests/AppKit/CPTextViewTest.j b/Tests/AppKit/CPTextViewTest.j
index a479ddee7..f15358ab7 100644
--- a/Tests/AppKit/CPTextViewTest.j
+++ b/Tests/AppKit/CPTextViewTest.j
@@ -1,4 +1,5 @@
 @import <AppKit/CPTextView.j>
+@import <OJMoq/OJMoq.j>
 
 [CPApplication sharedApplication]
 
@@ -6,6 +7,10 @@
 {
     CPWindow    theWindow;
     CPTextView  textView;
+
+    CPString    stringValue;
+
+    OJMoqSpy    delegateSpy
 }
 
 - (void)setUp
@@ -14,7 +19,19 @@
     theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(0.0, 0.0, 1024.0, 768.0) styleMask:CPWindowNotSizable];
     textView = [[CPTextView alloc] initWithFrame:CGRectMake(0,0,300,300)];
 
+    stringValue = @"My string  is here";
+
+    [textView setString:stringValue];
+    [textView setDelegate:self];
+
     [[theWindow contentView] addSubview:textView];
+
+    delegateSpy = spy(self);
+}
+
+- (void)tearDown
+{
+    [delegateSpy reset];
 }
 
 - (void)testMakeCPTextViewInstance
@@ -22,4 +39,46 @@
     [self assertNotNull:textView];
 }
 
+- (void)testTextViewSetStringMethod
+{
+    [self assert:stringValue equals:[textView stringValue]];
+}
+
+- (void)testTextViewSelectionRange
+{
+    var range;
+
+    [delegateSpy selector:@selector(textView:willChangeSelectionFromCharacterRange:toCharacterRange:) times:1 arguments:[textView, CPMakeRange(0,0), CPMakeRange(0, 18)]];
+    [delegateSpy selector:@selector(textViewDidChangeSelection:) times:1];
+    [textView selectAll:self];
+    range = [[textView selectedRanges] firstObject];
+    [self assert:0 equals:range.location];
+    [self assert:18 equals:range.length];
+    [delegateSpy verifyThatAllExpectationsHaveBeenMet];
+
+
+    [delegateSpy reset];
+    [delegateSpy selector:@selector(textView:willChangeSelectionFromCharacterRange:toCharacterRange:) times:1 arguments:[textView, CPMakeRange(0, 18), CPMakeRange(3, 6)]];
+    [delegateSpy selector:@selector(textViewDidChangeSelection:) times:1];
+    [textView setSelectedRange:CPMakeRange(3, 6)];
+    range = [[textView selectedRanges] firstObject];
+    [self assert:3 equals:range.location];
+    [self assert:6 equals:range.length];
+    [delegateSpy verifyThatAllExpectationsHaveBeenMet];
+}
+
+@end
+
+@implementation CPTextViewTest (CPTextViewTestDelegate)
+
+- (CPRange)textView:(CPTextView)aTextView willChangeSelectionFromCharacterRange:(CPRange)oldSelectedCharRange toCharacterRange:(CPRange)newSelectedCharRange
+{
+    return newSelectedCharRange;
+}
+
+- (void)textViewDidChangeSelection:(CPNotification)aNotification
+{
+
+}
+
 @end
\ No newline at end of file