Skip to content

Commit

Permalink
Provide utility classes for cleaning up tests neatly
Browse files Browse the repository at this point in the history
  • Loading branch information
shs96c committed Jul 9, 2019
1 parent e6764e4 commit 796bb2d
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 0 deletions.
2 changes: 2 additions & 0 deletions java/client/test/org/openqa/selenium/testing/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,10 @@ java_library(
"JUnit4TestBase.java",
"NotificationRule.java",
"Pages.java",
"Safely.java",
"SeleniumTestRunner.java",
"StaticResources.java",
"TearDownFixture.java",
"TestIgnorance.java",
"TestUtilities.java",
],
Expand Down
15 changes: 15 additions & 0 deletions java/client/test/org/openqa/selenium/testing/Safely.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package org.openqa.selenium.testing;

public class Safely {

public static void safelyCall(TearDownFixture... fixtures) {
for (TearDownFixture fixture : fixtures) {
try {
// Fixture being null is handled by the exception check.
fixture.tearDown();
} catch (Exception ignored) {
// Keep going
}
}
}
}
26 changes: 26 additions & 0 deletions java/client/test/org/openqa/selenium/testing/TearDownFixture.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
// Licensed to the Software Freedom Conservancy (SFC) under one
// or more contributor license agreements. See the NOTICE file
// distributed with this work for additional information
// regarding copyright ownership. The SFC licenses this file
// to you under the Apache License, Version 2.0 (the
// "License"); you may not use this file except in compliance
// with the License. You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing,
// software distributed under the License is distributed on an
// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the License for the
// specific language governing permissions and limitations
// under the License.

package org.openqa.selenium.testing;

/**
* Used in conjunction with {@link Safely} to provide a mechanism to call clean up methods in tests.
*/
@FunctionalInterface
public interface TearDownFixture {
void tearDown() throws Exception;
}

0 comments on commit 796bb2d

Please sign in to comment.