sproutit-sproutcore 1.0.20090721145236 → 1.0.20090721145251

data/frameworks/sproutcore/frameworks/datastore/tests/system/query/evaluation_of_records.js

@@ -0,0 +1,82 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Apple, Inc. and contributors.
+// License:   Licened under MIT license (see license.js)
+// ==========================================================================
+/*globals module ok equals same test MyApp */
+
+// test parsing of query string
+var store, storeKey, rec1, rec2, rec3, rec4, rec5, MyApp, q;
+module("SC.Query evaluation of records", {
+  setup: function() {
+    // setup dummy app and store
+    MyApp = SC.Object.create({
+      store: SC.Store.create()
+    });
+    
+    // setup a dummy model
+    MyApp.Foo = SC.Record.extend({});
+    
+    // load some data
+    MyApp.store.loadRecords(MyApp.Foo, [
+      { guid: 1, firstName: "John", lastName: "Doe", married: true },
+      { guid: 2, firstName: "Jane", lastName: "Doe", married: false },
+      { guid: 3, firstName: "Emily", lastName: "Parker", bornIn: 1975, married: true },
+      { guid: 4, firstName: "Johnny", lastName: "Cash", married: true },
+      { guid: 5, firstName: "Bert", lastName: "Berthold", married: true }
+    ]);
+    
+    rec1 = MyApp.store.find(MyApp.Foo,1);
+    rec2 = MyApp.store.find(MyApp.Foo,2);
+    rec3 = MyApp.store.find(MyApp.Foo,3);
+    rec4 = MyApp.store.find(MyApp.Foo,4);
+    rec5 = MyApp.store.find(MyApp.Foo,5);
+    
+    
+    q = SC.Query.create();
+  }
+});
+
+
+// ..........................................................
+// RECORD PROPERTIES
+// 
+
+test("should get record properties correctly", function() {
+  
+  q.conditions = "firstName = 'John'";
+  q.parseQuery();
+  ok(q.contains(rec1) == true, 'John should match: firstName = "John"');
+  ok(q.contains(rec2) == false, 'Jane should not match: firstName = "John"');
+  
+  q.conditions = "lastName BEGINS_WITH firstName";
+  q.parseQuery();
+  ok(q.contains(rec5) == true, 'Bert Berthold should match: lastName BEGINS_WITH firstName');
+  ok(q.contains(rec2) == false, 'Jane Doe should not match: lastName BEGINS_WITH firstName');
+
+}); 
+
+
+test("should handle undefined record properties correctly", function() {
+  
+  q.conditions = "bornIn = 1975";
+  q.parseQuery();
+  ok(q.contains(rec3) == true, 'record with bornIn set should match');
+  ok(q.contains(rec2) == false, 'record without bornIn set should not match');
+  
+  q.conditions = "bornIn = null";
+  q.parseQuery();
+  ok(q.contains(rec3) == false, 'record with bornIn set different to null should not match');
+  ok(q.contains(rec2) == true, 'record without bornIn set should match');
+  
+}); 
+
+test("should handle boolean correctly", function() {
+  
+  q.conditions = "married = true";
+  q.parseQuery();
+  ok(q.contains(rec1) == true, 'record with married set should match');
+  ok(q.contains(rec2) == false, 'record without married set should not match');
+  
+});
+  

data/frameworks/sproutcore/frameworks/datastore/tests/system/query/find_all.js

