From 2a6cc0c65a7a12d9b05e6b6293d367d996fb460b Mon Sep 17 00:00:00 2001 From: Daniel Brown <ddb@star.sr.bham.ac.uk> Date: Wed, 27 Apr 2016 15:37:12 -0700 Subject: [PATCH] Adding in test files, building test folder up for continuous integration testing later --- .../structural}/test_deepcopying_references.py | 4 ++-- test/{ => test_scripts/structural}/test_properties.py | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) rename test/{ => test_scripts/structural}/test_deepcopying_references.py (95%) rename test/{ => test_scripts/structural}/test_properties.py (73%) diff --git a/test/test_deepcopying_references.py b/test/test_scripts/structural/test_deepcopying_references.py similarity index 95% rename from test/test_deepcopying_references.py rename to test/test_scripts/structural/test_deepcopying_references.py index 4b8871c..a82b061 100644 --- a/test/test_deepcopying_references.py +++ b/test/test_scripts/structural/test_deepcopying_references.py @@ -30,10 +30,10 @@ assert(kat0.o1.f1 is not kat1.o1.f1) assert(kat0.o1.f1 == kat1.o1.f1) kat0.o1.f1 *= 2 -kat0.o1.phi1 *= 2 +kat0.o1.phase1 *= 2 assert(isinstance(kat0.o1.f1, pykat.param.Param)) -assert(isinstance(kat0.o1.phi1, pykat.param.Param)) +assert(isinstance(kat0.o1.phase1, pykat.param.Param)) assert(kat0.o1.f1 != kat1.o1.f1) kat1.o1.num_demods = 2 diff --git a/test/test_properties.py b/test/test_scripts/structural/test_properties.py similarity index 73% rename from test/test_properties.py rename to test/test_scripts/structural/test_properties.py index 71152bb..2bacda3 100644 --- a/test/test_properties.py +++ b/test/test_scripts/structural/test_properties.py @@ -15,8 +15,8 @@ assert(kat.pdr.f1 == 100) assert(type(kat.pdr.f1) is pykat.param.Param) kat.pdr.phi1 = "10u" -assert(kat.pdr.phi1 == 1e-5) -assert(type(kat.pdr.phi1) is pykat.param.Param) +assert(kat.pdr.phase1 == 1e-5) +assert(type(kat.pdr.phase1) is pykat.param.Param) kat.m1.R = "10000u" assert(kat.m1.R == 0.01) @@ -27,7 +27,7 @@ kat = deepcopy(kat) kat.m1.R = 0.9 assert(kat.m1.R == 0.9) -kat.pdr.phi1 = 20 -assert(kat.pdr.phi1 == 20) +kat.pdr.phase1 = 20 +assert(kat.pdr.phase1 == 20) -print "PASSED" \ No newline at end of file +print("PASSED") \ No newline at end of file -- GitLab