Refactors trnsys tests #79

louisleroy5 · 2020-04-16T23:06:53Z

Refactors tests to improve coverage and for tests to run faster

samuelduchesne · 2020-04-17T00:01:17Z

Addresses issue #68

Makes sure load_idf_file_and_clean_names() returns unique names and an IDF object

Makes sure csv file with schedules exists and that schedules are written in lines

Makes sure version and building information written in lines

Makes sure materials (material, AirGap, NoMass, etc.) are written in lines

Makes sure relative coords converted to absolute ones

Makes sure path to T3D file exists

…tion of b18 file

Value of conditioning in REGIME section has to be the name of the conditioning system previously written in Conditioning section (must be a string, not a list or half-string etc.)

Makes sure infiltration, internal gains and conditioning are written in b18_lines

WARNING : this test does not represent a real IDF. It was modified to have the best coverage as possible

Improve coverage of trnsys.y

Improve coverage of trnsys.py

Improve coverage

samuelduchesne · 2020-04-18T17:22:27Z

tests/test_trnsys.py

+
+        idf = add_object_and_run_ep(ep_version, idf_file, weather_file, outputs)
+
+        assert type(idf) == ar.idfclass.IDF


use assert isinstance(idf, ar.idfclass.IDF)

samuelduchesne · 2020-04-18T17:25:15Z

archetypal/trnsys.py

@@ -425,6 +414,23 @@ def convert_idf_to_trnbuild(
    return return_path


+def add_object_and_run_ep(ep_version, idf_file, weather_file, outputs):


Why did you wrap the run_eplus method in this new add_object_and_run_ep()?

To have better coverage for trnsys.py

tests/test_trnsys.py

…running Improve coverage of trnsys.py

samuelduchesne · 2020-04-18T18:36:41Z

Ok but if an assertion does not pass, you would like the test to fail, right? Samuel

…

On Apr 18, 2020, at 1:36 PM, louisleroy5 ***@***.***> wrote: @louisleroy5 commented on this pull request. In tests/test_trnsys.py: > + kwargs, + ) = converttesteasy + try: + ( + idf_file, + weather_file, + window_lib, + output_folder, + trnsidf_exe, + template, + ) = _assert_files( + idf_file, weather_file, window_lib, output_folder, trnsidf_exe, template + ) + except: + output_folder = os.path.relpath(settings.data_folder) + print("Could not assert all paths exist - OK for this test") If the assertion do not pass — You are receiving this because you commented. Reply to this email directly, view it on GitHub, or unsubscribe.

louisleroy5 · 2020-04-18T18:43:53Z

Oh ok! But it fails if the assertion does not pass, doesn’t it ?

…

On Apr 18, 2020, at 2:36 PM, Samuel Letellier-Duchesne ***@***.***> wrote: Ok but if an assertion does not pass, you would like the test to fail, right? Samuel > On Apr 18, 2020, at 1:36 PM, louisleroy5 ***@***.***> wrote: > > > @louisleroy5 commented on this pull request. > > In tests/test_trnsys.py: > > > + kwargs, > + ) = converttesteasy > + try: > + ( > + idf_file, > + weather_file, > + window_lib, > + output_folder, > + trnsidf_exe, > + template, > + ) = _assert_files( > + idf_file, weather_file, window_lib, output_folder, trnsidf_exe, template > + ) > + except: > + output_folder = os.path.relpath(settings.data_folder) > + print("Could not assert all paths exist - OK for this test") > If the assertion do not pass > > — > You are receiving this because you commented. > Reply to this email directly, view it on GitHub, or unsubscribe. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#79 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AIS7ISQ6VWWA5NT4K2Y2JC3RNHXMLANCNFSM4MKI6TTQ>.

samuelduchesne · 2020-04-18T19:43:52Z

Yes. This is the role of assertions. “If assertion fails, test fails” Samuel

…

On Apr 18, 2020, at 2:44 PM, louisleroy5 ***@***.***> wrote: Oh ok! But it fails if the assertion does not pass, doesn’t it ? > On Apr 18, 2020, at 2:36 PM, Samuel Letellier-Duchesne ***@***.***> wrote: > > > Ok but if an assertion does not pass, you would like the test to fail, right? > > Samuel > > > On Apr 18, 2020, at 1:36 PM, louisleroy5 ***@***.***> wrote: > > > > > > @louisleroy5 commented on this pull request. > > > > In tests/test_trnsys.py: > > > > > + kwargs, > > + ) = converttesteasy > > + try: > > + ( > > + idf_file, > > + weather_file, > > + window_lib, > > + output_folder, > > + trnsidf_exe, > > + template, > > + ) = _assert_files( > > + idf_file, weather_file, window_lib, output_folder, trnsidf_exe, template > > + ) > > + except: > > + output_folder = os.path.relpath(settings.data_folder) > > + print("Could not assert all paths exist - OK for this test") > > If the assertion do not pass > > > > — > > You are receiving this because you commented. > > Reply to this email directly, view it on GitHub, or unsubscribe. > — > You are receiving this because you were mentioned. > Reply to this email directly, view it on GitHub <#79 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AIS7ISQ6VWWA5NT4K2Y2JC3RNHXMLANCNFSM4MKI6TTQ>. > — You are receiving this because you commented. Reply to this email directly, view it on GitHub, or unsubscribe.

