Use simpler abort syntax

Author: trask

instrumentation/mongo/mongo-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/Mongo4ReactiveClientTest.java

@@ -7,6 +7,7 @@
 
 import static java.util.Collections.singletonList;
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.jupiter.api.Assumptions.abort;
 
 import com.mongodb.MongoClientSettings;
 import com.mongodb.ServerAddress;
@@ -31,7 +32,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.opentest4j.TestAbortedException;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
 
@@ -82,7 +82,7 @@ public void createCollectionNoDescription(String dbName, String collectionName)
 
   @Override
   public void createCollectionWithAlreadyBuiltClientOptions(String dbName, String collectionName) {
-    throw new TestAbortedException("not tested on 4.0");
+    abort("not tested on 4.0");
   }
 
   @Override
@@ -232,12 +232,12 @@ public long delete(MongoCollection<Document> collection)
 
   @Override
   public MongoCollection<Document> setupGetMore(String dbName, String collectionName) {
-    throw new TestAbortedException("not tested on reactive");
+    return abort("not tested on reactive");
   }
 
   @Override
   public void getMore(MongoCollection<Document> collection) {
-    throw new TestAbortedException("not tested on reactive");
+    abort("not tested on reactive");
   }
 
   @Override

instrumentation/mongo/mongo-4.0/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mongo/v4_0/MongoClientTest.java

@@ -7,6 +7,7 @@
 
 import static java.util.Arrays.asList;
 import static java.util.Collections.singletonList;
+import static org.junit.jupiter.api.Assumptions.abort;
 
 import com.mongodb.MongoClientSettings;
 import com.mongodb.ServerAddress;
@@ -26,7 +27,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.opentest4j.TestAbortedException;
 
 class MongoClientTest extends AbstractMongoClientTest<MongoCollection<Document>> {
 
@@ -66,7 +66,7 @@ public void createCollectionNoDescription(String dbName, String collectionName)
 
   @Override
   public void createCollectionWithAlreadyBuiltClientOptions(String dbName, String collectionName) {
-    throw new TestAbortedException("not tested on 4.0");
+    abort("not tested on 4.0");
   }
 
   @Override

instrumentation/mongo/mongo-async-3.3/javaagent/src/test/java/io/opentelemetry/javaagent/instrumentation/mongoasync/v3_3/MongoAsyncClientTest.java

@@ -6,6 +6,7 @@
 package io.opentelemetry.javaagent.instrumentation.mongoasync.v3_3;
 
 import static java.util.concurrent.TimeUnit.SECONDS;
+import static org.junit.jupiter.api.Assumptions.abort;
 
 import com.mongodb.ConnectionString;
 import com.mongodb.async.SingleResultCallback;
@@ -29,7 +30,6 @@
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.extension.RegisterExtension;
-import org.opentest4j.TestAbortedException;
 
 class MongoAsyncClientTest extends AbstractMongoClientTest<MongoCollection<Document>> {
 
@@ -210,12 +210,12 @@ public long delete(MongoCollection<Document> collection) {
 
   @Override
   public MongoCollection<Document> setupGetMore(String dbName, String collectionName) {
-    throw new TestAbortedException("not tested on async");
+    return abort("not tested on async");
   }
 
   @Override
   public void getMore(MongoCollection<Document> collection) {
-    throw new TestAbortedException("not tested on async");
+    abort("not tested on async");
   }
 
   @Override