Revert "Bjorncs/scala stuff"

1 files changed, 2 insertions, 5 deletions

diff --git a/bundle-plugin/src/test/scala/com/yahoo/container/plugin/classanalysis/AnalyzeClassTest.scala b/bundle-plugin/src/test/scala/com/yahoo/container/plugin/classanalysis/AnalyzeClassTest.scala
index e2d0e3c6f10..3377315e3d8 100644
--- a/bundle-plugin/src/test/scala/com/yahoo/container/plugin/classanalysis/AnalyzeClassTest.scala
+++ b/bundle-plugin/src/test/scala/com/yahoo/container/plugin/classanalysis/AnalyzeClassTest.scala
@@ -2,22 +2,19 @@
 package com.yahoo.container.plugin.classanalysis
 
 import org.junit.Test
-import org.scalatest.junit.{AssertionsForJUnit, JUnitSuite}
+import org.scalatest.junit.{ShouldMatchersForJUnit, JUnitSuite}
 import java.awt.Image
 import java.awt.image.{ImagingOpException, Kernel}
-
 import sampleclasses._
 import TestUtilities._
 import com.yahoo.osgi.annotation.{ExportPackage, Version}
 import javax.security.auth.login.LoginException
 
-import org.scalatest.Matchers
-
 /**
  * Tests that analysis of class files works.
  * @author  tonytv
  */
-class AnalyzeClassTest extends JUnitSuite with AssertionsForJUnit with Matchers {
+class AnalyzeClassTest extends JUnitSuite with ShouldMatchersForJUnit {
   @Test def require_that_full_class_name_is_returned() {
     analyzeClass[Base].name should be(name[Base])
   }