@@ -0,0 +1,362 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Apple, Inc. and contributors.
+// License:   Licened under MIT license (see license.js)
+// ==========================================================================
+/*globals module ok equals same test MyApp */
+
+// test querying through findAll on the store
+var MyApp;
+module("SC.Query querying findAll on a store", {
+  setup: function() {
+    // setup dummy app and store
+    MyApp = SC.Object.create({});
+    
+    // setup data source that just returns cached storeKeys
+    MyApp.DataSource = SC.DataSource.create({
+      
+      storeKeys: null,
+      
+      fetch: function(store, fetchKey, params) {
+        return this.storeKeys;
+      },
+      
+      destroyRecord: function(store, storeKey){
+        store.dataSourceDidDestroy(storeKey);
+        return YES;
+      }
+      
+    });
+    
+    MyApp.store = SC.Store.create().from(MyApp.DataSource);
+    
+    // setup a dummy model
+    MyApp.Foo = SC.Record.extend({});
+    MyApp.Faa = SC.Record.extend({});
+    
+    var records = [
+      { guid: 1, firstName: "John", lastName: "Doe", married: true },
+      { guid: 2, firstName: "Jane", lastName: "Doe", married: false },
+      { guid: 3, firstName: "Emily", lastName: "Parker", bornIn: 1975, married: true },
+      { guid: 4, firstName: "Johnny", lastName: "Cash", married: true },
+      { guid: 5, firstName: "Bert", lastName: "Berthold", married: true }
+    ];
+    
+    // load some data
+    MyApp.DataSource.storeKeys = MyApp.store.loadRecords(MyApp.Foo, records);
+    // for sanity check, load two record types
+    MyApp.store.loadRecords(MyApp.Faa, records);
+    
+  }
+});
+
+
+// ..........................................................
+// RECORD PROPERTIES
+// 
+
+test("should find records based on boolean", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, conditions:"married=true"});
+  
+  var records = MyApp.store.findAll(q);
+  equals(records.get('length'), 4, 'record length should be 4');
+  
+});
+
+test("should find records based on query string", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, conditions:"firstName = 'John'"});
+  var records = MyApp.store.findAll(q);
+  equals(records.get('length'), 1, 'record length should be 1');
+  equals(records.objectAt(0).get('firstName'), 'John', 'name should be John');
+
+});
+
+test("should find records based on SC.Query", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, conditions:"firstName = 'Jane'"});
+  
+  var records = MyApp.store.findAll(q);
+  equals(records.get('length'), 1, 'record length should be 1');
+  equals(records.objectAt(0).get('firstName'), 'Jane', 'name should be Jane');
+
+});
+
+test("should find records based on SC.Query without recordType", function() {
+  
+  var q = SC.Query.create({conditions:"lastName = 'Doe'"});
+  
+  var records = MyApp.store.findAll(q);
+  equals(records.get('length'), 2, 'record length should be 2');
+  equals(records.objectAt(0).get('firstName'), 'John', 'name should be John');
+  equals(records.objectAt(1).get('firstName'), 'Jane', 'name should be Jane');
+
+});
+
+test("should find records within a passed record array", function() {
+
+  var q = SC.Query.create({recordType: MyApp.Foo, conditions:"firstName = 'Emily'"});
+
+  var recArray = MyApp.store.findAll(MyApp.Foo);
+  var records = MyApp.store.findAll(q, null, recArray);
+  
+  equals(records.get('length'), 1, 'record length should be 1');
+  equals(records.objectAt(0).get('firstName'), 'Emily', 'name should be Emily');
+
+});
+
+test("changing the original store key array from data source should propagate to record array", function() {
+  
+  var records = MyApp.store.findAll(MyApp.Foo);
+  
+  equals(records.get('length'), 5, 'record length should be 5');
+  
+  var newStoreKeys = MyApp.DataSource.storeKeys;
+  newStoreKeys.pop();
+  
+  // .replace() will call .enumerableContentDidChange()
+  MyApp.DataSource.storeKeys.replace(0,100,newStoreKeys);
+  
+  equals(records.get('length'), 4, 'record length should be 4');
+
+});
+
+
+test("loading more data into the store should propagate to record array", function() {
+  
+  var records = MyApp.store.findAll(MyApp.Foo);
+  
+  equals(records.get('length'), 5, 'record length before should be 5');
+  
+  var newStoreKeys = MyApp.store.loadRecords(MyApp.Foo, [
+    { guid: 10, firstName: "John", lastName: "Johnson" }
+  ]);
+  
+  MyApp.DataSource.storeKeys.replace(0,0,newStoreKeys);
+  
+  equals(records.get('length'), 6, 'record length after should be 6');
+
+});
+
+test("loading more data into the store should propagate to record array with query", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, conditions:"firstName = 'John'"});
+  
+  var records = MyApp.store.findAll(q);
+  
+  equals(records.get('length'), 1, 'record length before should be 1');
+  
+  var newStoreKeys = MyApp.store.loadRecords(MyApp.Foo, [
+    { guid: 10, firstName: "John", lastName: "Johnson" }
+  ]);
+  
+  // .replace() will call .enumerableContentDidChange()
+  // and should fire original SC.Query again
+  
+  MyApp.DataSource.storeKeys.replace(0,0,newStoreKeys);
+  
+  equals(records.get('length'), 2, 'record length after should be 2');
+  
+  // subsequent updates to store keys should also work
+  
+  var newStoreKeys2 = MyApp.store.loadRecords(MyApp.Foo, [
+    { guid: 11, firstName: "John", lastName: "Norman" }
+  ]);
+  
+  MyApp.DataSource.storeKeys.replace(0,0,newStoreKeys2);
+  
+  equals(records.get('length'), 3, 'record length after should be 3');
+  
+});
+
+test("SC.Query returned from fetchRecords() should return result set", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, conditions:"firstName = 'John'"});
+  
+  var records = MyApp.store.findAll(q);
+  equals(records.get('length'), 1, 'record length should be 1');
+  equals(records.objectAt(0).get('firstName'), 'John', 'name should be John');
+
+});
+
+test("Loading records after SC.Query is returned in fetchRecords() should show up", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, conditions:"firstName = 'John'"});
+  
+  var records = MyApp.store.findAll(q);
+  equals(records.get('length'), 1, 'record length should be 1');
+  equals(records.objectAt(0).get('firstName'), 'John', 'name should be John');
+  
+  var recordsToLoad = [
+    { guid: 20, firstName: "John", lastName: "Johnson" },
+    { guid: 21, firstName: "John", lastName: "Anderson" },
+    { guid: 22, firstName: "Barbara", lastName: "Jones" }
+  ];
+  
+  MyApp.store.loadRecords(MyApp.Foo, recordsToLoad);
+  
+  equals(records.get('length'), 3, 'record length should be 3');
+  
+  equals(records.objectAt(0).get('firstName'), 'John', 'name should be John');
+  equals(records.objectAt(1).get('firstName'), 'John', 'name should be John');
+  equals(records.objectAt(2).get('firstName'), 'John', 'name should be John');
+  
+});
+
+test("Loading records after getting empty record array based on SC.Query should update", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, conditions:"firstName = 'Maria'"});
+  
+  var records = MyApp.store.findAll(q);
+  equals(records.get('length'), 0, 'record length should be 0');
+  
+  var recordsToLoad = [
+    { guid: 20, firstName: "Maria", lastName: "Johnson" }
+  ];
+  
+  MyApp.store.loadRecords(MyApp.Foo, recordsToLoad);
+  
+  equals(records.get('length'), 1, 'record length should be 1');
+  
+  equals(records.objectAt(0).get('firstName'), 'Maria', 'name should be Maria');
+  
+});
+
+test("Changing a record should make it show up in RecordArrays based on SC.Query", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, conditions:"firstName = 'Maria'"});
+  
+  var records = MyApp.store.findAll(q);
+  equals(records.get('length'), 0, 'record length should be 0');
+  
+  var record = MyApp.store.find(MyApp.Foo, 1);
+  record.set('firstName', 'Maria');
+  
+  equals(records.get('length'), 1, 'record length should be 1');
+  
+  equals(records.objectAt(0).get('firstName'), 'Maria', 'name should be Maria');
+  
+});
+
+test("Deleting a record should make the RecordArray based on SC.Query update accordingly", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, conditions:"firstName = 'John'"});
+  
+  var records = MyApp.store.findAll(q);
+  equals(records.get('length'), 1, 'record length should be 1');
+  
+  MyApp.store.destroyRecord(MyApp.Foo, 1);
+  MyApp.store.commitRecords();
+  
+  equals(records.get('length'), 0, 'record length should be 0');
+  
+});
+
+test("Using findAll with SC.Query on store with no data source should work", function() {
+  
+  // create a store with no data source
+  MyApp.store3 = SC.Store.create();
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, conditions:"firstName = 'John'"});
+  
+  var records = MyApp.store3.findAll(q);
+  equals(records.get('length'), 0, 'record length should be 0');
+  
+  var recordsToLoad = [
+    { guid: 20, firstName: "John", lastName: "Johnson" },
+    { guid: 21, firstName: "John", lastName: "Anderson" },
+    { guid: 22, firstName: "Barbara", lastName: "Jones" }
+  ];
+  
+  MyApp.store3.loadRecords(MyApp.Foo, recordsToLoad);
+  
+  equals(records.get('length'), 2, 'record length should be 2');
+  
+});
+
+test("Using orderBy in SC.Query returned from findAll()", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, orderBy:"firstName ASC"});
+  
+  var records = MyApp.store.findAll(q);
+  equals(records.get('length'), 5, 'record length should be 5');
+  
+  same(records.getEach('firstName'), ["Bert", "Emily", "Jane", "John", "Johnny"], 'first name should be properly sorted');
+  
+});
+
+test("Using orderBy in SC.Query returned from findAll() and loading more records to original store key array", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, orderBy:"firstName ASC"});
+  
+  var records = MyApp.store.findAll(q);
+  equals(records.get('length'), 5, 'record length should be 5');
+  
+  equals(records.objectAt(0).get('firstName'), 'Bert', 'name should be Bert');
+  equals(records.objectAt(4).get('firstName'), 'Johnny', 'name should be Johnny');
+  
+  var newStoreKeys2 = MyApp.store.loadRecords(MyApp.Foo, [
+    { guid: 11, firstName: "Anna", lastName: "Petterson" }
+  ]);
+  
+  MyApp.DataSource.storeKeys.replace(0,0,newStoreKeys2);
+  
+  equals(records.objectAt(0).get('firstName'), 'Anna', 'name should be Anna');
+  equals(records.objectAt(1).get('firstName'), 'Bert', 'name should be Bert');
+  equals(records.objectAt(5).get('firstName'), 'Johnny', 'name should be Johnny');
+  
+});
+
+
+test("Using orderBy in SC.Query and loading more records to the store", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, orderBy:"firstName ASC"});
+  
+  var records = MyApp.store.findAll(q);
+  equals(records.get('length'), 5, 'record length should be 5');
+  equals(records.objectAt(0).get('firstName'), 'Bert', 'name should be Bert');
+  
+  MyApp.store.loadRecords(MyApp.Foo, [
+    { guid: 11, firstName: "Anna", lastName: "Petterson" }
+  ]);
+  
+  equals(records.get('length'), 6, 'record length should be 6');
+  
+  equals(records.objectAt(0).get('firstName'), 'Anna', 'name should be Anna');
+  equals(records.objectAt(5).get('firstName'), 'Johnny', 'name should be Johnny');
+  
+});
+
+test("Chaining findAll() queries", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, conditions:"lastName='Doe'"});
+  
+  var records = MyApp.store.findAll(q);
+  equals(records.get('length'), 2, 'record length should be 2');
+  
+  var q2 = SC.Query.create({recordType: MyApp.Foo, conditions:"firstName='John'"});
+  
+  var records2 = records.findAll(q2);
+  
+  equals(records2.get('length'), 1, 'record length should be 1');
+  
+  equals(records2.objectAt(0).get('firstName'), 'John', 'name should be John');
+  
+});
+
+test("Chaining findAll() queries and loading more records", function() {
+  
+  var q = SC.Query.create({recordType: MyApp.Foo, conditions:"lastName='Doe'"});
+  var q2 = SC.Query.create({recordType: MyApp.Foo, conditions:"firstName='John'"});
+  
+  var records = MyApp.store.findAll(q).findAll(q2);
+  equals(records.get('length'), 1, 'record length should be 1');
+  
+  MyApp.store.loadRecords(MyApp.Foo, [
+    { guid: 11, firstName: "John", lastName: "Doe" }
+  ]);
+  
+  equals(records.get('length'), 2, 'record length should be 2');
+  
+});

