Changeset 96 for java/main/src/test/java/com/framsticks/gui
- Timestamp:
- 07/04/13 20:29:50 (11 years ago)
- Location:
- java/main/src/test/java/com/framsticks/gui
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
java/main/src/test/java/com/framsticks/gui/BrowserBaseTest.java
r90 r96 9 9 import org.fest.swing.fixture.FrameFixture; 10 10 import org.fest.swing.fixture.JTreeFixture; 11 import org.testng.annotations.AfterClass;12 import org.testng.annotations.BeforeClass;13 11 import org.testng.annotations.Test; 14 12 15 import com.framsticks.test. TestConfiguration;16 import com.framsticks.util.dispatching. Monitor;13 import com.framsticks.test.MonitorBasedTest; 14 import com.framsticks.util.dispatching.Joinable; 17 15 18 16 import static org.fest.assertions.Assertions.assertThat; … … 22 20 23 21 @Test 24 public abstract class BrowserBaseTest extends TestConfiguration{22 public abstract class BrowserBaseTest extends MonitorBasedTest { 25 23 26 24 private static final Logger log = Logger.getLogger(BrowserTest.class); 27 25 28 protected Monitor monitor;29 26 protected Browser browser; 30 27 protected static Robot robot; … … 39 36 } 40 37 41 @BeforeClass(timeOut = 5000) 42 public void setUp() { 38 @Override 39 protected Joinable createSubject() { 40 configureBrowser(); 41 return browser; 42 } 43 43 44 configureBrowser(); 45 46 monitor = new Monitor(browser); 47 48 monitor.use(); 49 44 protected void setUpAfterUse() { 50 45 frame = new FrameFixture(robot, 51 46 GuiActionRunner.execute(new GuiQuery<JFrame>() { … … 57 52 58 53 tree = frame.tree("tree"); 54 59 55 log.debug("frame fixture done"); 60 56 } 57 61 58 62 59 protected abstract void configureBrowser(); … … 71 68 } 72 69 73 @AfterClass(timeOut = 5000)74 public void tearDown() {75 monitor.drop().join();76 }77 78 70 } -
java/main/src/test/java/com/framsticks/gui/BrowserTest.java
r90 r96 10 10 11 11 import com.framsticks.model.ModelPackage; 12 import com.framsticks.remote. RemoteInstance;12 import com.framsticks.remote.SimulatorInstance; 13 13 14 14 public class BrowserTest extends BrowserBaseTest { … … 16 16 private static final Logger log = Logger.getLogger(BrowserTest.class); 17 17 18 RemoteInstance localhost;18 SimulatorInstance localhost; 19 19 20 20 @Override … … 22 22 browser = new Browser(); 23 23 24 localhost = new RemoteInstance();24 localhost = new SimulatorInstance(); 25 25 localhost.setName("localhost"); 26 26 localhost.setAddress("localhost:9009"); -
java/main/src/test/java/com/framsticks/gui/ObjectInstanceBrowserTest.java
r90 r96 11 11 import com.framsticks.parsers.XmlLoader; 12 12 import com.framsticks.util.dispatching.RunAt; 13 14 import static com.framsticks.core.InstanceUtils.*; 13 15 14 16 @Test … … 29 31 @Test(timeOut = 10000) 30 32 public void testShow() { 31 assertDispatch(instance,new RunAt<Instance>() {33 instance.dispatch(new RunAt<Instance>() { 32 34 @Override 33 35 public void run() { … … 40 42 clickAndExpandPath("model/parts/2"); 41 43 42 assertDispatch(instance,new RunAt<Instance>() {44 instance.dispatch(new RunAt<Instance>() { 43 45 @Override 44 46 public void run() { 45 assertThat( instance.bindAccess("/parts/2").getFramsClass().getParamEntry("m", FloatParam.class).getMax(Double.class)).isEqualTo(999.0);47 assertThat(bindAccess(instance, "/parts/2").getFramsClass().getParamEntry("m", FloatParam.class).getMax(Double.class)).isEqualTo(999.0); 46 48 } 47 49 }); -
java/main/src/test/java/com/framsticks/gui/ProcedureBrowserTest.java
r90 r96 16 16 import com.framsticks.test.TestClass; 17 17 import com.framsticks.util.dispatching.RunAt; 18 import static com.framsticks.core.InstanceUtils.*; 18 19 19 20 @Test … … 34 35 @Test(timeOut = 10000) 35 36 public void testShow() { 36 assertDispatch(instance,new RunAt<Instance>() {37 instance.dispatch(new RunAt<Instance>() { 37 38 @Override 38 39 public void run() { … … 43 44 clickAndExpandPath("test"); 44 45 45 assertDispatch(instance,new RunAt<Instance>() {46 instance.dispatch(new RunAt<Instance>() { 46 47 @Override 47 48 public void run() { 48 assertThat( instance.bindAccess("/").getFramsClass().getParam("history")).isInstanceOf(StringParam.class);49 assertThat(bindAccess(instance, "/").getFramsClass().getParam("history")).isInstanceOf(StringParam.class); 49 50 } 50 51 }); … … 52 53 // monitor.useFor(4.0); 53 54 54 assertDispatch(instance,new RunAt<Instance>() {55 instance.dispatch(new RunAt<Instance>() { 55 56 @Override 56 57 public void run() { 57 AccessInterface access = instance.bindAccess("/");58 AccessInterface access = bindAccess(instance, "/"); 58 59 assertThat(access).isInstanceOf(ReflectionAccess.class); 59 60 FramsClass framsClass = access.getFramsClass(); … … 74 75 waitForIdle(); 75 76 76 assertDispatch(instance,new RunAt<Instance>() {77 instance.dispatch(new RunAt<Instance>() { 77 78 @Override 78 79 public void run() { 79 assertThat( instance.bindAccess("/").get("history", String.class)).isEqualTo("argument|");80 assertThat(bindAccess(instance, "/").get("history", String.class)).isEqualTo("argument|"); 80 81 } 81 82 }); … … 84 85 waitForIdle(); 85 86 86 assertDispatch(instance,new RunAt<Instance>() {87 instance.dispatch(new RunAt<Instance>() { 87 88 @Override 88 89 public void run() { 89 assertThat( instance.bindAccess("/").get("history", String.class)).isEqualTo("");90 assertThat(bindAccess(instance, "/").get("history", String.class)).isEqualTo(""); 90 91 } 91 92 });
Note: See TracChangeset
for help on using the changeset viewer.