commit 2d04a03be5dd193b7a191be590eee9e4f4d3428e
author Edwin Kempin <ekempin@google.com> Mon Mar 11 12:02:46 2019 +0100
committer Edwin Kempin <ekempin@google.com> Mon Mar 11 13:33:13 2019 +0100
tree 84eec8624bb0100b7a728341fd71841a330b490b
parent 3d4c7193fa004600680ab39ee12ecdda386d59b1

ChecksImpl#id(CheckerUuid): Fix error message when check is not found

The exising error message "Not found: <checker-UUID>" suggests that the
checker was not found. However this is never the case since the first
line in ChecksImpl#id(CheckerUuid) ensures that the checker exists.

Change-Id: I6b8d03d428310bdc945fc4e7b8f7750d62c08788
Signed-off-by: Edwin Kempin <ekempin@google.com>

java/com/google/gerrit/plugins/checks/api/ChecksImpl.java

diff --git a/java/com/google/gerrit/plugins/checks/api/ChecksImpl.java b/java/com/google/gerrit/plugins/checks/api/ChecksImpl.java
index 2a42c5f..361efe0 100644
--- a/java/com/google/gerrit/plugins/checks/api/ChecksImpl.java
+++ b/java/com/google/gerrit/plugins/checks/api/ChecksImpl.java
@@ -71,7 +71,14 @@
       return checkApiImplFactory.create(
           new CheckResource(
               revisionResource,
-              check.orElseThrow(() -> new ResourceNotFoundException("Not found: " + checkerUuid))));
+              check.orElseThrow(
+                  () ->
+                      new ResourceNotFoundException(
+                          String.format(
+                              "Patch set %s in project %s doesn't have check for checker %s.",
+                              revisionResource.getPatchSet().getId(),
+                              revisionResource.getProject(),
+                              checkerUuid)))));
     } catch (Exception e) {
       throw asRestApiException("Cannot parse check", e);
     }

javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java

diff --git a/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java b/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java
index 2df195b..d16e850 100644
--- a/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java
+++ b/javatests/com/google/gerrit/plugins/checks/acceptance/api/GetCheckIT.java
@@ -57,7 +57,10 @@
     checkOperations.newCheck(checkKey).setState(CheckState.RUNNING).upsert();
 
     exception.expect(ResourceNotFoundException.class);
-    exception.expectMessage("Not found: " + checkerUuid);
+    exception.expectMessage(
+        String.format(
+            "Patch set %s in project %s doesn't have check for checker %s.",
+            patchSetId, project, checkerUuid));
     checksApiFactory.revision(patchSetId).id(checkerUuid);
   }
 
@@ -73,7 +76,10 @@
     checkerOperations.checker(checkerUuid).forUpdate().disable().update();
 
     exception.expect(ResourceNotFoundException.class);
-    exception.expectMessage("Not found: " + checkerUuid);
+    exception.expectMessage(
+        String.format(
+            "Patch set %s in project %s doesn't have check for checker %s.",
+            patchSetId, project, checkerUuid));
     checksApiFactory.revision(patchSetId).id(checkerUuid);
   }