[ 
https://issues.apache.org/jira/browse/HADOOP-3679?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=13923335#comment-13923335
 ] 

Chris Douglas commented on HADOOP-3679:
---------------------------------------

Looks like an unresolved conflict
{noformat}
+<<<<<<< Updated upstream
   
   @Test
   public void testUserUpdateSetting() throws IOException {
@@ -82,3 +83,6 @@ public void testUserUpdateSetting() throws IOException {
     assertEquals(iug.getTimeout(), IdUserGroup.TIMEOUT_DEFAULT * 2);
   }
 }
+=======
+}
+>>>>>>> Stashed changes
{noformat}

> calls to junit Assert::assertEquals invert arguments, causing misleading 
> error messages, other minor improvements.
> ------------------------------------------------------------------------------------------------------------------
>
>                 Key: HADOOP-3679
>                 URL: https://issues.apache.org/jira/browse/HADOOP-3679
>             Project: Hadoop Common
>          Issue Type: Test
>          Components: test
>            Reporter: Chris Douglas
>            Priority: Minor
>         Attachments: HADOOP-3679.2.patch, HADOOP-3679.patch
>
>
> JUnit Assert::assertEquals takes its expected and actual arguments in a 
> particular order, but many unit tests invert them. The error message from a 
> failed assertion can be misleading.



--
This message was sent by Atlassian JIRA
(v6.2#6252)

Reply via email to