Review fixes for vaadin-14.2:testing (#17175)

Co-authored-by: otelbot <197425009+otelbot@users.noreply.github.com>
Co-authored-by: Trask Stalnaker <trask.stalnaker@gmail.com>

Author: otelbot[bot]

instrumentation/vaadin-14.2/testing/src/main/java/io/opentelemetry/javaagent/instrumentation/vaadin/AbstractVaadinTest.java

@@ -106,7 +106,9 @@ protected static void copyClasspathResource(String resource, Path destination) {
   @Override
   protected ConfigurableApplicationContext setupServer() {
     File baseDir = new File("build/vaadin-" + Version.getFullVersion());
-    baseDir.mkdirs();
+    if (!baseDir.mkdirs() && !baseDir.isDirectory()) {
+      throw new IllegalStateException("Could not create directory: " + baseDir);
+    }
     prepareVaadinBaseDir(baseDir);
 
     // set directory for files generated by vaadin development mode
@@ -180,26 +182,28 @@ private void assertButtonClick() {
   }
 
   @Test
-  public void navigateFromMainToOtherView() {
+  void navigateFromMainToOtherView() {
     RemoteWebDriver driver = getWebDriver();
-    waitForStart(driver);
+    try {
+      waitForStart(driver);
 
-    // fetch the test page
-    driver.get(address.resolve("main").toString());
+      // fetch the test page
+      driver.get(address.resolve("main").toString());
 
-    // wait for page to load
-    assertThat(driver.findElement(By.id("main.label")).getText()).isEqualTo("Main view");
-    assertFirstRequest();
+      // wait for page to load
+      assertThat(driver.findElement(By.id("main.label")).getText()).isEqualTo("Main view");
+      assertFirstRequest();
 
-    testing.clearData();
+      testing.clearData();
 
-    // click a button to trigger calling java code in MainView
-    driver.findElement(By.id("main.button")).click();
+      // click a button to trigger calling java code in MainView
+      driver.findElement(By.id("main.button")).click();
 
-    // wait for page to load
-    assertThat(driver.findElement(By.id("other.label")).getText()).isEqualTo("Other view");
-    assertButtonClick();
-
-    driver.close();
+      // wait for page to load
+      assertThat(driver.findElement(By.id("other.label")).getText()).isEqualTo("Other view");
+      assertButtonClick();
+    } finally {
+      driver.quit();
+    }
   }
 }

instrumentation/vaadin-14.2/testing/src/main/java/test/vaadin/MainView.java

@@ -30,8 +30,8 @@ private static void navigate(Class<?> navigationTarget) {
       // using reflection because return type of the method changes from void to Optional
       Method method = UI.class.getMethod("navigate", Class.class);
       method.invoke(UI.getCurrent(), navigationTarget);
-    } catch (Exception exception) {
-      throw new IllegalStateException(exception);
+    } catch (ReflectiveOperationException e) {
+      throw new IllegalStateException(e);
     }
   }
 }