Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,20 @@ This project adheres to [Semantic Versioning](http://semver.org/) and http://kee
### Added
- CHANGELOG.md from @dash0002

## [1.0.0]
### Changed
- Moved license content from python file to LICENSE
- Updated README to reflect current state of project
- Upgraded to support Python 3.4.3

### Changed v1.0.1
## [1.0.1]
### Changed
- Imported select functions only rather than the entire module.
- remove unused variables.
- Remove string slice and use a datetime function instead.
- Now compatible with python 3.5.2
- Added Contributor Dark-Passenger to Readme

## [1.0.2]
### Added

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the version? I also think it's tracked in code. Safe to assume it can be increased according to semantic versioning since you're the only current contributor.

- Added support for skip tests.
35 changes: 29 additions & 6 deletions HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = "1.0.1"
__version__ = "1.0.2"

from datetime import datetime
from io import StringIO
Expand DownExpand Up@@ -92,6 +92,7 @@ class Template_mixin(object):
0: 'pass',
1: 'fail',
2: 'error',
3: 'skip',
}

DEFAULT_TITLE = 'Unit Test Report'
Expand DownExpand Up@@ -293,8 +294,10 @@ class Template_mixin(object):
.passClass { background-color: #6c6; }
.failClass { background-color: #c60; }
.errorClass { background-color: #c00; }
.skipClass { background-color: #ff0; }
.passCase { color: #6c6; }
.failCase { color: #c60; font-weight: bold; }
.skipCase { color: #ff0; font-weight: bold; }
.errorCase { color: #c00; font-weight: bold; }
.hiddenRow { display: none; }
.testcase { margin-left: 2em; }
Expand DownExpand Up@@ -349,6 +352,7 @@ class Template_mixin(object):
<td>Test Group/Test case</td>
<td>Count</td>
<td>Pass</td>
<td>Skip</td>
<td>Fail</td>
<td>Error</td>
<td>View</td>
Expand All@@ -358,6 +362,7 @@ class Template_mixin(object):
<td>Total</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td>&nbsp;</td>
Expand All@@ -370,6 +375,7 @@ class Template_mixin(object):
<td>%(desc)s</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td><a href="javascript:showClassDetail('%(cid)s',%(count)s)">Detail</a></td>
Expand DownExpand Up@@ -435,6 +441,7 @@ def __init__(self, verbosity=1):
self.stdout0 = None
self.stderr0 = None
self.success_count = 0
self.skip_count = 0
self.failure_count = 0
self.error_count = 0
self.verbosity = verbosity
Expand DownExpand Up@@ -518,6 +525,19 @@ def addFailure(self, test, err):
else:
sys.stderr.write('F')

def addSkip(self, test, err):
self.skip_count += 1
TestResult.addSkip(self, test, err)
_exc_str = self.skipped[-1][1]
output = self.complete_output()
self.result.append((3, test, output, _exc_str))
if self.verbosity > 1:
sys.stderr.write('S ')
sys.stderr.write(str(test))
sys.stderr.write('\n')
else:
sys.stderr.write('S')


class HTMLTestRunner(Template_mixin):
"""
Expand DownExpand Up@@ -571,6 +591,7 @@ def getReportAttributes(self, result):
duration = str(self.stopTime - self.startTime)
status = []
if result.success_count: status.append('Pass %s' % result.success_count)
if result.skip_count: status.append('Skip %s' % result.skip_count )
if result.failure_count: status.append('Failure %s' % result.failure_count)
if result.error_count: status.append('Error %s' % result.error_count )
if status:
Expand DownExpand Up@@ -627,11 +648,12 @@ def _generate_report(self, result):
sortedResult = self.sortResult(result.result)
for cid, (cls, cls_results) in enumerate(sortedResult):
# subtotal for a class
np = nf = ne = 0
np = ns = nf = ne = 0
for n,t,o,e in cls_results:
if n == 0: np += 1
elif n == 1: nf += 1
else: ne += 1
elif n == 2: ne += 1
elif n == 3: ns += 1

# format class description
if cls.__module__ == "__main__":
Expand All@@ -642,9 +664,9 @@ def _generate_report(self, result):
desc = doc and '%s: %s' % (name, doc) or name

row = self.REPORT_CLASS_TMPL % dict(
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or 'passClass',
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or ns > 0 and 'skipClass' or 'passClass',
desc = desc,
count = np+nf+ne,
count = np+ns+nf+ne,
Pass = np,
fail = nf,
error = ne,
Expand All@@ -657,8 +679,9 @@ def _generate_report(self, result):

report = self.REPORT_TMPL % dict(
test_list = ''.join(rows),
count = str(result.success_count+result.failure_count+result.error_count),
count = str(result.success_count+result.failure_count+result.error_count+result.skip_count),
Pass = str(result.success_count),
skip = str(result.skip_count),
fail = str(result.failure_count),
error = str(result.error_count),
)
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ by dash0002. In it's current iteration and maintenance, our goals are still the
to be able to quickly generate an HTML test report.

## Installation
Supporting Python 3.4.3
Supporting Python 3 - 3.5

### PIP (recommended)

Expand All@@ -57,9 +57,10 @@ as-is.

## Contributors

Way Yip Tung - https://github.com/tungwaiyip
Asish Dash - https://github.com/dash0002
Dhruv Paranjape - https://github.com/dark-passenger
- Way Yip Tung - https://github.com/tungwaiyip
- Asish Dash - https://github.com/dash0002
- Dhruv Paranjape - https://github.com/dark-passenger
- Ethan Estrada - https://github.com/eestrada

Contributions are gladly accepted as this is a side project at best. Please, also
consider this when looking at feedback cycles, issues, pull requests, etc.
Expand Down
25 changes: 14 additions & 11 deletions test_HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
# -*- coding: utf-8 -*-

import io as StringIO
import sys
import unittest
import HTMLTestRunner
from io import StringIO
from unittest import TestSuite, TestLoader, skip, TextTestRunner, TestCase
from HTMLTestRunner import HTMLTestRunner

import tests
from tests.SampleTestPass import SampleTestPass
from tests.SampleTestFail import SampleTestFail
from tests.SampleTestBasic import SampleTestBasic

class TestHTMLTestRunner(unittest.TestCase):
class TestHTMLTestRunner(TestCase):

def setUp(self):

self.suite = unittest.TestSuite()
self.loader = unittest.TestLoader()
self.suite = TestSuite()
self.loader = TestLoader()

self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestPass))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestFail))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestBasic))

self.results_output_buffer = StringIO.StringIO()
HTMLTestRunner.HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.results_output_buffer = StringIO()
HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.byte_output = self.results_output_buffer.getvalue()

def test_SampleTestPass(self):
output1="".join(self.byte_output.split())
output2="".join(SampleTestPass.EXPECTED_RESULT.split())
self.assertGreater(output1.find(output2),0)

@skip("Test Skipping")
def test_SampleTestSkip(self):
self.fail("This error should never be displayed")

def test_SampleTestFail(self):
output1="".join(self.byte_output.split())
Expand All@@ -42,8 +45,8 @@ def test_SampleTestBasic(self):


def main():
suite = unittest.TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
unittest.TextTestRunner().run(suite)
suite = TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
TextTestRunner().run(suite)

if __name__ == "__main__":
main()
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,20 @@ This project adheres to [Semantic Versioning](http://semver.org/) and http://kee
### Added
- CHANGELOG.md from @dash0002

## [1.0.0]
### Changed
- Moved license content from python file to LICENSE
- Updated README to reflect current state of project
- Upgraded to support Python 3.4.3

### Changed v1.0.1
## [1.0.1]
### Changed
- Imported select functions only rather than the entire module.
- remove unused variables.
- Remove string slice and use a datetime function instead.
- Now compatible with python 3.5.2
- Added Contributor Dark-Passenger to Readme

## [1.0.2]
### Added

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the version? I also think it's tracked in code. Safe to assume it can be increased according to semantic versioning since you're the only current contributor.

- Added support for skip tests.
35 changes: 29 additions & 6 deletions HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = "1.0.1"
__version__ = "1.0.2"

from datetime import datetime
from io import StringIO
Expand DownExpand Up@@ -92,6 +92,7 @@ class Template_mixin(object):
0: 'pass',
1: 'fail',
2: 'error',
3: 'skip',
}

DEFAULT_TITLE = 'Unit Test Report'
Expand DownExpand Up@@ -293,8 +294,10 @@ class Template_mixin(object):
.passClass { background-color: #6c6; }
.failClass { background-color: #c60; }
.errorClass { background-color: #c00; }
.skipClass { background-color: #ff0; }
.passCase { color: #6c6; }
.failCase { color: #c60; font-weight: bold; }
.skipCase { color: #ff0; font-weight: bold; }
.errorCase { color: #c00; font-weight: bold; }
.hiddenRow { display: none; }
.testcase { margin-left: 2em; }
Expand DownExpand Up@@ -349,6 +352,7 @@ class Template_mixin(object):
<td>Test Group/Test case</td>
<td>Count</td>
<td>Pass</td>
<td>Skip</td>
<td>Fail</td>
<td>Error</td>
<td>View</td>
Expand All@@ -358,6 +362,7 @@ class Template_mixin(object):
<td>Total</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td>&nbsp;</td>
Expand All@@ -370,6 +375,7 @@ class Template_mixin(object):
<td>%(desc)s</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td><a href="javascript:showClassDetail('%(cid)s',%(count)s)">Detail</a></td>
Expand DownExpand Up@@ -435,6 +441,7 @@ def __init__(self, verbosity=1):
self.stdout0 = None
self.stderr0 = None
self.success_count = 0
self.skip_count = 0
self.failure_count = 0
self.error_count = 0
self.verbosity = verbosity
Expand DownExpand Up@@ -518,6 +525,19 @@ def addFailure(self, test, err):
else:
sys.stderr.write('F')

def addSkip(self, test, err):
self.skip_count += 1
TestResult.addSkip(self, test, err)
_exc_str = self.skipped[-1][1]
output = self.complete_output()
self.result.append((3, test, output, _exc_str))
if self.verbosity > 1:
sys.stderr.write('S ')
sys.stderr.write(str(test))
sys.stderr.write('\n')
else:
sys.stderr.write('S')


class HTMLTestRunner(Template_mixin):
"""
Expand DownExpand Up@@ -571,6 +591,7 @@ def getReportAttributes(self, result):
duration = str(self.stopTime - self.startTime)
status = []
if result.success_count: status.append('Pass %s' % result.success_count)
if result.skip_count: status.append('Skip %s' % result.skip_count )
if result.failure_count: status.append('Failure %s' % result.failure_count)
if result.error_count: status.append('Error %s' % result.error_count )
if status:
Expand DownExpand Up@@ -627,11 +648,12 @@ def _generate_report(self, result):
sortedResult = self.sortResult(result.result)
for cid, (cls, cls_results) in enumerate(sortedResult):
# subtotal for a class
np = nf = ne = 0
np = ns = nf = ne = 0
for n,t,o,e in cls_results:
if n == 0: np += 1
elif n == 1: nf += 1
else: ne += 1
elif n == 2: ne += 1
elif n == 3: ns += 1

# format class description
if cls.__module__ == "__main__":
Expand All@@ -642,9 +664,9 @@ def _generate_report(self, result):
desc = doc and '%s: %s' % (name, doc) or name

row = self.REPORT_CLASS_TMPL % dict(
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or 'passClass',
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or ns > 0 and 'skipClass' or 'passClass',
desc = desc,
count = np+nf+ne,
count = np+ns+nf+ne,
Pass = np,
fail = nf,
error = ne,
Expand All@@ -657,8 +679,9 @@ def _generate_report(self, result):

report = self.REPORT_TMPL % dict(
test_list = ''.join(rows),
count = str(result.success_count+result.failure_count+result.error_count),
count = str(result.success_count+result.failure_count+result.error_count+result.skip_count),
Pass = str(result.success_count),
skip = str(result.skip_count),
fail = str(result.failure_count),
error = str(result.error_count),
)
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ by dash0002. In it's current iteration and maintenance, our goals are still the
to be able to quickly generate an HTML test report.

## Installation
Supporting Python 3.4.3
Supporting Python 3 - 3.5

### PIP (recommended)

Expand All@@ -57,9 +57,10 @@ as-is.

## Contributors

Way Yip Tung - https://github.com/tungwaiyip
Asish Dash - https://github.com/dash0002
Dhruv Paranjape - https://github.com/dark-passenger
- Way Yip Tung - https://github.com/tungwaiyip
- Asish Dash - https://github.com/dash0002
- Dhruv Paranjape - https://github.com/dark-passenger
- Ethan Estrada - https://github.com/eestrada

Contributions are gladly accepted as this is a side project at best. Please, also
consider this when looking at feedback cycles, issues, pull requests, etc.
Expand Down
25 changes: 14 additions & 11 deletions test_HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
# -*- coding: utf-8 -*-

import io as StringIO
import sys
import unittest
import HTMLTestRunner
from io import StringIO
from unittest import TestSuite, TestLoader, skip, TextTestRunner, TestCase
from HTMLTestRunner import HTMLTestRunner

import tests
from tests.SampleTestPass import SampleTestPass
from tests.SampleTestFail import SampleTestFail
from tests.SampleTestBasic import SampleTestBasic

class TestHTMLTestRunner(unittest.TestCase):
class TestHTMLTestRunner(TestCase):

def setUp(self):

self.suite = unittest.TestSuite()
self.loader = unittest.TestLoader()
self.suite = TestSuite()
self.loader = TestLoader()

self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestPass))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestFail))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestBasic))

self.results_output_buffer = StringIO.StringIO()
HTMLTestRunner.HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.results_output_buffer = StringIO()
HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.byte_output = self.results_output_buffer.getvalue()

def test_SampleTestPass(self):
output1="".join(self.byte_output.split())
output2="".join(SampleTestPass.EXPECTED_RESULT.split())
self.assertGreater(output1.find(output2),0)

@skip("Test Skipping")
def test_SampleTestSkip(self):
self.fail("This error should never be displayed")

def test_SampleTestFail(self):
output1="".join(self.byte_output.split())
Expand All@@ -42,8 +45,8 @@ def test_SampleTestBasic(self):


def main():
suite = unittest.TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
unittest.TextTestRunner().run(suite)
suite = TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
TextTestRunner().run(suite)

if __name__ == "__main__":
main()
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,20 @@ This project adheres to [Semantic Versioning](http://semver.org/) and http://kee
### Added
- CHANGELOG.md from @dash0002

## [1.0.0]
### Changed
- Moved license content from python file to LICENSE
- Updated README to reflect current state of project
- Upgraded to support Python 3.4.3

### Changed v1.0.1
## [1.0.1]
### Changed
- Imported select functions only rather than the entire module.
- remove unused variables.
- Remove string slice and use a datetime function instead.
- Now compatible with python 3.5.2
- Added Contributor Dark-Passenger to Readme

## [1.0.2]
### Added

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the version? I also think it's tracked in code. Safe to assume it can be increased according to semantic versioning since you're the only current contributor.

- Added support for skip tests.
35 changes: 29 additions & 6 deletions HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = "1.0.1"
__version__ = "1.0.2"

from datetime import datetime
from io import StringIO
Expand DownExpand Up@@ -92,6 +92,7 @@ class Template_mixin(object):
0: 'pass',
1: 'fail',
2: 'error',
3: 'skip',
}

DEFAULT_TITLE = 'Unit Test Report'
Expand DownExpand Up@@ -293,8 +294,10 @@ class Template_mixin(object):
.passClass { background-color: #6c6; }
.failClass { background-color: #c60; }
.errorClass { background-color: #c00; }
.skipClass { background-color: #ff0; }
.passCase { color: #6c6; }
.failCase { color: #c60; font-weight: bold; }
.skipCase { color: #ff0; font-weight: bold; }
.errorCase { color: #c00; font-weight: bold; }
.hiddenRow { display: none; }
.testcase { margin-left: 2em; }
Expand DownExpand Up@@ -349,6 +352,7 @@ class Template_mixin(object):
<td>Test Group/Test case</td>
<td>Count</td>
<td>Pass</td>
<td>Skip</td>
<td>Fail</td>
<td>Error</td>
<td>View</td>
Expand All@@ -358,6 +362,7 @@ class Template_mixin(object):
<td>Total</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td>&nbsp;</td>
Expand All@@ -370,6 +375,7 @@ class Template_mixin(object):
<td>%(desc)s</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td><a href="javascript:showClassDetail('%(cid)s',%(count)s)">Detail</a></td>
Expand DownExpand Up@@ -435,6 +441,7 @@ def __init__(self, verbosity=1):
self.stdout0 = None
self.stderr0 = None
self.success_count = 0
self.skip_count = 0
self.failure_count = 0
self.error_count = 0
self.verbosity = verbosity
Expand DownExpand Up@@ -518,6 +525,19 @@ def addFailure(self, test, err):
else:
sys.stderr.write('F')

def addSkip(self, test, err):
self.skip_count += 1
TestResult.addSkip(self, test, err)
_exc_str = self.skipped[-1][1]
output = self.complete_output()
self.result.append((3, test, output, _exc_str))
if self.verbosity > 1:
sys.stderr.write('S ')
sys.stderr.write(str(test))
sys.stderr.write('\n')
else:
sys.stderr.write('S')


class HTMLTestRunner(Template_mixin):
"""
Expand DownExpand Up@@ -571,6 +591,7 @@ def getReportAttributes(self, result):
duration = str(self.stopTime - self.startTime)
status = []
if result.success_count: status.append('Pass %s' % result.success_count)
if result.skip_count: status.append('Skip %s' % result.skip_count )
if result.failure_count: status.append('Failure %s' % result.failure_count)
if result.error_count: status.append('Error %s' % result.error_count )
if status:
Expand DownExpand Up@@ -627,11 +648,12 @@ def _generate_report(self, result):
sortedResult = self.sortResult(result.result)
for cid, (cls, cls_results) in enumerate(sortedResult):
# subtotal for a class
np = nf = ne = 0
np = ns = nf = ne = 0
for n,t,o,e in cls_results:
if n == 0: np += 1
elif n == 1: nf += 1
else: ne += 1
elif n == 2: ne += 1
elif n == 3: ns += 1

# format class description
if cls.__module__ == "__main__":
Expand All@@ -642,9 +664,9 @@ def _generate_report(self, result):
desc = doc and '%s: %s' % (name, doc) or name

row = self.REPORT_CLASS_TMPL % dict(
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or 'passClass',
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or ns > 0 and 'skipClass' or 'passClass',
desc = desc,
count = np+nf+ne,
count = np+ns+nf+ne,
Pass = np,
fail = nf,
error = ne,
Expand All@@ -657,8 +679,9 @@ def _generate_report(self, result):

report = self.REPORT_TMPL % dict(
test_list = ''.join(rows),
count = str(result.success_count+result.failure_count+result.error_count),
count = str(result.success_count+result.failure_count+result.error_count+result.skip_count),
Pass = str(result.success_count),
skip = str(result.skip_count),
fail = str(result.failure_count),
error = str(result.error_count),
)
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ by dash0002. In it's current iteration and maintenance, our goals are still the
to be able to quickly generate an HTML test report.

## Installation
Supporting Python 3.4.3
Supporting Python 3 - 3.5

### PIP (recommended)

Expand All@@ -57,9 +57,10 @@ as-is.

## Contributors

Way Yip Tung - https://github.com/tungwaiyip
Asish Dash - https://github.com/dash0002
Dhruv Paranjape - https://github.com/dark-passenger
- Way Yip Tung - https://github.com/tungwaiyip
- Asish Dash - https://github.com/dash0002
- Dhruv Paranjape - https://github.com/dark-passenger
- Ethan Estrada - https://github.com/eestrada

Contributions are gladly accepted as this is a side project at best. Please, also
consider this when looking at feedback cycles, issues, pull requests, etc.
Expand Down
25 changes: 14 additions & 11 deletions test_HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
# -*- coding: utf-8 -*-

import io as StringIO
import sys
import unittest
import HTMLTestRunner
from io import StringIO
from unittest import TestSuite, TestLoader, skip, TextTestRunner, TestCase
from HTMLTestRunner import HTMLTestRunner

import tests
from tests.SampleTestPass import SampleTestPass
from tests.SampleTestFail import SampleTestFail
from tests.SampleTestBasic import SampleTestBasic

class TestHTMLTestRunner(unittest.TestCase):
class TestHTMLTestRunner(TestCase):

def setUp(self):

self.suite = unittest.TestSuite()
self.loader = unittest.TestLoader()
self.suite = TestSuite()
self.loader = TestLoader()

self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestPass))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestFail))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestBasic))

self.results_output_buffer = StringIO.StringIO()
HTMLTestRunner.HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.results_output_buffer = StringIO()
HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.byte_output = self.results_output_buffer.getvalue()

def test_SampleTestPass(self):
output1="".join(self.byte_output.split())
output2="".join(SampleTestPass.EXPECTED_RESULT.split())
self.assertGreater(output1.find(output2),0)

@skip("Test Skipping")
def test_SampleTestSkip(self):
self.fail("This error should never be displayed")

def test_SampleTestFail(self):
output1="".join(self.byte_output.split())
Expand All@@ -42,8 +45,8 @@ def test_SampleTestBasic(self):


def main():
suite = unittest.TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
unittest.TextTestRunner().run(suite)
suite = TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
TextTestRunner().run(suite)

if __name__ == "__main__":
main()
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,20 @@ This project adheres to [Semantic Versioning](http://semver.org/) and http://kee
### Added
- CHANGELOG.md from @dash0002

## [1.0.0]
### Changed
- Moved license content from python file to LICENSE
- Updated README to reflect current state of project
- Upgraded to support Python 3.4.3

### Changed v1.0.1
## [1.0.1]
### Changed
- Imported select functions only rather than the entire module.
- remove unused variables.
- Remove string slice and use a datetime function instead.
- Now compatible with python 3.5.2
- Added Contributor Dark-Passenger to Readme

## [1.0.2]
### Added

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the version? I also think it's tracked in code. Safe to assume it can be increased according to semantic versioning since you're the only current contributor.

- Added support for skip tests.
35 changes: 29 additions & 6 deletions HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = "1.0.1"
__version__ = "1.0.2"

from datetime import datetime
from io import StringIO
Expand DownExpand Up@@ -92,6 +92,7 @@ class Template_mixin(object):
0: 'pass',
1: 'fail',
2: 'error',
3: 'skip',
}

DEFAULT_TITLE = 'Unit Test Report'
Expand DownExpand Up@@ -293,8 +294,10 @@ class Template_mixin(object):
.passClass { background-color: #6c6; }
.failClass { background-color: #c60; }
.errorClass { background-color: #c00; }
.skipClass { background-color: #ff0; }
.passCase { color: #6c6; }
.failCase { color: #c60; font-weight: bold; }
.skipCase { color: #ff0; font-weight: bold; }
.errorCase { color: #c00; font-weight: bold; }
.hiddenRow { display: none; }
.testcase { margin-left: 2em; }
Expand DownExpand Up@@ -349,6 +352,7 @@ class Template_mixin(object):
<td>Test Group/Test case</td>
<td>Count</td>
<td>Pass</td>
<td>Skip</td>
<td>Fail</td>
<td>Error</td>
<td>View</td>
Expand All@@ -358,6 +362,7 @@ class Template_mixin(object):
<td>Total</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td>&nbsp;</td>
Expand All@@ -370,6 +375,7 @@ class Template_mixin(object):
<td>%(desc)s</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td><a href="javascript:showClassDetail('%(cid)s',%(count)s)">Detail</a></td>
Expand DownExpand Up@@ -435,6 +441,7 @@ def __init__(self, verbosity=1):
self.stdout0 = None
self.stderr0 = None
self.success_count = 0
self.skip_count = 0
self.failure_count = 0
self.error_count = 0
self.verbosity = verbosity
Expand DownExpand Up@@ -518,6 +525,19 @@ def addFailure(self, test, err):
else:
sys.stderr.write('F')

def addSkip(self, test, err):
self.skip_count += 1
TestResult.addSkip(self, test, err)
_exc_str = self.skipped[-1][1]
output = self.complete_output()
self.result.append((3, test, output, _exc_str))
if self.verbosity > 1:
sys.stderr.write('S ')
sys.stderr.write(str(test))
sys.stderr.write('\n')
else:
sys.stderr.write('S')


class HTMLTestRunner(Template_mixin):
"""
Expand DownExpand Up@@ -571,6 +591,7 @@ def getReportAttributes(self, result):
duration = str(self.stopTime - self.startTime)
status = []
if result.success_count: status.append('Pass %s' % result.success_count)
if result.skip_count: status.append('Skip %s' % result.skip_count )
if result.failure_count: status.append('Failure %s' % result.failure_count)
if result.error_count: status.append('Error %s' % result.error_count )
if status:
Expand DownExpand Up@@ -627,11 +648,12 @@ def _generate_report(self, result):
sortedResult = self.sortResult(result.result)
for cid, (cls, cls_results) in enumerate(sortedResult):
# subtotal for a class
np = nf = ne = 0
np = ns = nf = ne = 0
for n,t,o,e in cls_results:
if n == 0: np += 1
elif n == 1: nf += 1
else: ne += 1
elif n == 2: ne += 1
elif n == 3: ns += 1

# format class description
if cls.__module__ == "__main__":
Expand All@@ -642,9 +664,9 @@ def _generate_report(self, result):
desc = doc and '%s: %s' % (name, doc) or name

row = self.REPORT_CLASS_TMPL % dict(
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or 'passClass',
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or ns > 0 and 'skipClass' or 'passClass',
desc = desc,
count = np+nf+ne,
count = np+ns+nf+ne,
Pass = np,
fail = nf,
error = ne,
Expand All@@ -657,8 +679,9 @@ def _generate_report(self, result):

report = self.REPORT_TMPL % dict(
test_list = ''.join(rows),
count = str(result.success_count+result.failure_count+result.error_count),
count = str(result.success_count+result.failure_count+result.error_count+result.skip_count),
Pass = str(result.success_count),
skip = str(result.skip_count),
fail = str(result.failure_count),
error = str(result.error_count),
)
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ by dash0002. In it's current iteration and maintenance, our goals are still the
to be able to quickly generate an HTML test report.

## Installation
Supporting Python 3.4.3
Supporting Python 3 - 3.5

### PIP (recommended)

Expand All@@ -57,9 +57,10 @@ as-is.

## Contributors

Way Yip Tung - https://github.com/tungwaiyip
Asish Dash - https://github.com/dash0002
Dhruv Paranjape - https://github.com/dark-passenger
- Way Yip Tung - https://github.com/tungwaiyip
- Asish Dash - https://github.com/dash0002
- Dhruv Paranjape - https://github.com/dark-passenger
- Ethan Estrada - https://github.com/eestrada

Contributions are gladly accepted as this is a side project at best. Please, also
consider this when looking at feedback cycles, issues, pull requests, etc.
Expand Down
25 changes: 14 additions & 11 deletions test_HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
# -*- coding: utf-8 -*-

import io as StringIO
import sys
import unittest
import HTMLTestRunner
from io import StringIO
from unittest import TestSuite, TestLoader, skip, TextTestRunner, TestCase
from HTMLTestRunner import HTMLTestRunner

import tests
from tests.SampleTestPass import SampleTestPass
from tests.SampleTestFail import SampleTestFail
from tests.SampleTestBasic import SampleTestBasic

class TestHTMLTestRunner(unittest.TestCase):
class TestHTMLTestRunner(TestCase):

def setUp(self):

self.suite = unittest.TestSuite()
self.loader = unittest.TestLoader()
self.suite = TestSuite()
self.loader = TestLoader()

self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestPass))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestFail))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestBasic))

self.results_output_buffer = StringIO.StringIO()
HTMLTestRunner.HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.results_output_buffer = StringIO()
HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.byte_output = self.results_output_buffer.getvalue()

def test_SampleTestPass(self):
output1="".join(self.byte_output.split())
output2="".join(SampleTestPass.EXPECTED_RESULT.split())
self.assertGreater(output1.find(output2),0)

@skip("Test Skipping")
def test_SampleTestSkip(self):
self.fail("This error should never be displayed")

def test_SampleTestFail(self):
output1="".join(self.byte_output.split())
Expand All@@ -42,8 +45,8 @@ def test_SampleTestBasic(self):


def main():
suite = unittest.TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
unittest.TextTestRunner().run(suite)
suite = TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
TextTestRunner().run(suite)

if __name__ == "__main__":
main()
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,20 @@ This project adheres to [Semantic Versioning](http://semver.org/) and http://kee
### Added
- CHANGELOG.md from @dash0002

## [1.0.0]
### Changed
- Moved license content from python file to LICENSE
- Updated README to reflect current state of project
- Upgraded to support Python 3.4.3

### Changed v1.0.1
## [1.0.1]
### Changed
- Imported select functions only rather than the entire module.
- remove unused variables.
- Remove string slice and use a datetime function instead.
- Now compatible with python 3.5.2
- Added Contributor Dark-Passenger to Readme

## [1.0.2]
### Added

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the version? I also think it's tracked in code. Safe to assume it can be increased according to semantic versioning since you're the only current contributor.

- Added support for skip tests.
35 changes: 29 additions & 6 deletions HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = "1.0.1"
__version__ = "1.0.2"

from datetime import datetime
from io import StringIO
Expand DownExpand Up@@ -92,6 +92,7 @@ class Template_mixin(object):
0: 'pass',
1: 'fail',
2: 'error',
3: 'skip',
}

DEFAULT_TITLE = 'Unit Test Report'
Expand DownExpand Up@@ -293,8 +294,10 @@ class Template_mixin(object):
.passClass { background-color: #6c6; }
.failClass { background-color: #c60; }
.errorClass { background-color: #c00; }
.skipClass { background-color: #ff0; }
.passCase { color: #6c6; }
.failCase { color: #c60; font-weight: bold; }
.skipCase { color: #ff0; font-weight: bold; }
.errorCase { color: #c00; font-weight: bold; }
.hiddenRow { display: none; }
.testcase { margin-left: 2em; }
Expand DownExpand Up@@ -349,6 +352,7 @@ class Template_mixin(object):
<td>Test Group/Test case</td>
<td>Count</td>
<td>Pass</td>
<td>Skip</td>
<td>Fail</td>
<td>Error</td>
<td>View</td>
Expand All@@ -358,6 +362,7 @@ class Template_mixin(object):
<td>Total</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td>&nbsp;</td>
Expand All@@ -370,6 +375,7 @@ class Template_mixin(object):
<td>%(desc)s</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td><a href="javascript:showClassDetail('%(cid)s',%(count)s)">Detail</a></td>
Expand DownExpand Up@@ -435,6 +441,7 @@ def __init__(self, verbosity=1):
self.stdout0 = None
self.stderr0 = None
self.success_count = 0
self.skip_count = 0
self.failure_count = 0
self.error_count = 0
self.verbosity = verbosity
Expand DownExpand Up@@ -518,6 +525,19 @@ def addFailure(self, test, err):
else:
sys.stderr.write('F')

def addSkip(self, test, err):
self.skip_count += 1
TestResult.addSkip(self, test, err)
_exc_str = self.skipped[-1][1]
output = self.complete_output()
self.result.append((3, test, output, _exc_str))
if self.verbosity > 1:
sys.stderr.write('S ')
sys.stderr.write(str(test))
sys.stderr.write('\n')
else:
sys.stderr.write('S')


class HTMLTestRunner(Template_mixin):
"""
Expand DownExpand Up@@ -571,6 +591,7 @@ def getReportAttributes(self, result):
duration = str(self.stopTime - self.startTime)
status = []
if result.success_count: status.append('Pass %s' % result.success_count)
if result.skip_count: status.append('Skip %s' % result.skip_count )
if result.failure_count: status.append('Failure %s' % result.failure_count)
if result.error_count: status.append('Error %s' % result.error_count )
if status:
Expand DownExpand Up@@ -627,11 +648,12 @@ def _generate_report(self, result):
sortedResult = self.sortResult(result.result)
for cid, (cls, cls_results) in enumerate(sortedResult):
# subtotal for a class
np = nf = ne = 0
np = ns = nf = ne = 0
for n,t,o,e in cls_results:
if n == 0: np += 1
elif n == 1: nf += 1
else: ne += 1
elif n == 2: ne += 1
elif n == 3: ns += 1

# format class description
if cls.__module__ == "__main__":
Expand All@@ -642,9 +664,9 @@ def _generate_report(self, result):
desc = doc and '%s: %s' % (name, doc) or name

row = self.REPORT_CLASS_TMPL % dict(
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or 'passClass',
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or ns > 0 and 'skipClass' or 'passClass',
desc = desc,
count = np+nf+ne,
count = np+ns+nf+ne,
Pass = np,
fail = nf,
error = ne,
Expand All@@ -657,8 +679,9 @@ def _generate_report(self, result):

report = self.REPORT_TMPL % dict(
test_list = ''.join(rows),
count = str(result.success_count+result.failure_count+result.error_count),
count = str(result.success_count+result.failure_count+result.error_count+result.skip_count),
Pass = str(result.success_count),
skip = str(result.skip_count),
fail = str(result.failure_count),
error = str(result.error_count),
)
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ by dash0002. In it's current iteration and maintenance, our goals are still the
to be able to quickly generate an HTML test report.

## Installation
Supporting Python 3.4.3
Supporting Python 3 - 3.5

### PIP (recommended)

Expand All@@ -57,9 +57,10 @@ as-is.

## Contributors

Way Yip Tung - https://github.com/tungwaiyip
Asish Dash - https://github.com/dash0002
Dhruv Paranjape - https://github.com/dark-passenger
- Way Yip Tung - https://github.com/tungwaiyip
- Asish Dash - https://github.com/dash0002
- Dhruv Paranjape - https://github.com/dark-passenger
- Ethan Estrada - https://github.com/eestrada

Contributions are gladly accepted as this is a side project at best. Please, also
consider this when looking at feedback cycles, issues, pull requests, etc.
Expand Down
25 changes: 14 additions & 11 deletions test_HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
# -*- coding: utf-8 -*-

import io as StringIO
import sys
import unittest
import HTMLTestRunner
from io import StringIO
from unittest import TestSuite, TestLoader, skip, TextTestRunner, TestCase
from HTMLTestRunner import HTMLTestRunner

import tests
from tests.SampleTestPass import SampleTestPass
from tests.SampleTestFail import SampleTestFail
from tests.SampleTestBasic import SampleTestBasic

class TestHTMLTestRunner(unittest.TestCase):
class TestHTMLTestRunner(TestCase):

def setUp(self):

self.suite = unittest.TestSuite()
self.loader = unittest.TestLoader()
self.suite = TestSuite()
self.loader = TestLoader()

self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestPass))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestFail))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestBasic))

self.results_output_buffer = StringIO.StringIO()
HTMLTestRunner.HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.results_output_buffer = StringIO()
HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.byte_output = self.results_output_buffer.getvalue()

def test_SampleTestPass(self):
output1="".join(self.byte_output.split())
output2="".join(SampleTestPass.EXPECTED_RESULT.split())
self.assertGreater(output1.find(output2),0)

@skip("Test Skipping")
def test_SampleTestSkip(self):
self.fail("This error should never be displayed")

def test_SampleTestFail(self):
output1="".join(self.byte_output.split())
Expand All@@ -42,8 +45,8 @@ def test_SampleTestBasic(self):


def main():
suite = unittest.TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
unittest.TextTestRunner().run(suite)
suite = TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
TextTestRunner().run(suite)

if __name__ == "__main__":
main()
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,20 @@ This project adheres to [Semantic Versioning](http://semver.org/) and http://kee
### Added
- CHANGELOG.md from @dash0002

## [1.0.0]
### Changed
- Moved license content from python file to LICENSE
- Updated README to reflect current state of project
- Upgraded to support Python 3.4.3

### Changed v1.0.1
## [1.0.1]
### Changed
- Imported select functions only rather than the entire module.
- remove unused variables.
- Remove string slice and use a datetime function instead.
- Now compatible with python 3.5.2
- Added Contributor Dark-Passenger to Readme

## [1.0.2]
### Added

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the version? I also think it's tracked in code. Safe to assume it can be increased according to semantic versioning since you're the only current contributor.

- Added support for skip tests.
35 changes: 29 additions & 6 deletions HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = "1.0.1"
__version__ = "1.0.2"

from datetime import datetime
from io import StringIO
Expand DownExpand Up@@ -92,6 +92,7 @@ class Template_mixin(object):
0: 'pass',
1: 'fail',
2: 'error',
3: 'skip',
}

DEFAULT_TITLE = 'Unit Test Report'
Expand DownExpand Up@@ -293,8 +294,10 @@ class Template_mixin(object):
.passClass { background-color: #6c6; }
.failClass { background-color: #c60; }
.errorClass { background-color: #c00; }
.skipClass { background-color: #ff0; }
.passCase { color: #6c6; }
.failCase { color: #c60; font-weight: bold; }
.skipCase { color: #ff0; font-weight: bold; }
.errorCase { color: #c00; font-weight: bold; }
.hiddenRow { display: none; }
.testcase { margin-left: 2em; }
Expand DownExpand Up@@ -349,6 +352,7 @@ class Template_mixin(object):
<td>Test Group/Test case</td>
<td>Count</td>
<td>Pass</td>
<td>Skip</td>
<td>Fail</td>
<td>Error</td>
<td>View</td>
Expand All@@ -358,6 +362,7 @@ class Template_mixin(object):
<td>Total</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td>&nbsp;</td>
Expand All@@ -370,6 +375,7 @@ class Template_mixin(object):
<td>%(desc)s</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td><a href="javascript:showClassDetail('%(cid)s',%(count)s)">Detail</a></td>
Expand DownExpand Up@@ -435,6 +441,7 @@ def __init__(self, verbosity=1):
self.stdout0 = None
self.stderr0 = None
self.success_count = 0
self.skip_count = 0
self.failure_count = 0
self.error_count = 0
self.verbosity = verbosity
Expand DownExpand Up@@ -518,6 +525,19 @@ def addFailure(self, test, err):
else:
sys.stderr.write('F')

def addSkip(self, test, err):
self.skip_count += 1
TestResult.addSkip(self, test, err)
_exc_str = self.skipped[-1][1]
output = self.complete_output()
self.result.append((3, test, output, _exc_str))
if self.verbosity > 1:
sys.stderr.write('S ')
sys.stderr.write(str(test))
sys.stderr.write('\n')
else:
sys.stderr.write('S')


class HTMLTestRunner(Template_mixin):
"""
Expand DownExpand Up@@ -571,6 +591,7 @@ def getReportAttributes(self, result):
duration = str(self.stopTime - self.startTime)
status = []
if result.success_count: status.append('Pass %s' % result.success_count)
if result.skip_count: status.append('Skip %s' % result.skip_count )
if result.failure_count: status.append('Failure %s' % result.failure_count)
if result.error_count: status.append('Error %s' % result.error_count )
if status:
Expand DownExpand Up@@ -627,11 +648,12 @@ def _generate_report(self, result):
sortedResult = self.sortResult(result.result)
for cid, (cls, cls_results) in enumerate(sortedResult):
# subtotal for a class
np = nf = ne = 0
np = ns = nf = ne = 0
for n,t,o,e in cls_results:
if n == 0: np += 1
elif n == 1: nf += 1
else: ne += 1
elif n == 2: ne += 1
elif n == 3: ns += 1

# format class description
if cls.__module__ == "__main__":
Expand All@@ -642,9 +664,9 @@ def _generate_report(self, result):
desc = doc and '%s: %s' % (name, doc) or name

row = self.REPORT_CLASS_TMPL % dict(
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or 'passClass',
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or ns > 0 and 'skipClass' or 'passClass',
desc = desc,
count = np+nf+ne,
count = np+ns+nf+ne,
Pass = np,
fail = nf,
error = ne,
Expand All@@ -657,8 +679,9 @@ def _generate_report(self, result):

report = self.REPORT_TMPL % dict(
test_list = ''.join(rows),
count = str(result.success_count+result.failure_count+result.error_count),
count = str(result.success_count+result.failure_count+result.error_count+result.skip_count),
Pass = str(result.success_count),
skip = str(result.skip_count),
fail = str(result.failure_count),
error = str(result.error_count),
)
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ by dash0002. In it's current iteration and maintenance, our goals are still the
to be able to quickly generate an HTML test report.

## Installation
Supporting Python 3.4.3
Supporting Python 3 - 3.5

### PIP (recommended)

Expand All@@ -57,9 +57,10 @@ as-is.

## Contributors

Way Yip Tung - https://github.com/tungwaiyip
Asish Dash - https://github.com/dash0002
Dhruv Paranjape - https://github.com/dark-passenger
- Way Yip Tung - https://github.com/tungwaiyip
- Asish Dash - https://github.com/dash0002
- Dhruv Paranjape - https://github.com/dark-passenger
- Ethan Estrada - https://github.com/eestrada

Contributions are gladly accepted as this is a side project at best. Please, also
consider this when looking at feedback cycles, issues, pull requests, etc.
Expand Down
25 changes: 14 additions & 11 deletions test_HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
# -*- coding: utf-8 -*-

import io as StringIO
import sys
import unittest
import HTMLTestRunner
from io import StringIO
from unittest import TestSuite, TestLoader, skip, TextTestRunner, TestCase
from HTMLTestRunner import HTMLTestRunner

import tests
from tests.SampleTestPass import SampleTestPass
from tests.SampleTestFail import SampleTestFail
from tests.SampleTestBasic import SampleTestBasic

class TestHTMLTestRunner(unittest.TestCase):
class TestHTMLTestRunner(TestCase):

def setUp(self):

self.suite = unittest.TestSuite()
self.loader = unittest.TestLoader()
self.suite = TestSuite()
self.loader = TestLoader()

self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestPass))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestFail))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestBasic))

self.results_output_buffer = StringIO.StringIO()
HTMLTestRunner.HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.results_output_buffer = StringIO()
HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.byte_output = self.results_output_buffer.getvalue()

def test_SampleTestPass(self):
output1="".join(self.byte_output.split())
output2="".join(SampleTestPass.EXPECTED_RESULT.split())
self.assertGreater(output1.find(output2),0)

@skip("Test Skipping")
def test_SampleTestSkip(self):
self.fail("This error should never be displayed")

def test_SampleTestFail(self):
output1="".join(self.byte_output.split())
Expand All@@ -42,8 +45,8 @@ def test_SampleTestBasic(self):


def main():
suite = unittest.TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
unittest.TextTestRunner().run(suite)
suite = TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
TextTestRunner().run(suite)

if __name__ == "__main__":
main()
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,20 @@ This project adheres to [Semantic Versioning](http://semver.org/) and http://kee
### Added
- CHANGELOG.md from @dash0002

## [1.0.0]
### Changed
- Moved license content from python file to LICENSE
- Updated README to reflect current state of project
- Upgraded to support Python 3.4.3

### Changed v1.0.1
## [1.0.1]
### Changed
- Imported select functions only rather than the entire module.
- remove unused variables.
- Remove string slice and use a datetime function instead.
- Now compatible with python 3.5.2
- Added Contributor Dark-Passenger to Readme

## [1.0.2]
### Added

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the version? I also think it's tracked in code. Safe to assume it can be increased according to semantic versioning since you're the only current contributor.

- Added support for skip tests.
35 changes: 29 additions & 6 deletions HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = "1.0.1"
__version__ = "1.0.2"

from datetime import datetime
from io import StringIO
Expand DownExpand Up@@ -92,6 +92,7 @@ class Template_mixin(object):
0: 'pass',
1: 'fail',
2: 'error',
3: 'skip',
}

DEFAULT_TITLE = 'Unit Test Report'
Expand DownExpand Up@@ -293,8 +294,10 @@ class Template_mixin(object):
.passClass { background-color: #6c6; }
.failClass { background-color: #c60; }
.errorClass { background-color: #c00; }
.skipClass { background-color: #ff0; }
.passCase { color: #6c6; }
.failCase { color: #c60; font-weight: bold; }
.skipCase { color: #ff0; font-weight: bold; }
.errorCase { color: #c00; font-weight: bold; }
.hiddenRow { display: none; }
.testcase { margin-left: 2em; }
Expand DownExpand Up@@ -349,6 +352,7 @@ class Template_mixin(object):
<td>Test Group/Test case</td>
<td>Count</td>
<td>Pass</td>
<td>Skip</td>
<td>Fail</td>
<td>Error</td>
<td>View</td>
Expand All@@ -358,6 +362,7 @@ class Template_mixin(object):
<td>Total</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td>&nbsp;</td>
Expand All@@ -370,6 +375,7 @@ class Template_mixin(object):
<td>%(desc)s</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td><a href="javascript:showClassDetail('%(cid)s',%(count)s)">Detail</a></td>
Expand DownExpand Up@@ -435,6 +441,7 @@ def __init__(self, verbosity=1):
self.stdout0 = None
self.stderr0 = None
self.success_count = 0
self.skip_count = 0
self.failure_count = 0
self.error_count = 0
self.verbosity = verbosity
Expand DownExpand Up@@ -518,6 +525,19 @@ def addFailure(self, test, err):
else:
sys.stderr.write('F')

def addSkip(self, test, err):
self.skip_count += 1
TestResult.addSkip(self, test, err)
_exc_str = self.skipped[-1][1]
output = self.complete_output()
self.result.append((3, test, output, _exc_str))
if self.verbosity > 1:
sys.stderr.write('S ')
sys.stderr.write(str(test))
sys.stderr.write('\n')
else:
sys.stderr.write('S')


class HTMLTestRunner(Template_mixin):
"""
Expand DownExpand Up@@ -571,6 +591,7 @@ def getReportAttributes(self, result):
duration = str(self.stopTime - self.startTime)
status = []
if result.success_count: status.append('Pass %s' % result.success_count)
if result.skip_count: status.append('Skip %s' % result.skip_count )
if result.failure_count: status.append('Failure %s' % result.failure_count)
if result.error_count: status.append('Error %s' % result.error_count )
if status:
Expand DownExpand Up@@ -627,11 +648,12 @@ def _generate_report(self, result):
sortedResult = self.sortResult(result.result)
for cid, (cls, cls_results) in enumerate(sortedResult):
# subtotal for a class
np = nf = ne = 0
np = ns = nf = ne = 0
for n,t,o,e in cls_results:
if n == 0: np += 1
elif n == 1: nf += 1
else: ne += 1
elif n == 2: ne += 1
elif n == 3: ns += 1

# format class description
if cls.__module__ == "__main__":
Expand All@@ -642,9 +664,9 @@ def _generate_report(self, result):
desc = doc and '%s: %s' % (name, doc) or name

row = self.REPORT_CLASS_TMPL % dict(
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or 'passClass',
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or ns > 0 and 'skipClass' or 'passClass',
desc = desc,
count = np+nf+ne,
count = np+ns+nf+ne,
Pass = np,
fail = nf,
error = ne,
Expand All@@ -657,8 +679,9 @@ def _generate_report(self, result):

report = self.REPORT_TMPL % dict(
test_list = ''.join(rows),
count = str(result.success_count+result.failure_count+result.error_count),
count = str(result.success_count+result.failure_count+result.error_count+result.skip_count),
Pass = str(result.success_count),
skip = str(result.skip_count),
fail = str(result.failure_count),
error = str(result.error_count),
)
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ by dash0002. In it's current iteration and maintenance, our goals are still the
to be able to quickly generate an HTML test report.

## Installation
Supporting Python 3.4.3
Supporting Python 3 - 3.5

### PIP (recommended)

Expand All@@ -57,9 +57,10 @@ as-is.

## Contributors

Way Yip Tung - https://github.com/tungwaiyip
Asish Dash - https://github.com/dash0002
Dhruv Paranjape - https://github.com/dark-passenger
- Way Yip Tung - https://github.com/tungwaiyip
- Asish Dash - https://github.com/dash0002
- Dhruv Paranjape - https://github.com/dark-passenger
- Ethan Estrada - https://github.com/eestrada

Contributions are gladly accepted as this is a side project at best. Please, also
consider this when looking at feedback cycles, issues, pull requests, etc.
Expand Down
25 changes: 14 additions & 11 deletions test_HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
# -*- coding: utf-8 -*-

import io as StringIO
import sys
import unittest
import HTMLTestRunner
from io import StringIO
from unittest import TestSuite, TestLoader, skip, TextTestRunner, TestCase
from HTMLTestRunner import HTMLTestRunner

import tests
from tests.SampleTestPass import SampleTestPass
from tests.SampleTestFail import SampleTestFail
from tests.SampleTestBasic import SampleTestBasic

class TestHTMLTestRunner(unittest.TestCase):
class TestHTMLTestRunner(TestCase):

def setUp(self):

self.suite = unittest.TestSuite()
self.loader = unittest.TestLoader()
self.suite = TestSuite()
self.loader = TestLoader()

self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestPass))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestFail))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestBasic))

self.results_output_buffer = StringIO.StringIO()
HTMLTestRunner.HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.results_output_buffer = StringIO()
HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.byte_output = self.results_output_buffer.getvalue()

def test_SampleTestPass(self):
output1="".join(self.byte_output.split())
output2="".join(SampleTestPass.EXPECTED_RESULT.split())
self.assertGreater(output1.find(output2),0)

@skip("Test Skipping")
def test_SampleTestSkip(self):
self.fail("This error should never be displayed")

def test_SampleTestFail(self):
output1="".join(self.byte_output.split())
Expand All@@ -42,8 +45,8 @@ def test_SampleTestBasic(self):


def main():
suite = unittest.TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
unittest.TextTestRunner().run(suite)
suite = TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
TextTestRunner().run(suite)

if __name__ == "__main__":
main()
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,14 +6,20 @@ This project adheres to [Semantic Versioning](http://semver.org/) and http://kee
### Added
- CHANGELOG.md from @dash0002

## [1.0.0]
### Changed
- Moved license content from python file to LICENSE
- Updated README to reflect current state of project
- Upgraded to support Python 3.4.3

### Changed v1.0.1
## [1.0.1]
### Changed
- Imported select functions only rather than the entire module.
- remove unused variables.
- Remove string slice and use a datetime function instead.
- Now compatible with python 3.5.2
- Added Contributor Dark-Passenger to Readme

## [1.0.2]
### Added

Copy link
Copy Markdown
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the version? I also think it's tracked in code. Safe to assume it can be increased according to semantic versioning since you're the only current contributor.

- Added support for skip tests.
35 changes: 29 additions & 6 deletions HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
__version__ = "1.0.1"
__version__ = "1.0.2"

from datetime import datetime
from io import StringIO
Expand DownExpand Up@@ -92,6 +92,7 @@ class Template_mixin(object):
0: 'pass',
1: 'fail',
2: 'error',
3: 'skip',
}

DEFAULT_TITLE = 'Unit Test Report'
Expand DownExpand Up@@ -293,8 +294,10 @@ class Template_mixin(object):
.passClass { background-color: #6c6; }
.failClass { background-color: #c60; }
.errorClass { background-color: #c00; }
.skipClass { background-color: #ff0; }
.passCase { color: #6c6; }
.failCase { color: #c60; font-weight: bold; }
.skipCase { color: #ff0; font-weight: bold; }
.errorCase { color: #c00; font-weight: bold; }
.hiddenRow { display: none; }
.testcase { margin-left: 2em; }
Expand DownExpand Up@@ -349,6 +352,7 @@ class Template_mixin(object):
<td>Test Group/Test case</td>
<td>Count</td>
<td>Pass</td>
<td>Skip</td>
<td>Fail</td>
<td>Error</td>
<td>View</td>
Expand All@@ -358,6 +362,7 @@ class Template_mixin(object):
<td>Total</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td>&nbsp;</td>
Expand All@@ -370,6 +375,7 @@ class Template_mixin(object):
<td>%(desc)s</td>
<td>%(count)s</td>
<td>%(Pass)s</td>
<td>%(skip)s</td>
<td>%(fail)s</td>
<td>%(error)s</td>
<td><a href="javascript:showClassDetail('%(cid)s',%(count)s)">Detail</a></td>
Expand DownExpand Up@@ -435,6 +441,7 @@ def __init__(self, verbosity=1):
self.stdout0 = None
self.stderr0 = None
self.success_count = 0
self.skip_count = 0
self.failure_count = 0
self.error_count = 0
self.verbosity = verbosity
Expand DownExpand Up@@ -518,6 +525,19 @@ def addFailure(self, test, err):
else:
sys.stderr.write('F')

def addSkip(self, test, err):
self.skip_count += 1
TestResult.addSkip(self, test, err)
_exc_str = self.skipped[-1][1]
output = self.complete_output()
self.result.append((3, test, output, _exc_str))
if self.verbosity > 1:
sys.stderr.write('S ')
sys.stderr.write(str(test))
sys.stderr.write('\n')
else:
sys.stderr.write('S')


class HTMLTestRunner(Template_mixin):
"""
Expand DownExpand Up@@ -571,6 +591,7 @@ def getReportAttributes(self, result):
duration = str(self.stopTime - self.startTime)
status = []
if result.success_count: status.append('Pass %s' % result.success_count)
if result.skip_count: status.append('Skip %s' % result.skip_count )
if result.failure_count: status.append('Failure %s' % result.failure_count)
if result.error_count: status.append('Error %s' % result.error_count )
if status:
Expand DownExpand Up@@ -627,11 +648,12 @@ def _generate_report(self, result):
sortedResult = self.sortResult(result.result)
for cid, (cls, cls_results) in enumerate(sortedResult):
# subtotal for a class
np = nf = ne = 0
np = ns = nf = ne = 0
for n,t,o,e in cls_results:
if n == 0: np += 1
elif n == 1: nf += 1
else: ne += 1
elif n == 2: ne += 1
elif n == 3: ns += 1

# format class description
if cls.__module__ == "__main__":
Expand All@@ -642,9 +664,9 @@ def _generate_report(self, result):
desc = doc and '%s: %s' % (name, doc) or name

row = self.REPORT_CLASS_TMPL % dict(
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or 'passClass',
style = ne > 0 and 'errorClass' or nf > 0 and 'failClass' or ns > 0 and 'skipClass' or 'passClass',
desc = desc,
count = np+nf+ne,
count = np+ns+nf+ne,
Pass = np,
fail = nf,
error = ne,
Expand All@@ -657,8 +679,9 @@ def _generate_report(self, result):

report = self.REPORT_TMPL % dict(
test_list = ''.join(rows),
count = str(result.success_count+result.failure_count+result.error_count),
count = str(result.success_count+result.failure_count+result.error_count+result.skip_count),
Pass = str(result.success_count),
skip = str(result.skip_count),
fail = str(result.failure_count),
error = str(result.error_count),
)
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,7 +43,7 @@ by dash0002. In it's current iteration and maintenance, our goals are still the
to be able to quickly generate an HTML test report.

## Installation
Supporting Python 3.4.3
Supporting Python 3 - 3.5

### PIP (recommended)

Expand All@@ -57,9 +57,10 @@ as-is.

## Contributors

Way Yip Tung - https://github.com/tungwaiyip
Asish Dash - https://github.com/dash0002
Dhruv Paranjape - https://github.com/dark-passenger
- Way Yip Tung - https://github.com/tungwaiyip
- Asish Dash - https://github.com/dash0002
- Dhruv Paranjape - https://github.com/dark-passenger
- Ethan Estrada - https://github.com/eestrada

Contributions are gladly accepted as this is a side project at best. Please, also
consider this when looking at feedback cycles, issues, pull requests, etc.
Expand Down
25 changes: 14 additions & 11 deletions test_HTMLTestRunner.py
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,37 @@
# -*- coding: utf-8 -*-

import io as StringIO
import sys
import unittest
import HTMLTestRunner
from io import StringIO
from unittest import TestSuite, TestLoader, skip, TextTestRunner, TestCase
from HTMLTestRunner import HTMLTestRunner

import tests
from tests.SampleTestPass import SampleTestPass
from tests.SampleTestFail import SampleTestFail
from tests.SampleTestBasic import SampleTestBasic

class TestHTMLTestRunner(unittest.TestCase):
class TestHTMLTestRunner(TestCase):

def setUp(self):

self.suite = unittest.TestSuite()
self.loader = unittest.TestLoader()
self.suite = TestSuite()
self.loader = TestLoader()

self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestPass))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestFail))
self.suite.addTests(self.loader.loadTestsFromModule(tests.SampleTestBasic))

self.results_output_buffer = StringIO.StringIO()
HTMLTestRunner.HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.results_output_buffer = StringIO()
HTMLTestRunner(stream=self.results_output_buffer).run(self.suite)
self.byte_output = self.results_output_buffer.getvalue()

def test_SampleTestPass(self):
output1="".join(self.byte_output.split())
output2="".join(SampleTestPass.EXPECTED_RESULT.split())
self.assertGreater(output1.find(output2),0)

@skip("Test Skipping")
def test_SampleTestSkip(self):
self.fail("This error should never be displayed")

def test_SampleTestFail(self):
output1="".join(self.byte_output.split())
Expand All@@ -42,8 +45,8 @@ def test_SampleTestBasic(self):


def main():
suite = unittest.TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
unittest.TextTestRunner().run(suite)
suite = TestLoader().loadTestsFromTestCase(TestHTMLTestRunner)
TextTestRunner().run(suite)

if __name__ == "__main__":
main()