-
Notifications
You must be signed in to change notification settings - Fork 115
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #366 from openxc/next
v7.1 release
- Loading branch information
Showing
107 changed files
with
2,212 additions
and
1,801 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
226 changes: 115 additions & 111 deletions
226
enabler/src/androidTest/java/com/openxc/sources/trace/TraceVehicleDataSourceTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,111 +1,115 @@ | ||
| //package com.openxc.sources.trace; | ||
| // | ||
| //import java.net.MalformedURLException; | ||
| //import java.net.URI; | ||
| //import java.net.URISyntaxException; | ||
| //import java.net.URL; | ||
| // | ||
| //import android.test.AndroidTestCase; | ||
| //import android.test.suitebuilder.annotation.SmallTest; | ||
| // | ||
| //import com.openxc.TestUtils; | ||
| //import com.openxc.messages.SimpleVehicleMessage; | ||
| //import com.openxc.messages.VehicleMessage; | ||
| //import com.openxc.sources.DataSourceException; | ||
| //import com.openxc.sources.SourceCallback; | ||
| //import com.openxc.sources.VehicleDataSource; | ||
| //import com.openxcplatform.enabler.R; | ||
| // | ||
| //public class TraceVehicleDataSourceTest extends AndroidTestCase { | ||
| // URI traceUri; | ||
| // URI malformedTraceUri; | ||
| // TraceVehicleDataSource source; | ||
| // Thread thread; | ||
| // SourceCallback callback; | ||
| // boolean receivedNumericalCallback; | ||
| // boolean receivedBooleanCallback;; | ||
| // | ||
| // @Override | ||
| // protected void setUp() { | ||
| // traceUri = TestUtils.copyToStorage(getContext(), R.raw.tracejson, | ||
| // "trace.json"); | ||
| // malformedTraceUri = TestUtils.copyToStorage(getContext(), | ||
| // R.raw.tracetxt, "malformed-trace.json"); | ||
| // callback = new SourceCallback() { | ||
| // public void receive(VehicleMessage message) { | ||
| // SimpleVehicleMessage simpleMessage = (SimpleVehicleMessage) message; | ||
| // if(simpleMessage.getValue().getClass() == Boolean.class) { | ||
| // receivedBooleanCallback = true; | ||
| // } else if(simpleMessage.getValue().getClass() == Double.class) { | ||
| // receivedNumericalCallback = true; | ||
| // } | ||
| // } | ||
| // | ||
| // public void sourceDisconnected(VehicleDataSource source) { } | ||
| // | ||
| // public void sourceConnected(VehicleDataSource source) { } | ||
| // }; | ||
| // } | ||
| // | ||
| // @Override | ||
| // protected void tearDown() throws Exception { | ||
| // if(source != null) { | ||
| // source.stop(); | ||
| // } | ||
| // if(thread != null) { | ||
| // try { | ||
| // thread.join(); | ||
| // } catch(InterruptedException e) {} | ||
| // } | ||
| // super.tearDown(); | ||
| // } | ||
| // | ||
| // private void startTrace(TraceVehicleDataSource source) { | ||
| // thread = new Thread(source); | ||
| // thread.start(); | ||
| // try { | ||
| // Thread.sleep(500); | ||
| // } catch(InterruptedException e){ } | ||
| // } | ||
| // | ||
| // @SmallTest | ||
| // public void testPlaybackFile() throws InterruptedException, | ||
| // DataSourceException { | ||
| // receivedNumericalCallback = false; | ||
| // receivedBooleanCallback = false; | ||
| // source = new TraceVehicleDataSource(callback, getContext(), traceUri); | ||
| // startTrace(source); | ||
| // assertTrue(receivedNumericalCallback); | ||
| // assertTrue(receivedBooleanCallback); | ||
| // } | ||
| // | ||
| // @SmallTest | ||
| // public void testMalformedJson() throws InterruptedException , | ||
| // DataSourceException { | ||
| // receivedNumericalCallback = false; | ||
| // receivedBooleanCallback = false; | ||
| // source = new TraceVehicleDataSource(callback, getContext(), | ||
| // malformedTraceUri); | ||
| // startTrace(source); | ||
| // assertFalse(receivedNumericalCallback); | ||
| // source.stop(); | ||
| // } | ||
| // | ||
| // @SmallTest | ||
| // public void testMissingFile() throws MalformedURLException, | ||
| // InterruptedException, DataSourceException, | ||
| // URISyntaxException { | ||
| // receivedNumericalCallback = false; | ||
| // receivedBooleanCallback = false; | ||
| // source = new TraceVehicleDataSource(callback, getContext(), | ||
| // new URL("file:///foo").toURI()); | ||
| // startTrace(source); | ||
| // assertFalse(receivedNumericalCallback); | ||
| // } | ||
| // | ||
| // @SmallTest | ||
| // public void testConstructWithCallbackAndFile() | ||
| // throws DataSourceException { | ||
| // source = new TraceVehicleDataSource(callback, getContext(), traceUri); | ||
| // } | ||
| //} | ||
| package com.openxc.sources.trace; | ||
|
|
||
| import android.test.AndroidTestCase; | ||
| import android.test.suitebuilder.annotation.SmallTest; | ||
|
|
||
| import com.openxc.TestUtils; | ||
| import com.openxc.messages.SimpleVehicleMessage; | ||
| import com.openxc.messages.VehicleMessage; | ||
| import com.openxc.sources.DataSourceException; | ||
| import com.openxc.sources.SourceCallback; | ||
| import com.openxc.sources.VehicleDataSource; | ||
| import com.openxcplatform.enabler.R; | ||
|
|
||
| import java.net.MalformedURLException; | ||
| import java.net.URI; | ||
| import java.net.URISyntaxException; | ||
| import java.net.URL; | ||
|
|
||
| public class TraceVehicleDataSourceTest extends AndroidTestCase { | ||
| URI traceUri; | ||
| URI malformedTraceUri; | ||
| TraceVehicleDataSource source; | ||
| Thread thread; | ||
| SourceCallback callback; | ||
| boolean receivedNumericalCallback; | ||
| boolean receivedBooleanCallback;; | ||
|
|
||
| @Override | ||
| protected void setUp() throws Exception { | ||
| super.setUp(); | ||
| traceUri = TestUtils.copyToStorage(getContext(), R.raw.tracejson, | ||
| "trace.json"); | ||
| malformedTraceUri = TestUtils.copyToStorage(getContext(), | ||
| R.raw.tracetxt, "malformed-trace.json"); | ||
| callback = new SourceCallback() { | ||
| public void receive(VehicleMessage message) { | ||
| SimpleVehicleMessage simpleMessage = (SimpleVehicleMessage) message; | ||
| if(simpleMessage.getValue().getClass() == Boolean.class) { | ||
| receivedBooleanCallback = true; | ||
| } else if(simpleMessage.getValue().getClass() == Double.class) { | ||
| receivedNumericalCallback = true; | ||
| } | ||
| } | ||
|
|
||
| public void sourceDisconnected(VehicleDataSource source) { } | ||
|
|
||
| public void sourceConnected(VehicleDataSource source) { } | ||
| }; | ||
| } | ||
|
|
||
| @Override | ||
| protected void tearDown() throws Exception { | ||
| if(source != null) { | ||
| source.stop(); | ||
| } | ||
| if(thread != null) { | ||
| try { | ||
| thread.join(); | ||
| } catch(InterruptedException e) {} | ||
| } | ||
| super.tearDown(); | ||
| } | ||
|
|
||
| private void startTrace(TraceVehicleDataSource source) { | ||
| thread = new Thread(source); | ||
| thread.start(); | ||
| try { | ||
| Thread.sleep(500); | ||
| } catch(InterruptedException e) {} | ||
| // SystemClock.sleep(500); | ||
| } | ||
|
|
||
| @SmallTest | ||
| public void testPlaybackFile() throws InterruptedException, | ||
| DataSourceException { | ||
| receivedNumericalCallback = false; | ||
| receivedBooleanCallback = false; | ||
| source = new TraceVehicleDataSource(callback, getContext(), traceUri); | ||
| startTrace(source); | ||
| assertTrue(receivedNumericalCallback); | ||
| assertTrue(receivedBooleanCallback); | ||
| } | ||
|
|
||
| @SmallTest | ||
| public void testMalformedJson() throws InterruptedException , | ||
| DataSourceException { | ||
| receivedNumericalCallback = false; | ||
| receivedBooleanCallback = false; | ||
| source = new TraceVehicleDataSource(callback, getContext(), | ||
| malformedTraceUri); | ||
| startTrace(source); | ||
| assertFalse(receivedNumericalCallback); | ||
| source.stop(); | ||
| } | ||
|
|
||
| @SmallTest | ||
| public void testMissingFile() throws MalformedURLException, | ||
| InterruptedException, DataSourceException, | ||
| URISyntaxException { | ||
| receivedNumericalCallback = false; | ||
| receivedBooleanCallback = false; | ||
| source = new TraceVehicleDataSource(callback, getContext(), | ||
| new URL("file:///foo").toURI()); | ||
| startTrace(source); | ||
| assertFalse(receivedNumericalCallback); | ||
| } | ||
|
|
||
| @SmallTest | ||
| public void testConstructWithCallbackAndFile() | ||
| throws DataSourceException { | ||
| receivedNumericalCallback = false; | ||
| source = new TraceVehicleDataSource(callback, getContext(), traceUri); | ||
| assertFalse(receivedNumericalCallback); | ||
| } | ||
| } |
Oops, something went wrong.