tests: Replace logicalOr() with withConsecutive() to be more strict

Remove two lines from the error messages to handle both error cases
similiar.
Fix the wrong character in the error message as well

Change-Id: Ied154e8232c8e13e619706939833809110b9757b

src/Command/GenerateEquivset.php

@@ -110,8 +110,6 @@ public function execute( InputInterface $input, OutputInterface $output ) {
 			if ( Utils::codepointToUtf8( hexdec( $m['hexleft'] ) ) != $m['charleft'] ) {
 				$actual = Utils::utf8ToCodepoint( $m['charleft'] );
 				if ( $actual === false ) {
-					$output->writeln( "Bytes: " . strlen( $m['charleft'] ) );
-					$output->writeln( bin2hex( $line ) );
 					$hexForm = bin2hex( $m['charleft'] );
 					$output->writeln( "<error>Invalid UTF-8 character \"{$m['charleft']}\" ($hexForm) at " .
 						"line $lineNum: $line</error>" );
@@ -127,7 +125,7 @@ public function execute( InputInterface $input, OutputInterface $output ) {
 				$actual = Utils::utf8ToCodepoint( $m['charright'] );
 				if ( $actual === false ) {
 					$hexForm = bin2hex( $m['charright'] );
-					$output->writeln( "<error>Invalid UTF-8 character \"{$m['charleft']}\" ($hexForm) at " .
+					$output->writeln( "<error>Invalid UTF-8 character \"{$m['charright']}\" ($hexForm) at " .
 						"line $lineNum: $line</error>" );
 				} else {
 					$output->writeln( "<error>Error: right number ({$m['hexright']}) does not match right " .

tests/Command/GenerateEquivsetTest.php

@@ -156,10 +156,10 @@ public function testExecuteFailMalformed() {
 		$output = $this->getMockBuilder( OutputInterface::class )
 			->getMock();
 		$output->method( 'writeln' )
-			->with( $this->logicalOr(
-				$this->stringContains( 'Error: invalid entry' ),
-				$this->stringContains( 'Finished with errors' )
-			) );
+			->withConsecutive(
+				[ $this->stringContains( 'Error: invalid entry' ) ],
+				[ $this->stringContains( 'Finished with errors' ) ]
+			);
 		$status = $command->execute( $input, $output );
 
 		$this->assertSame( 1, $status );
@@ -210,10 +210,10 @@ public function testExecuteFailNotMatchingCodepoint( $side, $number, $in ) {
 		$output = $this->getMockBuilder( OutputInterface::class )
 			->getMock();
 		$output->method( 'writeln' )
-			->with( $this->logicalOr(
-				$this->stringContains( "Error: $side number ($number) does not match" ),
-				$this->stringContains( 'Finished with errors' )
-			) );
+			->withConsecutive(
+				[ $this->stringContains( "Error: $side number ($number) does not match" ) ],
+				[ $this->stringContains( 'Finished with errors' ) ]
+			);
 
 		$status = $command->execute( $input, $output );
 
@@ -263,12 +263,10 @@ public function testExecuteFailInvalidChar( $in ) {
 		$output = $this->getMockBuilder( OutputInterface::class )
 			->getMock();
 		$output->method( 'writeln' )
-			->with( $this->logicalOr(
-				$this->stringContains( 'Bytes' ),
-				$this->stringContains( bin2hex( $in ) ),
-				$this->stringContains( 'Invalid UTF-8 character' ),
-				$this->stringContains( 'Finished with errors' )
-			) );
+			->withConsecutive(
+				[ $this->stringContains( 'Invalid UTF-8 character' ) ],
+				[ $this->stringContains( 'Finished with errors' ) ]
+			);
 
 		$status = $command->execute( $input, $output );