Cleaner DIR structure

TechSpecs/10 Ideas/randomValues.md

@@ -24,27 +24,33 @@ Parameters for the class should be none in init, and the following in Method ``r
 * Min (default: 3)
 * Max (default: 10)
 
-### Acitvity "Random"
+### Activity "Random"
 
 Parameters of the activity ``Random`` are defined in field ``value`` with JSON-Format (e.g. ``{Type:String,Min:5,Max:40}``) 
 and must be mapped to the method parameters (Type->RandomizationType, Min->Min, Max->Max).
 
-In this case the return value must be stored to testDataDict into the variable defined in column ``value2`` 
+In this case the return value must be stored to testDataDict into the variable defined in column ``value2``
 
 ### Variable replacement
 
 When ``$(RANDOM)`` is used in e.g. Activitiy ``SETTEXT`` in the column "Value", then we should execute method
-``retrieveRandomValue``. The logic must also be implemented in ``TestStepMaster`` in method ```replaceVariables``` 
+``retrieveRandomValue``. The logic must also be implemented in ``TestStepMaster`` in method ```replaceVariables```. 
+
+Also in variable replacement additional parameters can be mentioned, e.g. ``$(RANDOM{Min:10,Max:60})`` 
 
 ### Randomization
-Implement one String and one Integer generation of random values and return according to length definition in Min/Max.
+Implement one String and one Integer generation of random values and return according to length definition in min/max.
 
 ### Storing 
+In Activity "Random" we need to store the resulting value in the field given in ```value2``` from the TestStep.
+
+## Example File
+An example File with explanations can be found in folder ``Examples``, filename ``Random.xlsx``
 
 ## Scope / DOD
 * Implementation provided (in line with coding standards and PEP-8 conformity)
-* Functional test executed and passed (in this case it means to also create a new simpleXLS-Format where both ways (Activity = Random or variable replacement) can bet tested)
+* Functional test executed and passed (theoretically if values from ``Random.xlsx`` work, this should be enough)
 * Enhance existing documentation in docs-Folder in RST-Format
     * in this case in simpleExample.rst and SimpleAPI.rst
 * Unit-Tests in tests-folder providing reasonable coverage of the provided functionality
-* git Commit to feature branch and PullRequest on Gogs created
+* git commit to feature branch and pull request on Gogs created

TechSpecs/10 Ideas/addressCreation.md

@@ -29,11 +29,11 @@ less time for important improvements.).
 There needs to be a new activity "ADDRESS_CREATE" in SimpleFormat (``TestStepMaster.py``). Field ``value`` = optional list of 
 attributes (see below), ``value2`` = prefix for fieldnames (optional).
 
-When this activity is called, we shall call a singleton class "AddressGenerate" using the (optional) parameters from the
-Value-Field. This class is **not** in scope of the current specification. The method "returnAddress" provides a dict of 
+When this activity is called, we shall call a singleton class ``AddressCreate`` using the (optional) parameters from the
+Value-Field. This class is **not** in scope of the current specification. The method ``returnAddress`` provides a dict of 
 fields and values, which shall be stored in TestDataDict (with (optional) prefix taken from value2).
 
-After the fields were filled, they'll be used by the testcase to fill values for the UI or API.
+After the fields were filled, they'll be used by the test case to fill values for the UI or API.
 
 ### Fields
 The following fields are part of the return value of method ``returnAddress``:
@@ -49,7 +49,7 @@ The following fields are part of the return value of method ``returnAddress``:
 Values must be mapped into a ``Dict``.
 
 If a prefix was povided in field ``Value2``, the fieldnames shall be concatenated with this prefix, e.g. if 
-prefix = ``PremiumPayer_``, then the resulting fieldname for ``CountryCode`` in testDataDict would become 
+prefix = ``PremiumPayer_``, then the resulting field for ``CountryCode`` in testDataDict would become 
 ``PremiumPayer_CountryCode``.
 
 ## Scope / DOD
@@ -59,4 +59,4 @@ address data can be entered)
 * Enhance existing documentation in docs-Folder in RST-Format
     * in this case in simpleExample.rst and SimpleAPI.rst
 * Unit-Tests in tests-folder providing reasonable coverage of the provided functionality
-* git Commit to feature branch and PullRequest on Gogs created
+* git commit to feature branch and pull request on Gogs created

baangt/ui/ui.py

@@ -185,7 +185,7 @@ class UI:
             return
         runCmd = self._getRunCommand()
         if self.configContents.get("TX.DEBUG"):
-            from baangt.base.TestRun import TestRun
+            from baangt.base.TestRun.TestRun import TestRun
 
             lTestRun = TestRun(f"{Path(self.directory).joinpath(self.testRunFile)}",
                                globalSettingsFileNameAndPath=f'{Path(self.directory).joinpath(self.tempConfigFile)}')