From f899b9fb2ecddd6807e39b1d8d0ece0cd5941272 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Mon, 22 Apr 2013 09:14:15 -0500 Subject: [PATCH] Fixed RocksimDocumentDTOTest by having RocksimTestBase extend BaseApplicationAbstractTest to create a more complete Application object. --- .../file/rocksim/importt/RocksimTestBase.java | 21 +++++++------------ 1 file changed, 7 insertions(+), 14 deletions(-) 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 beb45c18a..f9f76e3df 100644 --- a/core/test/net/sf/openrocket/file/rocksim/importt/RocksimTestBase.java +++ b/core/test/net/sf/openrocket/file/rocksim/importt/RocksimTestBase.java @@ -3,29 +3,22 @@ */ 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.gui.util.SwingPreferences; import net.sf.openrocket.rocketcomponent.RocketComponent; import net.sf.openrocket.startup.Application; + import org.junit.Assert; import org.junit.Before; -import java.lang.reflect.Field; -import java.util.List; - /** * A base class for the Rocksim tests. Includes code from the junitx.addons project. */ -public abstract class RocksimTestBase { +public abstract class RocksimTestBase extends BaseApplicationAbstractTest { - /* (non-Javadoc) - * @see junit.framework.TestCase#setUp() - */ - @Before - public void setUp() throws Exception { - Application.setPreferences( new SwingPreferences() ); - } - - public void assertContains(RocketComponent child, List components) { Assert.assertTrue("Components did not contain child", components.contains(child)); } @@ -92,5 +85,5 @@ public abstract class RocksimTestBase { cls.getName() + "." + name); } - + }