Leftover scala test converted to java

2 files changed, 78 insertions, 75 deletions

diff --git a/container-jersey2/src/test/java/com/yahoo/container/servlet/jersey/classvisitor/ResourceOrProviderClassVisitorTest.java b/container-jersey2/src/test/java/com/yahoo/container/servlet/jersey/classvisitor/ResourceOrProviderClassVisitorTest.java
new file mode 100644
index 00000000000..394f1b858b2
--- /dev/null
+++ b/container-jersey2/src/test/java/com/yahoo/container/servlet/jersey/classvisitor/ResourceOrProviderClassVisitorTest.java
@@ -0,0 +1,78 @@
+// Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+package com.yahoo.container.servlet.jersey.classvisitor;
+
+import com.yahoo.container.servlet.jersey.ResourceOrProviderClassVisitor;
+import org.junit.Test;
+import org.objectweb.asm.ClassReader;
+
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+public class ResourceOrProviderClassVisitorTest {
+    @Test
+    public void resource_is_detected() throws Exception {
+        assert_is_accepted(com.yahoo.container.servlet.jersey.classvisitor.Resource.class);
+    }
+
+    @Test
+    public void provider_is_detected() throws Exception {
+        assert_is_accepted(com.yahoo.container.servlet.jersey.classvisitor.Provider.class);
+    }
+
+    @Test
+    public void inner_class_is_ignored() throws Exception {
+        assert_is_ignored(com.yahoo.container.servlet.jersey.classvisitor.InnerClass.Inner.class);
+    }
+
+    @Test
+    public void nested_public_class_is_detected() throws Exception {
+        assert_is_accepted(com.yahoo.container.servlet.jersey.classvisitor.NestedClass.Nested.class);
+    }
+
+    @Test
+    public void nested_non_public_class_is_ignored() throws Exception {
+        assert_is_ignored(com.yahoo.container.servlet.jersey.classvisitor.NonPublicNestedClass.Nested.class);
+    }
+
+    @Test
+    public void resource_with_multiple_annotations_is_detected() throws Exception {
+        assert_is_accepted(com.yahoo.container.servlet.jersey.classvisitor.ResourceWithMultipleAnnotations.class);
+    }
+
+    @Test
+    public void interface_is_ignored() throws Exception {
+        assert_is_ignored(com.yahoo.container.servlet.jersey.classvisitor.InterfaceResource.class);
+    }
+
+    @Test
+    public void abstract_class_is_ignored() throws Exception {
+        assert_is_ignored(com.yahoo.container.servlet.jersey.classvisitor.AbstractResource.class);
+    }
+
+    @Test
+    public void className_is_equal_to_getName() throws Exception {
+        assertThat(analyzeClass(com.yahoo.container.servlet.jersey.classvisitor.Resource.class).getClassName(), is(com.yahoo.container.servlet.jersey.classvisitor.Resource.class.getName()));
+    }
+
+    public void assert_is_accepted(Class<?> clazz) throws Exception {
+        assertTrue(className(clazz) + " was not accepted",
+                analyzeClass(clazz).isJerseyClass());
+    }
+
+    public void assert_is_ignored(Class<?> clazz) throws Exception {
+        assertFalse(className(clazz) + " was not ignored",
+                analyzeClass(clazz).isJerseyClass());
+    }
+
+    public ResourceOrProviderClassVisitor analyzeClass(Class<?> clazz) throws Exception {
+        return ResourceOrProviderClassVisitor.visit(new ClassReader(className(clazz)));
+    }
+
+    public String className(Class<?> clazz) {
+        return clazz.getName();
+    }
+}
+
+
diff --git a/container-jersey2/src/test/java/com/yahoo/container/servlet/jersey/classvisitor/ResourceOrProviderClassVisitorTest.scala b/container-jersey2/src/test/java/com/yahoo/container/servlet/jersey/classvisitor/ResourceOrProviderClassVisitorTest.scala
deleted file mode 100644
index f20c5e02e62..00000000000
--- a/container-jersey2/src/test/java/com/yahoo/container/servlet/jersey/classvisitor/ResourceOrProviderClassVisitorTest.scala
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.container.servlet.jersey.classvisitor
-
-import com.yahoo.container.servlet.jersey.{ResourceOrProviderClassVisitor, classvisitor}
-import org.junit.{Assert, Test}
-import org.objectweb.asm.ClassReader
-
-import Assert.assertThat
-import org.hamcrest.CoreMatchers.is
-
-import scala.reflect.ClassTag
-
-class ResourceOrProviderClassVisitorTest {
-  @Test
-  def resource_is_detected() {
-    assert_is_accepted[classvisitor.Resource]
-  }
-
-  @Test
-  def provider_is_detected() {
-    assert_is_accepted[classvisitor.Provider]
-  }
-
-  @Test
-  def inner_class_is_ignored() {
-    assert_is_ignored[classvisitor.InnerClass#Inner]
-  }
-
-  @Test
-  def nested_public_class_is_detected() {
-    assert_is_accepted[classvisitor.NestedClass.Nested]
-  }
-
-  @Test
-  def nested_non_public_class_is_ignored() {
-    assert_is_ignored[classvisitor.NonPublicNestedClass.Nested]
-  }
-
-  @Test
-  def resource_with_multiple_annotations_is_detected() {
-    assert_is_accepted[classvisitor.ResourceWithMultipleAnnotations]
-  }
-
-  def interface_is_ignored() {
-    assert_is_ignored[classvisitor.InterfaceResource]
-  }
-
-  @Test
-  def abstract_class_is_ignored() {
-    assert_is_ignored[classvisitor.AbstractResource]
-  }
-
-  @Test
-  def className_is_equal_to_getName() {
-    assertThat(analyzeClass[classvisitor.Resource].getClassName, is(classOf[classvisitor.Resource].getName))
-  }
-
-  def assert_is_accepted[T: ClassTag] {
-    Assert.assertTrue(className[T] + " was not accepted",
-      analyzeClass[T].isJerseyClass)
-  }
-
-  def assert_is_ignored[T: ClassTag] {
-    Assert.assertFalse(className[T] + " was not ignored",
-      analyzeClass[T].isJerseyClass)
-  }
-
-  def analyzeClass[T: ClassTag] = {
-    ResourceOrProviderClassVisitor.visit(new ClassReader(className[T]))
-  }
-
-  def className[T: ClassTag] = implicitly[ClassTag[T]].runtimeClass.getName
-}
-
-