8255584: HttpPrincipal::getName returns incorrect name

pconcannon · pconcannon · commit 2b78a43f77f6 · 2020-11-05T10:10:21.000Z
Reviewed-by: dfuchs
diff --git a/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpPrincipal.java b/src/jdk.httpserver/share/classes/com/sun/net/httpserver/HttpPrincipal.java
@@ -75,7 +75,7 @@ public boolean equals(Object another) {
      * @return the contents of this principal in the form realm:username
      */
     public String getName() {
-        return username;
+        return String.format("%s:%s", realm, username);
     }
 
     /**
diff --git a/test/jdk/com/sun/net/httpserver/HttpPrincipalTest.java b/test/jdk/com/sun/net/httpserver/HttpPrincipalTest.java
@@ -36,9 +36,13 @@
 public class HttpPrincipalTest {
 
     @Test
-    public void TestGetters() {
+    public void testGetters() {
         var principal = new HttpPrincipal("test", "123");
+
         assertEquals(principal.getUsername(), "test");
         assertEquals(principal.getRealm(), "123");
+        assertEquals(principal.getName(), "123:test");
+        assertEquals(principal.toString(), principal.getName());
+        assertEquals(("test"+"123").hashCode(), principal.hashCode());
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ public boolean equals(Object another) {`
`75`	`75`	`* @return the contents of this principal in the form realm:username`
`76`	`76`	`*/`
`77`	`77`	`public String getName() {`
`78`		`- return username;`
	`78`	`+ return String.format("%s:%s", realm, username);`
`79`	`79`	`}`
`80`	`80`
`81`	`81`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,13 @@`
`36`	`36`	`public class HttpPrincipalTest {`
`37`	`37`
`38`	`38`	`@Test`
`39`		`- public void TestGetters() {`
	`39`	`+ public void testGetters() {`
`40`	`40`	`var principal = new HttpPrincipal("test", "123");`
	`41`	`+`
`41`	`42`	`assertEquals(principal.getUsername(), "test");`
`42`	`43`	`assertEquals(principal.getRealm(), "123");`
	`44`	`+ assertEquals(principal.getName(), "123:test");`
	`45`	`+ assertEquals(principal.toString(), principal.getName());`
	`46`	`+ assertEquals(("test"+"123").hashCode(), principal.hashCode());`
`43`	`47`	`}`
`44`	`48`	`}`