add more tests for implied url/name properties

Author: aaronpk

tests/Mf2/ParseImpliedTest.php

@@ -12,121 +12,140 @@
 /**
  * @todo some of these can be made into single tests with dataProviders
  */
-class ParseImpliedTest extends PHPUnit_Framework_TestCase {	
+class ParseImpliedTest extends PHPUnit_Framework_TestCase {
 	public function setUp() {
 		date_default_timezone_set('Europe/London');
 	}
-	
-	
+
+
 	public function testParsesImpliedPNameFromNodeValue() {
 		$input = '<span class="h-card">The Name</span>';
 		$parser = new Parser($input);
 		$output = $parser->parse();
-		
+
 		$this->assertArrayHasKey('name', $output['items'][0]['properties']);
 		$this->assertEquals('The Name', $output['items'][0]['properties']['name'][0]);
 	}
-	
+
 	public function testParsesImpliedPNameFromImgAlt() {
 		$input = '<img class="h-card" src="" alt="The Name" />';
 		$parser = new Parser($input);
 		$output = $parser->parse();
-		
+
 		$this->assertArrayHasKey('name', $output['items'][0]['properties']);
 		$this->assertEquals('The Name', $output['items'][0]['properties']['name'][0]);
 	}
-	
+
 	public function testParsesImpliedPNameFromNestedImgAlt() {
 		$input = '<div class="h-card"><img src="" alt="The Name" /></div>';
 		$parser = new Parser($input);
 		$output = $parser->parse();
-		
+
 		$this->assertArrayHasKey('name', $output['items'][0]['properties']);
 		$this->assertEquals('The Name', $output['items'][0]['properties']['name'][0]);
 	}
-	
+
 	public function testParsesImpliedPNameFromDoublyNestedImgAlt() {
 		$input = '<div class="h-card"><span><img src="" alt="The Name" /></span></div>';
 		$parser = new Parser($input);
 		$output = $parser->parse();
-		
+
 		$this->assertArrayHasKey('name', $output['items'][0]['properties']);
 		$this->assertEquals('The Name', $output['items'][0]['properties']['name'][0]);
 	}
-	
+
 	public function testParsesImpliedUPhotoFromImgSrc() {
 		$input = '<img class="h-card" src="http://example.com/img.png" alt="" />';
 		$parser = new Parser($input);
 		$output = $parser->parse();
-		
+
 		$this->assertArrayHasKey('photo', $output['items'][0]['properties']);
 		$this->assertEquals('http://example.com/img.png', $output['items'][0]['properties']['photo'][0]);
 	}
-	
+
 	public function testParsesImpliedUPhotoFromNestedImgSrc() {
 		$input = '<div class="h-card"><img src="http://example.com/img.png" alt="" /></div>';
 		$parser = new Parser($input);
 		$output = $parser->parse();
-				
+
 		$this->assertArrayHasKey('photo', $output['items'][0]['properties']);
 		$this->assertEquals('http://example.com/img.png', $output['items'][0]['properties']['photo'][0]);
 	}
-	
+
 	public function testParsesImpliedUPhotoFromDoublyNestedImgSrc() {
 		$input = '<div class="h-card"><span><img src="http://example.com/img.png" alt="" /></span></div>';
 		$parser = new Parser($input);
 		$output = $parser->parse();
-		
+
 		$this->assertArrayHasKey('photo', $output['items'][0]['properties']);
 		$this->assertEquals('http://example.com/img.png', $output['items'][0]['properties']['photo'][0]);
 	}
-	
+
 	/*
 	 * see testImpliedPhotoFromNestedObject() and testImpliedPhotoFromNestedObject()
 	public function testIgnoresImgIfNotOnlyChild() {
 		$input = '<div class="h-card"><img src="http://example.com/img.png" /> <p>Moar text</p></div>';
 		$parser = new Parser($input);
 		$output = $parser->parse();
-		
+
 		$this->assertArrayNotHasKey('photo', $output['items'][0]['properties']);
 	}
 
 	public function testIgnoresDoublyNestedImgIfNotOnlyDoublyNestedChild() {
 		$input = '<div class="h-card"><span><img src="http://example.com/img.png" /> <p>Moar text</p></span></div>';
 		$parser = new Parser($input);
 		$output = $parser->parse();
-		
+
 		$this->assertArrayNotHasKey('photo', $output['items'][0]['properties']);
 	}
 	*/
-	
+
 	public function testParsesImpliedUUrlFromAHref() {
 		$input = '<a class="h-card" href="http://example.com/">Some Name</a>';
 		$parser = new Parser($input);
 		$output = $parser->parse();
-		
+
 		$this->assertArrayHasKey('url', $output['items'][0]['properties']);
 		$this->assertEquals('http://example.com/', $output['items'][0]['properties']['url'][0]);
 	}
-	
-	
+
+
 	public function testParsesImpliedUUrlFromNestedAHref() {
 		$input = '<span class="h-card"><a href="http://example.com/">Some Name</a></span>';
 		$parser = new Parser($input);
 		$output = $parser->parse();
-		
+
 		$this->assertArrayHasKey('url', $output['items'][0]['properties']);
 		$this->assertEquals('http://example.com/', $output['items'][0]['properties']['url'][0]);
 	}
-	
+
+  public function testParsesImpliedUUrlWithExplicitName() {
+    $input = '<span class="h-card"><a href="http://example.com/" class="p-name">Some Name</a></span>';
+    $parser = new Parser($input);
+    $output = $parser->parse();
+
+    $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+    $this->assertEquals('http://example.com/', $output['items'][0]['properties']['url'][0]);
+  }
+
+  public function testParsesImpliedNameWithExplicitURL() {
+    $input = '<span class="h-card"><a href="http://example.com/" class="u-url">Some Name</a></span>';
+    $parser = new Parser($input);
+    $output = $parser->parse();
+
+    $this->assertArrayHasKey('url', $output['items'][0]['properties']);
+    $this->assertEquals('http://example.com/', $output['items'][0]['properties']['url'][0]);
+    $this->assertEquals('Some Name', $output['items'][0]['properties']['name'][0]);
+  }
+
 	public function testMultipleImpliedHCards() {
 		$input = '<span class="h-card">Frances Berriman</span>
- 
+
 <a class="h-card" href="http://benward.me">Ben Ward</a>
- 
-<img class="h-card" alt="Sally Ride" 
+
+<img class="h-card" alt="Sally Ride"
 	 src="http://upload.wikimedia.org/wikipedia/commons/a/a4/Ride-s.jpg"/>
- 
+
 <a class="h-card" href="http://tantek.com">
  <img alt="Tantek Çelik" src="http://ttk.me/logo.jpg"/>
 </a>';
@@ -162,13 +181,13 @@ public function testMultipleImpliedHCards() {
 		}
 	}]
 }';
-		
+
 		$parser = new Parser($input, '', true);
 		$output = $parser->parse();
-		
+
 		$this->assertJsonStringEqualsJsonString(json_encode($output), $expected);
 	}
-	
+
 	/** as per https://github.com/indieweb/php-mf2/issues/37 */
 	public function testParsesImpliedNameConsistentWithPName() {
 		$inner = "Name	\nand more";
@@ -177,8 +196,8 @@ public function testParsesImpliedNameConsistentWithPName() {
 		$this->assertEquals($inner, $result['items'][0]['properties']['name'][0]);
 		$this->assertEquals($inner, $result['items'][1]['properties']['name'][0]);
 	}
-	
-	
+
+
 	/** @see https://github.com/indieweb/php-mf2/issues/6 */
 	public function testParsesImpliedNameFromAbbrTitle() {
 		$input = '<abbr class="h-card" title="Barnaby Walters">BJW</abbr>';