commit d43e849176fb2c7428768b4daa67d6aff2789738
author Dhruv Srivastava <dhruvsri@google.com> Mon Nov 03 00:41:05 2025 -0800
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Nov 03 00:41:05 2025 -0800
tree f1903ac7924ccfe5575e32c78bb70b16eaa55bbb
parent b0bc94707a817e7d0742e65b40707b7dcd16eb6d
parent 305d592de75b5128dc5e4f4704162b6037080faa

Merge "Prevent title from overflowing into next line on small width"

java/com/google/gerrit/server/account/AuthToken.java

diff --git a/java/com/google/gerrit/server/account/AuthToken.java b/java/com/google/gerrit/server/account/AuthToken.java
index 390042b..31ea7ca 100644
--- a/java/com/google/gerrit/server/account/AuthToken.java
+++ b/java/com/google/gerrit/server/account/AuthToken.java
@@ -65,7 +65,8 @@
   private static void validateId(String id) throws InvalidAuthTokenException {
     if (!TOKEN_ID_PATTERN.matcher(id).matches()) {
       throw new InvalidAuthTokenException(
-          "Token ID must contain only letters, numbers, hyphens and underscores.");
+          "Token ID must start with a letter and contain only letters (a-z,A-Z], numbers [0-9], "
+              + "hyphens [-] and underscores [_].");
     }
   }
 }

javatests/com/google/gerrit/pgm/http/jetty/ProjectQoSFilterTest.java

diff --git a/javatests/com/google/gerrit/pgm/http/jetty/ProjectQoSFilterTest.java b/javatests/com/google/gerrit/pgm/http/jetty/ProjectQoSFilterTest.java
index dcbcc76..23c9724 100644
--- a/javatests/com/google/gerrit/pgm/http/jetty/ProjectQoSFilterTest.java
+++ b/javatests/com/google/gerrit/pgm/http/jetty/ProjectQoSFilterTest.java
@@ -15,6 +15,7 @@
 package com.google.gerrit.pgm.http.jetty;
 
 import static com.google.common.truth.Truth.assertThat;
+import static com.google.common.truth.Truth.assertWithMessage;
 import static org.mockito.Mockito.when;
 
 import com.google.gerrit.server.CurrentUser;
@@ -65,6 +66,7 @@
           try {
             listener.onComplete(asyncEvent);
           } catch (Exception e) {
+            assertWithMessage("should never happen").fail();
           }
         }
       }.run();
@@ -89,6 +91,7 @@
           try {
             listener.onTimeout(asyncEvent);
           } catch (Exception e) {
+            assertWithMessage("should never happen").fail();
           }
         }
       }.run();
@@ -114,6 +117,7 @@
           try {
             listener.onError(asyncEvent);
           } catch (Exception e) {
+            assertWithMessage("should never happen").fail();
           }
         }
       }.run();