diff options
| author | Sven Gothel <[email protected]> | 2015-10-05 08:28:18 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-10-05 08:28:18 +0200 |
| commit | 72d7f326f2d283ec0207d90b4203215146f88de6 (patch) | |
| tree | 23a910cdbea2b3a06ed1add60ed8083f0b75b4ef /src | |
| parent | 5d0c40061b11909253f07b347db0342b1be38c80 (diff) | |
| parent | 5fec82b2ec9dfb5467e4c00eebdb0a1d6abe0e0c (diff) | |
Merge remote-tracking branch 'xranby/junit'
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug1225EventQueueInterruptedAWT.java | 2 | ||||
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureIONEWT.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug1225EventQueueInterruptedAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug1225EventQueueInterruptedAWT.java index fa44024b1..92dd7e344 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug1225EventQueueInterruptedAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug1225EventQueueInterruptedAWT.java @@ -47,7 +47,7 @@ import com.jogamp.opengl.test.junit.util.AWTRobotUtil; import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.util.UITestCase; -import junit.framework.Assert; +import org.junit.Assert; import com.jogamp.common.ExceptionUtils; import com.jogamp.common.util.InterruptedRuntimeException; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureIONEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureIONEWT.java index c5c32280d..56d9d481e 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureIONEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureIONEWT.java @@ -45,7 +45,7 @@ import com.jogamp.opengl.util.texture.ImageType; import com.jogamp.opengl.util.texture.TextureData; import com.jogamp.opengl.util.texture.TextureIO; -import junit.framework.Assert; +import org.junit.Assert; import java.io.IOException; import java.io.InputStream; |