No need to wrap a function in an other one if it does not bring any new functionality

samuelduchesne

@louisleroy5 , this is what I mean. There is no additional functionality to wrap a function inside another one. In other words, calling add_object_and_run_ep is exactly the same as calling run_eplus with the same arguments

louisleroy5 · 2020-04-18T20:47:31Z

Yes and there is assertions for this test : line 455 of test_trnsys.py : # Asserts closest coords assert x == -5 assert y == 215 assert z == 0

…

On Apr 18, 2020, at 3:44 PM, Samuel Letellier-Duchesne ***@***.***> wrote: Yes. This is the role of assertions. “If assertion fails, test fails” Samuel > On Apr 18, 2020, at 2:44 PM, louisleroy5 ***@***.***> wrote: > > > Oh ok! But it fails if the assertion does not pass, doesn’t it ? > > > On Apr 18, 2020, at 2:36 PM, Samuel Letellier-Duchesne ***@***.***> wrote: > > > > > > Ok but if an assertion does not pass, you would like the test to fail, right? > > > > Samuel > > > > > On Apr 18, 2020, at 1:36 PM, louisleroy5 ***@***.***> wrote: > > > > > > > > > @louisleroy5 commented on this pull request. > > > > > > In tests/test_trnsys.py: > > > > > > > + kwargs, > > > + ) = converttesteasy > > > + try: > > > + ( > > > + idf_file, > > > + weather_file, > > > + window_lib, > > > + output_folder, > > > + trnsidf_exe, > > > + template, > > > + ) = _assert_files( > > > + idf_file, weather_file, window_lib, output_folder, trnsidf_exe, template > > > + ) > > > + except: > > > + output_folder = os.path.relpath(settings.data_folder) > > > + print("Could not assert all paths exist - OK for this test") > > > If the assertion do not pass > > > > > > — > > > You are receiving this because you commented. > > > Reply to this email directly, view it on GitHub, or unsubscribe. > > — > > You are receiving this because you were mentioned. > > Reply to this email directly, view it on GitHub <#79 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AIS7ISQ6VWWA5NT4K2Y2JC3RNHXMLANCNFSM4MKI6TTQ>. > > > > — > You are receiving this because you commented. > Reply to this email directly, view it on GitHub, or unsubscribe. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#79 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AIS7ISXTYX7OK4MPS6M3LOLRNH7IJANCNFSM4MKI6TTQ>.

samuelduchesne · 2020-04-18T21:19:53Z

tests/test_trnsys.py

+            ) = _assert_files(
+                idf_file, weather_file, window_lib, output_folder, trnsidf_exe, template
+            )
+        except:


This except statement is too general. try, except what? KeyError? ValueError?

Even better, put the _assert_files under a with pytest.raises(Exception): and get rid of the try, except clause

Make sure to replace "Exception" by the actual exception your method raises. This way, pytest will be happy and display the correct information

See https://docs.pytest.org/en/latest/assert.html#assertions-about-expected-exceptions for more info

Tests all possibilities in _assert_files() (trnsys.py)

samuelduchesne

A lot cleaner!

Actually, the Windows build is failing

… warning

Refactors tests to be faster

a1141cd

samuelduchesne linked an issue Apr 17, 2020 that may be closed by this pull request

CI tests need to be much quicker #68

Closed

louisleroy5 added 13 commits April 17, 2020 10:21

Better coverage for test_write_to_b18()

0f8a6bd

Asserts test_load_idf_file_and_clean_names()

68a45cc

Makes sure load_idf_file_and_clean_names() returns unique names and an IDF object

Asserts test_get_save_write_schedules_as_sched()

f81e429

Makes sure csv file with schedules exists and that schedules are written in lines

Asserts test_write_version_and_building()

fdcb2be

Makes sure version and building information written in lines

Enhances test_get_save_write_schedules_as_sched() assertion

8f9f41b

Asserts test_write_material()

db07fe4

Makes sure materials (material, AirGap, NoMass, etc.) are written in lines

Asserts test_relative_to_absolute()

8cedf76

Makes sure relative coords converted to absolute ones

Asserts test_save_t3d()

3fd37e2

Makes sure path to T3D file exists

Deletes infiltration characteristics in b18 file used for tests

1198dfb

Deletes internal gains, infiltration and conditioning in "REGIME" sec…

0a6cea4

…tion of b18 file

Makes sure value of conditioning in REGIME section of b18 file is good

8e5c205

