Changeset 8830f79f for t

Timestamp:

Oct 3, 2009, 10:15:11 AM (16 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

9f5e847

Parents:

340c3e7 (diff), 1167bf1 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'davidben/context-slice'

Conflicts:
	perlglue.xs

Location:

t

Files:

• completion.t (modified) (8 diffs)
• mock.pl (modified) (1 diff)

t/completion.t

@@ -8 +8 @@
 BEGIN {require (dirname($0) . "/mock.pl");};
 
+use BarnOwl::Complete::Filter qw(complete_filter_expr);
+
 =head1 DESCRIPTION
 
@@ -20 +22 @@
     my $after_point = shift;
     
+    my $ctx = BarnOwl::Completion::Context->new($before_point,
+                                                $after_point);
+    is($ctx->line, $before_point . $after_point);
+    is($ctx->point, length $before_point);
+
+    test_ctx($ctx, @_);
+}
+
+sub test_ctx {
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+    my $ctx = shift;
+
     my $words = shift;
     my $word = shift;
@@ -27 +42 @@
     my $word_end   = shift;
 
-    my $ctx = BarnOwl::Completion::Context->new($before_point,
-                                                $after_point);
-
-    is($ctx->line, $before_point . $after_point);
-    is($ctx->point, length $before_point);
     is_deeply($ctx->words, $words);
     if (defined($word)) {
@@ -41 +51 @@
 }
 
+sub test_shift {
+    local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+    my $before_point = shift;
+    my $after_point = shift;
+    my $shift = shift;
+    
+    my $ctx = BarnOwl::Completion::Context->new($before_point,
+                                                $after_point);
+    $ctx = $ctx->shift_words($shift);
+
+    test_ctx($ctx, @_);
+}
+
 
 isa_ok(BarnOwl::Completion::Context->new('Hello, W', 'orld'), 'BarnOwl::Completion::Context');
@@ -108 +132 @@
               1, -1, 7, 12);
 
+## Test Context::shift
+test_shift('lorem ipsum dolor ', 'sit amet', 0,
+           [qw(lorem ipsum dolor sit amet)],
+           3, 0, 18, 21);
+
+test_shift('lorem ipsum dolor ', 'sit amet', 1,
+           [qw(ipsum dolor sit amet)],
+           2, 0, 12, 15);
+
+test_shift('lorem ipsum dolor ', 'sit amet', 2,
+           [qw(dolor sit amet)],
+           1, 0, 6, 9);
+
+test_shift('lorem ipsum dolor ', 'sit amet', 3,
+           [qw(sit amet)],
+           0, 0, 0, 3);
+
+eval {
+    my $before_point = 'lorem ipsum dolor';
+    my $after_point = 'sit amet';
+    my $shift = 4;
+
+    my $ctx = BarnOwl::Completion::Context->new($before_point,
+                                                $after_point);
+    $ctx = $ctx->shift_words($shift);
+};
+like($@, qr/^Context::shift: Unable to shift /, "Correctly die when shifting away the point");
 
 ## Test common_prefix
@@ -163 +214 @@
 
 test_complete('zwrite -c nelhage ', '',
-              [qw(-n -C -m -c -i -r -O nelhage asedeno geofft)]);
+              [qw(-n -C -m -i -r -O nelhage asedeno geofft)]);
 
 test_complete('zwrite -c nelhage ', '-',
-              [qw(-n -C -m -c -i -r -O nelhage asedeno geofft)]);
+              [qw(-n -C -m -i -r -O nelhage asedeno geofft)]);
 
 test_complete('zwrite -c nelhage -- ', '',
@@ -178 +229 @@
                               "-d" => sub {qw(some words for completing)},
                           },
-                          sub {$_[1]});
+                          sub {$_[1]},
+                          repeat_flags => 1);
 }
 
@@ -203 +255 @@
               [qw(2)], \&complete_word);
 
+
+# Test the filter expression completer
+test_complete('', '',
+              [qw[( body class direction false filter hostname instance login not opcode perl realm recipient sender true type]],
+              \&complete_filter_expr);
+
+test_complete('not ', '',
+              [qw[( body class direction false filter hostname instance login not opcode perl realm recipient sender true type]],
+              \&complete_filter_expr);
+
+test_complete('true ', '',
+              [qw[and or]],
+              \&complete_filter_expr);
+
+test_complete('( true ', '',
+              [qw[and or )]],
+              \&complete_filter_expr);
+
+test_complete('( body static and body analysis and not false and class davidben and ( instance python or instance hotd ', '',
+              [qw[and or )]],
+              \&complete_filter_expr);
+
+test_complete('type ', '',
+              [qw[admin aim zephyr]],
+              \&complete_filter_expr);
+
+test_complete('direction ', '',
+              [qw[in out none]],
+              \&complete_filter_expr);
+
+test_complete('login ', '',
+              [qw[login logout none]],
+              \&complete_filter_expr);
+
 1;
 

t/mock.pl

@@ -7 +7 @@
 use Carp;
 
-sub bootstrap {}
 sub get_data_dir {"."}
 sub get_config_dir {"."}