aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavi Merino <javi.merino@arm.com>2016-01-27 18:23:11 +0000
committerJavi Merino <javi.merino@arm.com>2016-01-27 18:23:11 +0000
commite3bde0ccaef4702599d968f10fbdc60a77371f8c (patch)
tree61522549944ab53e9d420c7cf6d22fab1870a5dc
parent4bb9e40eead9eeedaf0202e1d6739854c7010396 (diff)
downloadbart-e3bde0ccaef4702599d968f10fbdc60a77371f8c.tar.gz
tests: make test_signal use the simplified BareTrace from trappy
The signal tests all use dataframes for their tests that are manually added to the trace object. trappy has a new API to do that. You can create your trace as a BareTrace and then call add_parsed_event() to add dataframes to it.
-rw-r--r--tests/test_signal.py26
1 files changed, 13 insertions, 13 deletions
diff --git a/tests/test_signal.py b/tests/test_signal.py
index 889eff3..48692a9 100644
--- a/tests/test_signal.py
+++ b/tests/test_signal.py
@@ -35,11 +35,11 @@ class TestSignalCompare(TestBART):
A = [0, 0, 0, 3, 3, 0, 0, 0]
B = [0, 0, 2, 2, 2, 2, 1, 1]
- ftrace = trappy.FTrace(".", events=["event"])
+ trace = trappy.BareTrace()
df = pd.DataFrame({"A": A, "B": B})
- ftrace.event.data_frame = df
+ trace.add_parsed_event("event", df)
- s = SignalCompare(ftrace, "event:A", "event:B")
+ s = SignalCompare(trace, "event:A", "event:B")
expected = (1.5, 2.0 / 7)
self.assertEqual(
s.conditional_compare(
@@ -53,11 +53,11 @@ class TestSignalCompare(TestBART):
A = [0, 0, 0, 3, 3, 0, 0, 0]
B = [0, 0, 2, 2, 2, 2, 1, 1]
- ftrace = trappy.FTrace(".", events=["event"])
+ trace = trappy.BareTrace()
df = pd.DataFrame({"A": A, "B": B})
- ftrace.event.data_frame = df
+ trace.add_parsed_event("event", df)
- s = SignalCompare(ftrace, "event:A", "event:B")
+ s = SignalCompare(trace, "event:A", "event:B")
expected = (1.5, 2.0 / 7)
self.assertEqual(
s.get_overshoot(method="rect"),
@@ -67,8 +67,8 @@ class TestSignalCompare(TestBART):
B = [0, 0, 2, 2, 2, 2, 1, 1]
df = pd.DataFrame({"A": A, "B": B})
- ftrace.event.data_frame = df
- s = SignalCompare(ftrace, "event:A", "event:B")
+ trace.event.data_frame = df
+ s = SignalCompare(trace, "event:A", "event:B")
expected = (float("nan"), 0.0)
result = s.get_overshoot(method="rect")
@@ -81,11 +81,11 @@ class TestSignalCompare(TestBART):
A = [0, 0, 0, 1, 1, 1, 1, 1]
B = [2, 2, 2, 2, 2, 2, 2, 2]
- ftrace = trappy.FTrace(".", events=["event"])
+ trace = trappy.BareTrace()
df = pd.DataFrame({"A": A, "B": B})
- ftrace.event.data_frame = df
+ trace.add_parsed_event("event", df)
- s = SignalCompare(ftrace, "event:A", "event:B")
+ s = SignalCompare(trace, "event:A", "event:B")
expected = (4.0 / 14.0, 1.0)
self.assertEqual(
s.get_undershoot(method="rect"),
@@ -95,8 +95,8 @@ class TestSignalCompare(TestBART):
B = [2, 2, 2, 2, 2, 2, 1, 1]
df = pd.DataFrame({"A": A, "B": B})
- ftrace.event.data_frame = df
- s = SignalCompare(ftrace, "event:A", "event:B")
+ trace.event.data_frame = df
+ s = SignalCompare(trace, "event:A", "event:B")
expected = (float("nan"), 0.0)
result = s.get_undershoot(method="rect")