data/frameworks/sproutcore/frameworks/datastore/tests/system/query/parsing.js

@@ -0,0 +1,170 @@
+// ==========================================================================
+// Project:   SproutCore - JavaScript Application Framework
+// Copyright: ©2006-2009 Apple, Inc. and contributors.
+// License:   Licened under MIT license (see license.js)
+// ==========================================================================
+/*globals module ok equals same test MyApp */
+
+// test parsing of query string
+var q;
+module("SC.Query parsing", {
+  setup: function() {
+    q = SC.Query.create();
+  }
+});
+
+
+// ..........................................................
+// TOKENIZER
+// 
+
+test("should recognize all primitives", function() {
+  // PROPERTY
+  q.conditions = "what_to_do_now";
+  q.parseQuery();
+  ok(q.tokenList.length == 1, 'list should have one token');
+  equals(q.tokenList[0].tokenType, 'PROPERTY', 'type should be PROPERTY');
+  equals(q.tokenList[0].tokenValue, 'what_to_do_now', 'value should be what_to_do_now');
+  
+  // PROPERTY - one character
+  q.conditions = "a";
+  q.parseQuery();
+  ok(q.tokenList.length == 1, 'list should have one token');
+  equals(q.tokenList[0].tokenType, 'PROPERTY', 'type should be PROPERTY');
+  equals(q.tokenList[0].tokenValue, 'a', 'value should be "a"');
+  
+  // BOOLEAN VALUE - false
+  q.conditions = "false";
+  q.parseQuery();
+  ok(q.tokenList.length == 1, 'list should have one token');
+  equals(q.tokenList[0].tokenType, 'false', 'type should be false');
+  equals(q.tokenList[0].tokenValue, 'false', 'value should be false');
+  
+  // BOOLEAN VALUE - true
+  q.conditions = "true";
+  q.parseQuery();
+  ok(q.tokenList.length == 1, 'list should have one token');
+  equals(q.tokenList[0].tokenType, 'true', 'type should be true');
+  equals(q.tokenList[0].tokenValue, 'true', 'value should be true');
+  
+  // NULL
+  q.conditions = "null undefined";
+  q.parseQuery();
+  ok(q.tokenList.length == 2, 'list should have 2 tokens');
+  equals(q.tokenList[0].tokenType, 'null', 'type should be null');
+  equals(q.tokenList[1].tokenType, 'undefined', 'type should be undefined');
+  
+  // NUMBER - integer
+  q.conditions = "1234";
+  q.parseQuery();
+  ok(q.tokenList.length == 1, 'list should have one token');
+  equals(q.tokenList[0].tokenType, 'NUMBER', 'type should be NUMBER');
+  equals(q.tokenList[0].tokenValue, 1234, 'value should be 1234');
+  
+  // NUMBER - float
+  q.conditions = "12.34";
+  q.parseQuery();
+  ok(q.tokenList.length == 1, 'list should have one token');
+  equals(q.tokenList[0].tokenType, 'NUMBER', 'type should be NUMBER');
+  equals(q.tokenList[0].tokenValue, 12.34, 'value should be 12.34');
+  
+  // STRING - single quoted
+  q.conditions = "'ultravisitor'";
+  q.parseQuery();
+  ok(q.tokenList.length == 1, 'list should have one token');
+  equals(q.tokenList[0].tokenType, 'STRING', 'type should be STRING');
+  equals(q.tokenList[0].tokenValue, 'ultravisitor', 'value should be ultravisitor');
+  
+  // STRING - double quoted
+  q.conditions = '"Feed me weird things"';
+  q.parseQuery();
+  ok(q.tokenList.length == 1, 'list should have one token');
+  equals(q.tokenList[0].tokenType, 'STRING', 'type should be STRING');
+  equals(q.tokenList[0].tokenValue, 'Feed me weird things', 'value should be Feed me weird things');
+
+  // STRING - empty
+  q.conditions = "''";
+  q.parseQuery();
+  ok(q.tokenList.length == 1, 'list should have one token');
+  equals(q.tokenList[0].tokenType, 'STRING', 'type should be STRING');
+  equals(q.tokenList[0].tokenValue, '', 'value should be ""');
+  
+  // PARAMETER
+  q.conditions = "{my_best_friends}";
+  q.parseQuery();
+  ok(q.tokenList.length == 1, 'list should have one token');
+  equals(q.tokenList[0].tokenType, 'PARAMETER', 'type should be PARAMETER');
+  equals(q.tokenList[0].tokenValue, 'my_best_friends', 'value should be my_best_friends');
+  
+  // WILD CARD
+  q.conditions = "%@";
+  q.parseQuery();
+  ok(q.tokenList.length == 1, 'list should have one token');
+  equals(q.tokenList[0].tokenType, '%@', 'type should be %@');
+  equals(q.tokenList[0].tokenValue, 0, 'value should be 0');
+  
+  // PARENTHESES
+  q.conditions = "()";
+  q.parseQuery();
+  ok(q.tokenList.length == 2, 'list should have two tokens');
+  equals(q.tokenList[0].tokenType, 'OPEN_PAREN', 'type should be OPEN_PAREN');
+  equals(q.tokenList[1].tokenType, 'CLOSE_PAREN', 'type should be CLOSE_PAREN');
+  
+  // COMPARATORS
+  q.conditions = "= != < <= > >= BEGINS_WITH ENDS_WITH ANY MATCHES TYPE_IS";
+  q.parseQuery();
+  ok(q.tokenList.length == 11, 'list should have 10 tokens');
+  equals(q.tokenList[0].tokenType, '=', 'type should be =');
+  equals(q.tokenList[0].tokenValue, '=', 'value should be =');
+  equals(q.tokenList[1].tokenType, '!=', 'type should be !=');
+  equals(q.tokenList[1].tokenValue, '!=', 'value should be !=');
+  equals(q.tokenList[2].tokenType, '<', 'type should be <');
+  equals(q.tokenList[2].tokenValue, '<', 'value should be <');
+  equals(q.tokenList[3].tokenType, '<=', 'type should be <=');
+  equals(q.tokenList[3].tokenValue, '<=', 'value should be <=');
+  equals(q.tokenList[4].tokenType, '>', 'type should be >');
+  equals(q.tokenList[4].tokenValue, '>', 'value should be >');
+  equals(q.tokenList[5].tokenType, '>=', 'type should be >=');
+  equals(q.tokenList[5].tokenValue, '>=', 'value should be >=');
+  equals(q.tokenList[6].tokenType, 'BEGINS_WITH', 'type should be BEGINS_WITH');
+  equals(q.tokenList[6].tokenValue, 'BEGINS_WITH', 'value should be BEGINS_WITH');
+  equals(q.tokenList[7].tokenType, 'ENDS_WITH', 'type should be ENDS_WITH');
+  equals(q.tokenList[7].tokenValue, 'ENDS_WITH', 'value should be ENDS_WITH');
+  equals(q.tokenList[8].tokenType, 'ANY', 'type should be ANY');
+  equals(q.tokenList[8].tokenValue, 'ANY', 'value should be ANY');
+  equals(q.tokenList[9].tokenType, 'MATCHES', 'type should be MATCHES');
+  equals(q.tokenList[9].tokenValue, 'MATCHES', 'value should be MATCHES');
+  equals(q.tokenList[10].tokenType, 'TYPE_IS', 'type should be TYPE_IS');
+  equals(q.tokenList[10].tokenValue, 'TYPE_IS', 'value should be TYPE_IS');
+  
+  // BOOLEAN OPERATORS
+  q.conditions = "AND OR NOT";
+  q.parseQuery();
+  ok(q.tokenList.length == 3, 'list should have 3 tokens');
+  equals(q.tokenList[0].tokenType, 'AND', 'type should be AND');
+  equals(q.tokenList[0].tokenValue, 'AND', 'value should be AND');
+  equals(q.tokenList[1].tokenType, 'OR', 'type should be OR');
+  equals(q.tokenList[1].tokenValue, 'OR', 'value should be OR');
+  equals(q.tokenList[2].tokenType, 'NOT', 'type should be NOT');
+  equals(q.tokenList[2].tokenValue, 'NOT', 'value should be NOT');
+  
+}); 
+  
+  
+  // ..........................................................
+  // TREE-BUILDING 
+  // 
+
+
+test("token tree should build", function() {  
+  // Just some examples
+  
+  q.conditions = "(firstName MATCHES {firstName} OR lastName BEGINS_WITH 'Lone') AND is_a_beauty = true";
+  q.parseQuery();
+  ok(q.tokenList.length == 13, 'list should have 13 tokens');
+  ok(!q.tokenTree.error, 'there should be no errors');
+  ok(q.tokenTree.tokenValue == 'AND', 'tree root shoud be AND');
+  
+});
+
+