From 772330c3083c743d157b761c358bcff93e968231 Mon Sep 17 00:00:00 2001 From: Kirill Vainer Date: Tue, 1 Mar 2016 23:53:20 -0500 Subject: [PATCH] test: delete ApplicationTest doesn't work, causes a timeout error --- .../java/com/jme3/app/ApplicationTest.java | 83 ------------------- .../jme3/system/NativeLibraryLoaderIT.java | 1 - 2 files changed, 84 deletions(-) delete mode 100644 jme3-core/src/test/java/com/jme3/app/ApplicationTest.java diff --git a/jme3-core/src/test/java/com/jme3/app/ApplicationTest.java b/jme3-core/src/test/java/com/jme3/app/ApplicationTest.java deleted file mode 100644 index e046f773f..000000000 --- a/jme3-core/src/test/java/com/jme3/app/ApplicationTest.java +++ /dev/null @@ -1,83 +0,0 @@ -/* - * Copyright (c) 2009-2015 jMonkeyEngine - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are - * met: - * - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * * Neither the name of 'jMonkeyEngine' nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED - * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR - * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR - * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ -package com.jme3.app; - -import com.jme3.system.AppSettings; -import com.jme3.system.JmeContext.Type; -import com.jme3.system.JmeSystem; -import com.jme3.system.JmeSystemDelegate; -import com.jme3.system.NullContext; -import java.util.logging.Level; -import java.util.logging.Logger; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import static org.mockito.Mockito.*; -import org.mockito.runners.MockitoJUnitRunner; - -@RunWith(MockitoJUnitRunner.class) -public class ApplicationTest { - - @Before - public void setUp() { - Logger.getLogger("com.jme3").setLevel(Level.OFF); - } - - private static class NullDisplayContext extends NullContext { - - @Override - public Type getType() { - return Type.Display; - } - } - - @Test - public void testExceptionInvokesHandleError() throws InterruptedException { - JmeSystemDelegate del = mock(JmeSystemDelegate.class); - JmeSystem.setSystemDelegate(del); - - Application app = new Application() { - @Override - public void update() { - super.update(); - throw new IllegalStateException("Some Error"); - } - }; - - when(del.newContext((AppSettings) anyObject(), eq(Type.Display))).thenReturn(new NullDisplayContext()); - - app.start(true); - app.stop(true); - - verify(del).showErrorDialog(anyString()); - } -} diff --git a/jme3-desktop/src/test/java/com/jme3/system/NativeLibraryLoaderIT.java b/jme3-desktop/src/test/java/com/jme3/system/NativeLibraryLoaderIT.java index 089b84382..47954f0a1 100644 --- a/jme3-desktop/src/test/java/com/jme3/system/NativeLibraryLoaderIT.java +++ b/jme3-desktop/src/test/java/com/jme3/system/NativeLibraryLoaderIT.java @@ -52,7 +52,6 @@ import org.junit.Ignore; * * @author Kirill Vainer */ -@Ignore @Category(IntegrationTest.class) @FixMethodOrder public class NativeLibraryLoaderIT {