From 6caca934214744c57a35e71285dededd41ff6821 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Wed, 24 Apr 2013 14:17:37 -0500 Subject: [PATCH] Renamed BaseApplicationAbstractTest to AbstractBaseApplication so it wouldn't get executed by the unittest target. --- ...licationAbstractTest.java => AbstractBaseApplication.java} | 2 +- core/test/net/sf/openrocket/IntegrationTest.java | 2 +- .../sf/openrocket/file/rocksim/importt/RocksimLoaderTest.java | 4 ++-- .../sf/openrocket/file/rocksim/importt/RocksimTestBase.java | 4 ++-- .../rocketoptimization/TestRocketOptimizationFunction.java | 4 ++-- .../rocketoptimization/modifiers/TestGenericModifier.java | 4 ++-- .../simulation/customexpression/TestExpressions.java | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) rename core/test/net/sf/openrocket/{BaseApplicationAbstractTest.java => AbstractBaseApplication.java} (93%) diff --git a/core/test/net/sf/openrocket/BaseApplicationAbstractTest.java b/core/test/net/sf/openrocket/AbstractBaseApplication.java similarity index 93% rename from core/test/net/sf/openrocket/BaseApplicationAbstractTest.java rename to core/test/net/sf/openrocket/AbstractBaseApplication.java index 547842042..e5bdab0c6 100644 --- a/core/test/net/sf/openrocket/BaseApplicationAbstractTest.java +++ b/core/test/net/sf/openrocket/AbstractBaseApplication.java @@ -12,7 +12,7 @@ import com.google.inject.Injector; import com.google.inject.Module; -public abstract class BaseApplicationAbstractTest { +public abstract class AbstractBaseApplication { @BeforeClass diff --git a/core/test/net/sf/openrocket/IntegrationTest.java b/core/test/net/sf/openrocket/IntegrationTest.java index 4fbb754b0..4080c88a8 100644 --- a/core/test/net/sf/openrocket/IntegrationTest.java +++ b/core/test/net/sf/openrocket/IntegrationTest.java @@ -55,7 +55,7 @@ import com.google.inject.Provider; * might be performed. */ @RunWith(JMock.class) -public class IntegrationTest extends BaseApplicationAbstractTest { +public class IntegrationTest extends AbstractBaseApplication { Mockery context = new JUnit4Mockery(); private OpenRocketDocument document; diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/RocksimLoaderTest.java b/core/test/net/sf/openrocket/file/rocksim/importt/RocksimLoaderTest.java index c65efc709..856e55b5d 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/RocksimLoaderTest.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/RocksimLoaderTest.java @@ -8,7 +8,7 @@ import java.io.BufferedInputStream; import java.io.IOException; import java.io.InputStream; -import net.sf.openrocket.BaseApplicationAbstractTest; +import net.sf.openrocket.AbstractBaseApplication; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocumentFactory; import net.sf.openrocket.file.DatabaseMotorFinder; @@ -24,7 +24,7 @@ import org.junit.Assert; /** * RocksimLoader Tester. */ -public class RocksimLoaderTest extends BaseApplicationAbstractTest { +public class RocksimLoaderTest extends AbstractBaseApplication { /** * Test a bug reported via automated bug report. I have been unable to reproduce this bug diff --git a/core/test/net/sf/openrocket/file/rocksim/importt/RocksimTestBase.java b/core/test/net/sf/openrocket/file/rocksim/importt/RocksimTestBase.java index f9f76e3df..d264e8132 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/RocksimTestBase.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/RocksimTestBase.java @@ -6,7 +6,7 @@ package net.sf.openrocket.file.rocksim.importt; import java.lang.reflect.Field; import java.util.List; -import net.sf.openrocket.BaseApplicationAbstractTest; +import net.sf.openrocket.AbstractBaseApplication; import net.sf.openrocket.gui.util.SwingPreferences; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; @@ -17,7 +17,7 @@ import org.junit.Before; /** * A base class for the Rocksim tests. Includes code from the junitx.addons project. */ -public abstract class RocksimTestBase extends BaseApplicationAbstractTest { +public abstract class RocksimTestBase extends AbstractBaseApplication { public void assertContains(RocketComponent child, List components) { Assert.assertTrue("Components did not contain child", components.contains(child)); diff --git a/core/test/net/sf/openrocket/optimization/rocketoptimization/TestRocketOptimizationFunction.java b/core/test/net/sf/openrocket/optimization/rocketoptimization/TestRocketOptimizationFunction.java index 3582a1c22..fd9995255 100644 --- a/core/test/net/sf/openrocket/optimization/rocketoptimization/TestRocketOptimizationFunction.java +++ b/core/test/net/sf/openrocket/optimization/rocketoptimization/TestRocketOptimizationFunction.java @@ -3,7 +3,7 @@ package net.sf.openrocket.optimization.rocketoptimization; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import net.sf.openrocket.BaseApplicationAbstractTest; +import net.sf.openrocket.AbstractBaseApplication; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.optimization.general.OptimizationException; import net.sf.openrocket.optimization.general.Point; @@ -23,7 +23,7 @@ import org.junit.runner.RunWith; @RunWith(JMock.class) -public class TestRocketOptimizationFunction extends BaseApplicationAbstractTest { +public class TestRocketOptimizationFunction extends AbstractBaseApplication { Mockery context = new JUnit4Mockery(); @Mock diff --git a/core/test/net/sf/openrocket/optimization/rocketoptimization/modifiers/TestGenericModifier.java b/core/test/net/sf/openrocket/optimization/rocketoptimization/modifiers/TestGenericModifier.java index a36fc9262..d7a83774e 100644 --- a/core/test/net/sf/openrocket/optimization/rocketoptimization/modifiers/TestGenericModifier.java +++ b/core/test/net/sf/openrocket/optimization/rocketoptimization/modifiers/TestGenericModifier.java @@ -2,7 +2,7 @@ package net.sf.openrocket.optimization.rocketoptimization.modifiers; import static net.sf.openrocket.util.MathUtil.EPSILON; import static org.junit.Assert.assertEquals; -import net.sf.openrocket.BaseApplicationAbstractTest; +import net.sf.openrocket.AbstractBaseApplication; import net.sf.openrocket.document.Simulation; import net.sf.openrocket.optimization.general.OptimizationException; import net.sf.openrocket.rocketcomponent.Rocket; @@ -12,7 +12,7 @@ import org.junit.Assert; import org.junit.Before; import org.junit.Test; -public class TestGenericModifier extends BaseApplicationAbstractTest { +public class TestGenericModifier extends AbstractBaseApplication { private TestValue value; private GenericModifier gm; diff --git a/core/test/net/sf/openrocket/simulation/customexpression/TestExpressions.java b/core/test/net/sf/openrocket/simulation/customexpression/TestExpressions.java index 594142aa0..47312038c 100644 --- a/core/test/net/sf/openrocket/simulation/customexpression/TestExpressions.java +++ b/core/test/net/sf/openrocket/simulation/customexpression/TestExpressions.java @@ -1,12 +1,12 @@ package net.sf.openrocket.simulation.customexpression; -import net.sf.openrocket.BaseApplicationAbstractTest; +import net.sf.openrocket.AbstractBaseApplication; import net.sf.openrocket.document.OpenRocketDocument; import net.sf.openrocket.document.OpenRocketDocumentFactory; import org.junit.Test; -public class TestExpressions extends BaseApplicationAbstractTest { +public class TestExpressions extends AbstractBaseApplication { @Test public void testExpressions() {