split up to test and library

dialoget · Dec 10, 2023 · ea2f2af · ea2f2af
1 parent 5176a7a
commit ea2f2af
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 306 deletions.
diff --git a/README.md b/README.md
@@ -6,6 +6,7 @@ python.dialoget.com is a test framework for multilanguage source code, based on
 pip install --upgrade pip
 pip install requests
 pip install behave
+pip install setuptools
 chmod +x test.sh
 ```
 
@@ -18,7 +19,7 @@ with one bash script
 or each script in command line
 
 ```bash
-cd test
+cd test/dialoget 
 python3 update_repo_on_github.py
 python3 update_repo_on_github2.py
 python3 create_repo_on_org_github.py

diff --git a/data/env.py b/data/env.py
diff --git a/data/map.py b/data/map.py
diff --git a/data/prompt.py b/data/prompt.py
diff --git a/data/user.py b/data/user.py
diff --git a/setup.py b/setup.py
diff --git a/src/create_repo_on_org_github.py b/src/create_repo_on_org_github.py
diff --git a/lib/dialoget.py → src/dialoget.py b/lib/dialoget.py → src/dialoget.py
@@ -1,23 +1,21 @@
-import sys
-sys.path.append('../')
 import os
-#from functools import wraps
 import functools
 import csv
 from datetime import datetime
 
-
 # root path to the project
-#ROOT_PATH = os.path.abspath(os.path.dirname(__file__))
-ROOT_PATH=''
-LOG_FILE='log.csv'
-ERROR_FILE='error.csv'
+# ROOT_PATH = os.path.abspath(os.path.dirname(__file__))
+ROOT_PATH = ''
+LOG_FILE = 'log.csv'
+ERROR_FILE = 'error.csv'
 LOG_PATH = os.path.join(ROOT_PATH, LOG_FILE)
 ERROR_PATH = os.path.join(ROOT_PATH, ERROR_FILE)
 
+
 def dialoget(template, logs_path=''):
-    USER_ERROR = os.path.abspath( os.path.join(logs_path,ERROR_PATH) )
-    USER_LOGS = os.path.abspath( os.path.join(logs_path,LOG_PATH) )
+    USER_ERROR = os.path.abspath(os.path.join(logs_path, ERROR_PATH))
+    USER_LOGS = os.path.abspath(os.path.join(logs_path, LOG_PATH))
+
     def decorator(func):
         @functools.wraps(func)
         def wrapper(*args, **kwargs):
@@ -50,8 +48,10 @@ def wrapper(*args, **kwargs):
             return func(*args, **kwargs)
 
         return wrapper
+
     return decorator
 
+
 def log_to_csv(file_name, log_dict):
     # Write log message or error to a CSV file
     with open(file_name, mode='a', newline='') as file:
@@ -60,62 +60,3 @@ def log_to_csv(file_name, log_dict):
             writer.writeheader()
         writer.writerow(log_dict)
 
-
-"""
-def dialoget(template):
-    def decorator(func):
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            # Assuming the function returns a dictionary of replacements
-            replacements = func(*args, **kwargs)
-
-            # Replace placeholders in the template with actual values
-            filled_template = template.format(**replacements)
-
-            # Print or use the filled template string
-            print(filled_template)  # or you can return it, if needed
-
-            # Return the result of the function, if it's necessary.
-            return replacements
-
-        return wrapper
-
-    return decorator
-
-
-
-# This is the decorator factory that accepts arguments
-def dialoget2(sentence="Sentence"):
-    # This is the actual decorator
-    def decorator(func):
-        call_count = 0
-
-        @functools.wraps(func)
-        def wrapper(*args, **kwargs):
-            nonlocal call_count
-            call_count += 1
-            print(f"The sentence: {sentence} {func.__name__} has been called {call_count} times")
-            return func(*args, **kwargs)
-
-        return wrapper
-    return decorator
-
-
-
-
-# Usage example with decorator arguments
-
-def nfunc(func):
-    # This will hold the number of times the function has been called
-    call_count = 0
-
-    @wraps(func)  # Use this to preserve the original function's metadata
-    def wrapper(*args, **kwargs):
-        nonlocal call_count
-        call_count += 1
-        print(f"Function {func.__name__} has been called {call_count} times")
-        return func(*args, **kwargs)
-
-    return wrapper
-
-"""
diff --git a/src/update_repo_on_github.py b/src/update_repo_on_github.py
diff --git a/src/update_repo_on_github2.py b/src/update_repo_on_github2.py
diff --git a/test.bat b/test.bat
diff --git a/test.sh b/test.sh
diff --git a/test/apitee/update_repo_on_github.py b/test/apitee/update_repo_on_github.py
diff --git a/test/apitee/update_repo_on_github2.py b/test/apitee/update_repo_on_github2.py
diff --git a/test/behave/update_repo_on_github2.py b/test/behave/update_repo_on_github2.py
@@ -22,18 +22,3 @@ def step_impl(context):
 @then('they see a welcome message')
 def step_impl(context):
     assert context.browser.shows_welcome_message()
-
-#print(FromEnv)
-#api_token="API token"
-#repo_name="Repository"
-#org_name="GitHub Organization"
-f'Connect to the github API {GITHUB_API_URL} with {api_token}'
-f'Update a {repo_name} on {org_name}'
-f'with a {description}'
-f'on the {domain}'
-result = update_repo_on_github2(api_token, org_name, repo_name, description, domain, GITHUB_API_URL)
-#print(result)
-print(result == 200)
-
-
-# f'Connect to {Github,github_url,GITHUB_API_URL} by {"API token",api_token,GITHUB_API_TOKEN}'
diff --git a/test/dialoget.py b/test/dialoget.py