hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #70 from kruland2607/master

Browse Source 
Renamed base class in unit test framework.
This commit is contained in:
kruland2607 2013-04-24 12:18:50 -07:00
commit 38cb932331
7 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/test/net/sf/openrocket/BaseApplicationAbstractTest.java → core/test/net/sf/openrocket/AbstractBaseApplication.java
View File

@ -12,7 +12,7 @@ import com.google.inject.Injector;
import com.google.inject.Module;
public abstract class BaseApplicationAbstractTest {
public abstract class AbstractBaseApplication {
@BeforeClass

2
core/test/net/sf/openrocket/IntegrationTest.java
View File

@ -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;

4
core/test/net/sf/openrocket/file/rocksim/importt/RocksimLoaderTest.java
View File

@ -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

4
core/test/net/sf/openrocket/file/rocksim/importt/RocksimTestBase.java
View File

@ -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<RocketComponent> components) {
Assert.assertTrue("Components did not contain child", components.contains(child));

4
core/test/net/sf/openrocket/optimization/rocketoptimization/TestRocketOptimizationFunction.java
View File

@ -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

4
core/test/net/sf/openrocket/optimization/rocketoptimization/modifiers/TestGenericModifier.java
View File

@ -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<TestValue> gm;

4
core/test/net/sf/openrocket/simulation/customexpression/TestExpressions.java
View File

@ -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() {