fix authroize, more tests

Daniel Kinzler · Daniel Kinzler · commit 45d1be488a83 · 2012-01-03T19:33:29.000Z
git-svn-id: https://svn.toolserver.org/svnroot/daniel/duesenstuff/trunk/gpClient@567 9f2c43bc-b3c0-43f4-b155-41619b16f219
diff --git a/php/gpClient.php b/php/gpClient.php
@@ -1596,7 +1596,7 @@ public static function isValidCommandArgument( $arg, $strict = true ) {
 		if ( $arg === '' || $arg === false || $arg === null ) return false;
 
 		if ( $strict ) return preg_match('/^\w[-\w]*$/', $arg); #TODO: port stricter pattern to python
-		else return !preg_match('/[\s\0-\x1F\x80-\xFF:|<>!&#]/', $arg); //space, low chars, high chars, and operators. #TODO: port exclusion of spaces to python
+		else return !preg_match('/[\s\0-\x1F\x80-\xFF|<>!&#]/', $arg); //space, low chars, high chars, and operators. #TODO: port exclusion of spaces and inclusion of colons to python
 	}
 	
 	/**
diff --git a/php/test/gpCore.test.php b/php/test/gpCore.test.php
@@ -116,10 +116,12 @@ public function testTraverseSuccessorsWithout() {
 	}
 
     public function testSetMeta() { #TODO: port to python
+		//define var
 		$this->gp->set_meta("foo", 1234);
 		$val = $this->gp->get_meta_value("foo");
 		$this->assertEquals( "1234", $val );
 		
+		//redefine var
 		$this->gp->set_meta("foo", "bla/bla");
 		$val = $this->gp->get_meta_value("foo");
 		$this->assertEquals( "bla/bla", $val );
@@ -162,19 +164,43 @@ public function testSetMeta() { #TODO: port to python
 	}
 
     public function testGetMeta() { #TODO: port to python
+		//get undefined
+		$val = $this->gp->try_get_meta_value("foo");
+		$this->assertEquals( false, $val );
+		
+		//set var, and get value
+		$this->gp->set_meta("foo", "xxx");
+		$val = $this->gp->get_meta_value("foo");
+		$this->assertEquals( "xxx", $val );
+		
+		//remove var, then get value
+		$this->gp->remove_meta("foo");
+		$val = $this->gp->try_get_meta_value("foo");
+		$this->assertEquals( false, $val );
 	}
 
     public function testRemoveMeta() { #TODO: port to python
+		//remove undefined
+		$ok = $this->gp->try_remove_meta("foo");
+		$this->assertEquals( false, $ok );
+		
+		//set var, then remove it
+		$this->gp->set_meta("foo", "xxx");
+		$ok = $this->gp->try_remove_meta("foo");
+		$this->assertEquals( "OK", $ok );
 	}
 
     public function testListMeta() { #TODO: port to python
+		// assert empty
 		$meta = $this->gp->capture_list_meta();
 		$this->assertEmpty( $meta );
 		
+		// add one, assert list
 		$this->gp->set_meta("foo", 1234);
 		$meta = $this->gp->capture_list_meta_map();
 		$this->assertEquals( array("foo" => "1234"), $meta );
 		
+		// remove one, assert empty
 		$this->gp->remove_meta("foo");
 		$meta = $this->gp->capture_list_meta();
 		$this->assertEmpty( $meta );
diff --git a/php/test/gpSlave.test.php b/php/test/gpSlave.test.php
@@ -19,6 +19,12 @@ public function testTry() {
 		$this->assertEquals( 'FAILED', $this->gp->getStatus() );
     }    
     
+    public function testValue() {
+		$v = $this->gp->protocol_version_value();
+
+		$this->assertTrue( is_numeric($v) );
+    }    
+    
 	public function testCapture() {
 		// empty data
 		$a = $this->gp->capture_list_roots();
@@ -230,9 +236,6 @@ public function testArgumentValidation() {
 		$this->assertArgumentRejected( false );
 		$this->assertArgumentRejected( ' x ' );
 		
-		//$this->gp->setTimeout(2); // has no effect for pipes
-		$this->assertArgumentAccepted( 'x:y' ); // needed for password auth! //NOTE: This is broken in graphcore (but works via graphserv)!
-		
 		$this->assertArgumentAccepted( '123' );
 		$this->assertArgumentAccepted( 'x' );
 		$this->assertArgumentAccepted( 'xyz' );

Original file line number	Diff line number	Diff line change
`@@ -1596,7 +1596,7 @@ public static function isValidCommandArgument( $arg, $strict = true ) {`
`1596`	`1596`	`if ( $arg === '' \|\| $arg === false \|\| $arg === null ) return false;`
`1597`	`1597`
`1598`	`1598`	`if ( $strict ) return preg_match('/^\w[-\w]*$/', $arg); #TODO: port stricter pattern to python`
`1599`		`- else return !preg_match('/[\s\0-\x1F\x80-\xFF:\|<>!&#]/', $arg); //space, low chars, high chars, and operators. #TODO: port exclusion of spaces to python`
	`1599`	`+ else return !preg_match('/[\s\0-\x1F\x80-\xFF\|<>!&#]/', $arg); //space, low chars, high chars, and operators. #TODO: port exclusion of spaces and inclusion of colons to python`
`1600`	`1600`	`}`
`1601`	`1601`
`1602`	`1602`	`/**`