difference between is and contains

Model/Behavior/BitmaskedBehavior.php

@@ -189,6 +189,30 @@ class BitmaskedBehavior extends ModelBehavior {
 	 * @param mixed bits (int, array)
 	 * @return array $sqlSnippet
 	 */
+	public function isBit(Model $Model, $bits) {
+		$bits = (array) $bits;
+		$bitmask = $this->encodeBitmask($Model, $bits);
+		
+		$field = $this->settings[$Model->alias]['field'];
+		return array($Model->alias.'.'.$field => $bitmask);
+	}
+
+	/**
+	 * @param mixed bits (int, array)
+	 * @return array $sqlSnippet
+	 */
+	public function isNotBit(Model $Model, $bits) {
+		$bits = (array) $bits;
+		$bitmask = $this->encodeBitmask($Model, $bits);
+		
+		$field = $this->settings[$Model->alias]['field'];
+		return array('NOT' => array($Model->alias.'.'.$field => $bitmask));
+	}
+	
+	/**
+	 * @param mixed bits (int, array)
+	 * @return array $sqlSnippet
+	 */
 	public function containsBit(Model $Model, $bits) {
 		$bits = (array) $bits;
 		$bitmask = $this->encodeBitmask($Model, $bits);

Test/Case/Behavior/BitmaskedBehaviorTest.php

@@ -96,10 +96,22 @@ class BitmaskedBehaviorTest extends MyCakeTestCase {
 		$this->assertEquals($expected, $res['BitmaskedComment']['statuses']);
 	}
 	
+	public function testIs() {
+		$res = $this->Comment->isBit(BitmaskedComment::STATUS_PUBLISHED);
+		$expected = array('BitmaskedComment.status' => 2);
+		$this->assertEquals($expected, $res);
+	}
+	
+	public function testIsNot() {
+		$res = $this->Comment->isNotBit(BitmaskedComment::STATUS_PUBLISHED);
+		$expected = array('NOT' => array('BitmaskedComment.status' => 2));
+		$this->assertEquals($expected, $res);
+	}
+	
 	public function testContains() {
 		$res = $this->Comment->containsBit(BitmaskedComment::STATUS_PUBLISHED);
 		$expected = array('(BitmaskedComment.status & ? = ?)' => array(2, 2));
-		//$this->assertEquals($expected, $res);
+		$this->assertEquals($expected, $res);
 		
 		$conditions = $res;
 		$res = $this->Comment->find('all', array('conditions'=>$conditions));
@@ -109,7 +121,7 @@ class BitmaskedBehaviorTest extends MyCakeTestCase {
 		$res = $this->Comment->containsBit(array(BitmaskedComment::STATUS_PUBLISHED, BitmaskedComment::STATUS_ACTIVE));
 		
 		$expected = array('(BitmaskedComment.status & ? = ?)' => array(3, 3));
-		//$this->assertEquals($expected, $res);
+		$this->assertEquals($expected, $res);
 		
 		$conditions = $res;
 		$res = $this->Comment->find('all', array('conditions'=>$conditions));
@@ -119,7 +131,7 @@ class BitmaskedBehaviorTest extends MyCakeTestCase {
 	public function testNotContains() {
 		$res = $this->Comment->containsNotBit(BitmaskedComment::STATUS_PUBLISHED);
 		$expected = array('(BitmaskedComment.status & ? != ?)' => array(2, 2));
-		//$this->assertEquals($expected, $res);
+		$this->assertEquals($expected, $res);
 		
 		$conditions = $res;
 		$res = $this->Comment->find('all', array('conditions'=>$conditions));
@@ -129,7 +141,7 @@ class BitmaskedBehaviorTest extends MyCakeTestCase {
 		$res = $this->Comment->containsNotBit(array(BitmaskedComment::STATUS_PUBLISHED, BitmaskedComment::STATUS_ACTIVE));
 		
 		$expected = array('(BitmaskedComment.status & ? != ?)' => array(3, 3));
-		//$this->assertEquals($expected, $res);
+		$this->assertEquals($expected, $res);
 		
 		$conditions = $res;
 		$res = $this->Comment->find('all', array('conditions'=>$conditions));
@@ -140,8 +152,6 @@ class BitmaskedBehaviorTest extends MyCakeTestCase {
 		
 }
 
-
-
 class BitmaskedComment extends CakeTestModel {
 	
 	public $validate = array(