Added a test case for generate attribution with default template

chinyeungli · chinyeungli · commit 2d041b4ae373 · 2014-09-03T11:27:34.000-07:00
diff --git a/about_code_tool/about.py b/about_code_tool/about.py
@@ -32,7 +32,7 @@
 import csv
 from datetime import datetime
 from email.parser import HeaderParser
-from os.path import dirname, join
+from os.path import basename, dirname, join, realpath
 import errno
 import httplib
 import logging
@@ -1241,11 +1241,12 @@ def generate_attribution(self, template_path=None, limit_to=None):
         # For some reasons, if I set the template_path = "templates/default.html"
         # in the parameter, the tempalte_path will become 'None' and cause error
         if not template_path:
-            template_path = "templates/default.html"
+            template_path = join(dirname(realpath(__file__)),
+                                 "templates/default.html")
 
         # FIXME: the template dir should be outside the code tree
-        template_dir = os.path.dirname(template_path)
-        template_file_name = os.path.basename(template_path)
+        template_dir = dirname(template_path)
+        template_file_name = basename(template_path)
         loader = j2.FileSystemLoader(template_dir)
         jinja_env = j2.Environment(loader=loader)
 
diff --git a/about_code_tool/tests/test_about.py b/about_code_tool/tests/test_about.py
@@ -616,6 +616,14 @@ def test_generate_attribution_with_custom_template(self):
         result = collector.generate_attribution(template)
         self.assertEqual(expected, result)
 
+    def test_generate_attribution_with_default_template(self):
+        f = open(join(TESTDATA_DIR, 'attrib/attrib.html'))
+        expected = f.read()
+        test_file = join(TESTDATA_DIR, 'attrib/attrib.ABOUT')
+        collector = about.Collector(test_file)
+        result = collector.generate_attribution()
+        self.assertEqual(expected, result)
+
     def test_license_text_extracted_from_license_text_file(self):
         expected = '''Tester holds the copyright for test component. Tester relinquishes copyright of
 this software and releases the component to Public Domain.
diff --git a/about_code_tool/tests/testdata/attrib/attrib.html b/about_code_tool/tests/testdata/attrib/attrib.html
@@ -0,0 +1,69 @@
+<!doctype html>
+<html>
+    <head>
+        <style type="text/css">
+            div.additional-license-text-list {display:block}
+            body {font-family: Helvetica, Arial, sans-serif;}
+            pre {white-space: pre-wrap;}
+        </style>
+        <title>Open Source Software Information</title>
+    </head>
+
+    <body>
+        <h1>OPEN SOURCE SOFTWARE INFORMATION</h1>
+        <div>
+
+            <p>For instructions on how to obtain a copy of any source code
+            being made publicly available by Starship Technology related to
+            software used in this product you may send your request in
+            writing to:</p>
+
+            Starship Technology LLC.<br/>
+            OSS Management<br/>
+            7829 Montague Expressway<br/>
+            Santa Clara, CA 95031<br/>
+            USA<br/>
+
+            <p>The Starship Technology website www.dejacode.com also
+            contains information regarding Starship Technology's use of open
+            source. Starship Technology has created the <a href=
+            "http://www.dejacode.org">www.dejacode.org</a> to
+            serve as a portal for interaction with the software
+            community-at-large.</p>
+
+            <p>This document contains additional information regarding 
+            licenses, acknowledgments and required copyright notices for 
+            open source packages used in this Starship Technology product.
+            This Starship Technology product contains the following open 
+            source software components</p>
+
+        </div>
+
+        <div class="oss-table-of-contents">
+            
+                <p><a href="#component_0">Apache HTTP Server
+                     
+                        2.4.3
+                    
+                </a></p>
+            
+        </div>
+
+        <hr>
+
+        
+            <div class="oss-component" id="component_0">
+                <h3 class="component-name">Apache HTTP Server
+                    2.4.3
+                </h3>
+                
+                
+                
+                
+            </div>
+        
+        <hr>
+
+        <h3><a id="End">End</a></h3>
+    </body>
+</html>