Value of conditioning in REGIME section has to be the name of the conditioning system previously written in Conditioning section (must be a string, not a list or half-string etc.)

Asserts test_write_to_b18

221d7df

Makes sure infiltration, internal gains and conditioning are written in b18_lines

Makes sure to clear caches

40b5252

louisleroy5 requested a review from samuelduchesne April 17, 2020 17:14

louisleroy5 added the enhancement Includes code that add's enhancements to existing archetypal functionalities label Apr 17, 2020

louisleroy5 added 10 commits April 17, 2020 15:07

Corrects path to .temp folder (data_folder)

80708cc

Corrects path to cache folder (to delete)

179c85d

Makes sure zone coords are not empty

63af38c

Modify idf objects to improve coverage

d2efbca

WARNING : this test does not represent a real IDF. It was modified to have the best coverage as possible

Only uses 1 idf to run test (faster)

40e20ce

Create test_t_initial_to_b18

93561d2

Improve coverage of trnsys.y

Creates test_closest_coords()

1003c53

Improve coverage of trnsys.py

Runs Black

f866f8a

Refactors trnsys.py. Creates new function to run EP

a90e8d5

Creates tests for new function add_object_and_run_ep()

347d495

Improve coverage

samuelduchesne reviewed Apr 18, 2020

View reviewed changes

Asserts using is instance instead of "=="

a767cff

louisleroy5 added 2 commits April 18, 2020 13:52

Corrects bug when creating a surface

3dcd228

Changes boundary conditions of a surface to create a new surfce when …

380f69a

…running Improve coverage of trnsys.py

Deletes add_object_and_run_ep

c973d64

No need to wrap a function in an other one if it does not bring any new functionality

samuelduchesne approved these changes Apr 18, 2020

View reviewed changes

samuelduchesne self-requested a review April 18, 2020 21:17

samuelduchesne requested changes Apr 18, 2020

View reviewed changes

louisleroy5 added 5 commits April 20, 2020 08:50

Makes sure output_folder exists

b03c0f9

Deletes _assert_files() function in tests

726d2f1

Runs Black

496b0fb

Enhances _assert_files(). Makes sure file path is not None

aaebdb7

Creates new test for _assert_files()

f0f3c90

Tests all possibilities in _assert_files() (trnsys.py)

samuelduchesne previously approved these changes Apr 20, 2020

View reviewed changes

louisleroy5 added 4 commits April 20, 2020 12:04

Corrects typo

e6888ea

Uses Path() instead of os.path()

802e954

Even if path to TRNSYS folder does not exists, returns the path and a…

6a4905c

… warning

Refactors tests and comments them

a679330

samuelduchesne merged commit 218675a into samuelduchesne:develop Apr 22, 2020

louisleroy5 deleted the feature/TestTrnsys branch April 22, 2020 17:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactors trnsys tests #79

Refactors trnsys tests #79

louisleroy5 commented Apr 16, 2020

samuelduchesne commented Apr 17, 2020

samuelduchesne Apr 18, 2020

louisleroy5 Apr 18, 2020

samuelduchesne Apr 18, 2020

louisleroy5 Apr 18, 2020

samuelduchesne commented Apr 18, 2020 via email

louisleroy5 commented Apr 18, 2020 via email

samuelduchesne commented Apr 18, 2020 via email

samuelduchesne left a comment

louisleroy5 commented Apr 18, 2020 via email

samuelduchesne Apr 18, 2020

samuelduchesne Apr 18, 2020

samuelduchesne Apr 18, 2020

samuelduchesne left a comment


		idf = add_object_and_run_ep(ep_version, idf_file, weather_file, outputs)

		assert type(idf) == ar.idfclass.IDF

		@@ -425,6 +414,23 @@ def convert_idf_to_trnbuild(
		return return_path


		def add_object_and_run_ep(ep_version, idf_file, weather_file, outputs):

Refactors trnsys tests #79

Refactors trnsys tests #79

Conversation

louisleroy5 commented Apr 16, 2020

samuelduchesne commented Apr 17, 2020

samuelduchesne Apr 18, 2020

Choose a reason for hiding this comment

louisleroy5 Apr 18, 2020

Choose a reason for hiding this comment

samuelduchesne Apr 18, 2020

Choose a reason for hiding this comment

louisleroy5 Apr 18, 2020

Choose a reason for hiding this comment

samuelduchesne commented Apr 18, 2020 via email

louisleroy5 commented Apr 18, 2020 via email

samuelduchesne commented Apr 18, 2020 via email

samuelduchesne left a comment

Choose a reason for hiding this comment

louisleroy5 commented Apr 18, 2020 via email

samuelduchesne Apr 18, 2020

Choose a reason for hiding this comment

samuelduchesne Apr 18, 2020

Choose a reason for hiding this comment

samuelduchesne Apr 18, 2020

Choose a reason for hiding this comment

samuelduchesne left a comment

Choose a reason for hiding this comment