BaseTools: Clean up source files

[mirror_edk2.git] / BaseTools / Source / Python / UPT / UnitTest / CommentParsingUnitTest.py

diff --git a/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py b/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py
index 4593506e58d5261f3ebc7636fd744c7dfcfe2202..e719567f99191836a09da316b7bed652ddfb6eb0 100644 (file)
--- a/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py
+++ b/BaseTools/Source/Python/UPT/UnitTest/CommentParsingUnitTest.py
@@ -3,9 +3,9 @@
 #\r
 # Copyright (c) 2011 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
-# This program and the accompanying materials are licensed and made available \r
-# under the terms and conditions of the BSD License which accompanies this \r
-# distribution. The full text of the license may be found at \r
+# This program and the accompanying materials are licensed and made available\r
+# under the terms and conditions of the BSD License which accompanies this\r
+# distribution. The full text of the license may be found at\r
 # http://opensource.org/licenses/bsd-license.php\r
 #\r
 # THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
@@ -32,7 +32,7 @@ class ParseHeaderCommentSectionTest(unittest.TestCase):
 \r
     def tearDown(self):\r
         pass\r
- \r
+\r
     #\r
     # Normal case1: have license/copyright/license above @file\r
     #\r
@@ -42,36 +42,36 @@ class ParseHeaderCommentSectionTest(unittest.TestCase):
         # License2\r
         #\r
         ## @file\r
-        # example abstract \r
-        # \r
+        # example abstract\r
+        #\r
         # example description\r
-        # \r
-        # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
-        # \r
-        # License3 \r
+        #\r
+        # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+        #\r
+        # License3\r
         #'''\r
-        \r
+\r
         CommentList = GetSplitValueList(TestCommentLines1, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-            \r
+\r
         Abstract, Description, Copyright, License = \\r
             ParseHeaderCommentSection(TestCommentLinesList, "PhonyFile")\r
-        \r
+\r
         ExpectedAbstract = 'example abstract'\r
         self.assertEqual(Abstract, ExpectedAbstract)\r
-        \r
+\r
         ExpectedDescription = 'example description'\r
         self.assertEqual(Description, ExpectedDescription)\r
-        \r
+\r
         ExpectedCopyright = \\r
             'Copyright (c) 2007 - 2010,'\\r
             ' Intel Corporation. All rights reserved.<BR>'\r
         self.assertEqual(Copyright, ExpectedCopyright)\r
-        \r
+\r
         ExpectedLicense = 'License1\nLicense2\n\nLicense3'\r
         self.assertEqual(License, ExpectedLicense)\r
 \r
@@ -84,41 +84,41 @@ class ParseHeaderCommentSectionTest(unittest.TestCase):
         # License2\r
         #\r
         ## @file\r
-        # example abstract \r
-        # \r
+        # example abstract\r
+        #\r
         # example description\r
         #\r
-        #Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+        #Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
         #\r
         ##'''\r
-        \r
+\r
         CommentList = GetSplitValueList(TestCommentLines2, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-            \r
+\r
         Abstract, Description, Copyright, License = \\r
             ParseHeaderCommentSection(TestCommentLinesList, "PhonyFile")\r
-        \r
+\r
         ExpectedAbstract = 'example abstract'\r
         self.assertEqual(Abstract, ExpectedAbstract)\r
-        \r
+\r
         ExpectedDescription = 'example description'\r
         self.assertEqual(Description, ExpectedDescription)\r
-        \r
+\r
         ExpectedCopyright = \\r
-            'Copyright (c) 2007 - 2010, Intel Corporation.'\\r
+            'Copyright (c) 2007 - 2018, Intel Corporation.'\\r
             ' All rights reserved.<BR>'\r
         self.assertEqual(Copyright, ExpectedCopyright)\r
-        \r
+\r
         ExpectedLicense = 'License1\nLicense2'\r
         self.assertEqual(License, ExpectedLicense)\r
-        \r
+\r
 \r
     #\r
-    # Normal case2: have license/copyright/license above @file, \r
+    # Normal case2: have license/copyright/license above @file,\r
     # but no abstract/description\r
     #\r
     def testNormalCase3(self):\r
@@ -126,41 +126,41 @@ class ParseHeaderCommentSectionTest(unittest.TestCase):
         ''' # License1\r
         # License2\r
         #\r
-        ## @file \r
-        # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+        ## @file\r
+        # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
         #\r
         # License3 Line1\r
         # License3 Line2\r
         ##'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines3, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-            \r
+\r
         Abstract, Description, Copyright, License = \\r
             ParseHeaderCommentSection(TestCommentLinesList, "PhonyFile")\r
-        \r
+\r
         ExpectedAbstract = ''\r
         self.assertEqual(Abstract, ExpectedAbstract)\r
-        \r
+\r
         ExpectedDescription = ''\r
         self.assertEqual(Description, ExpectedDescription)\r
-        \r
+\r
         ExpectedCopyright = \\r
             'Copyright (c) 2007 - 2010,'\\r
             ' Intel Corporation. All rights reserved.<BR>'\r
         self.assertEqual(Copyright, ExpectedCopyright)\r
-        \r
+\r
         ExpectedLicense = \\r
             'License1\n' \\r
             'License2\n\n' \\r
             'License3 Line1\n' \\r
             'License3 Line2'\r
-        self.assertEqual(License, ExpectedLicense)        \r
-           \r
+        self.assertEqual(License, ExpectedLicense)\r
+\r
     #\r
     # Normal case4: format example in spec\r
     #\r
@@ -172,33 +172,33 @@ class ParseHeaderCommentSectionTest(unittest.TestCase):
         #\r
         # Description\r
         #\r
-        # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+        # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
         #\r
         # License\r
         #\r
         ##'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-            \r
+\r
         Abstract, Description, Copyright, License = \\r
             ParseHeaderCommentSection(TestCommentLinesList, "PhonyFile")\r
-        \r
+\r
         ExpectedAbstract = 'Abstract'\r
         self.assertEqual(Abstract, ExpectedAbstract)\r
-        \r
+\r
         ExpectedDescription = 'Description'\r
         self.assertEqual(Description, ExpectedDescription)\r
-        \r
+\r
         ExpectedCopyright = \\r
-            'Copyright (c) 2007 - 2010, Intel Corporation.'\\r
+            'Copyright (c) 2007 - 2018, Intel Corporation.'\\r
             ' All rights reserved.<BR>'\r
         self.assertEqual(Copyright, ExpectedCopyright)\r
-        \r
+\r
         ExpectedLicense = \\r
             'License'\r
         self.assertEqual(License, ExpectedLicense)\r
@@ -214,37 +214,37 @@ class ParseHeaderCommentSectionTest(unittest.TestCase):
         #\r
         # Description\r
         #\r
-        # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
-        # other line        \r
-        # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+        # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+        # other line\r
+        # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
         #\r
         # License\r
         #\r
         ##'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-            \r
+\r
         Abstract, Description, Copyright, License = \\r
             ParseHeaderCommentSection(TestCommentLinesList, "PhonyFile")\r
-        \r
+\r
         ExpectedAbstract = 'Abstract'\r
         self.assertEqual(Abstract, ExpectedAbstract)\r
-        \r
+\r
         ExpectedDescription = 'Description'\r
         self.assertEqual(Description, ExpectedDescription)\r
-        \r
+\r
         ExpectedCopyright = \\r
-            'Copyright (c) 2007 - 2010, Intel Corporation.'\\r
+            'Copyright (c) 2007 - 2018, Intel Corporation.'\\r
             ' All rights reserved.<BR>\n'\\r
-            'Copyright (c) 2007 - 2010, Intel Corporation.'\\r
+            'Copyright (c) 2007 - 2018, Intel Corporation.'\\r
             ' All rights reserved.<BR>'\r
         self.assertEqual(Copyright, ExpectedCopyright)\r
-        \r
+\r
         ExpectedLicense = \\r
             'License'\r
         self.assertEqual(License, ExpectedLicense)\r
@@ -260,39 +260,39 @@ class ParseHeaderCommentSectionTest(unittest.TestCase):
         #\r
         # Description\r
         #\r
-        # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
-        # Copyright (c) 2007 - 2010, FOO1 Corporation. All rights reserved.<BR>      \r
+        # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+        # Copyright (c) 2007 - 2010, FOO1 Corporation. All rights reserved.<BR>\r
         # Copyright (c) 2007 - 2010, FOO2 Corporation. All rights reserved.<BR>\r
         #\r
         # License\r
         #\r
         ##'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-            \r
+\r
         Abstract, Description, Copyright, License = \\r
             ParseHeaderCommentSection(TestCommentLinesList, "PhonyFile")\r
-        \r
+\r
         ExpectedAbstract = 'Abstract'\r
         self.assertEqual(Abstract, ExpectedAbstract)\r
-        \r
+\r
         ExpectedDescription = 'Description'\r
         self.assertEqual(Description, ExpectedDescription)\r
-        \r
+\r
         ExpectedCopyright = \\r
-            'Copyright (c) 2007 - 2010, Intel Corporation.'\\r
+            'Copyright (c) 2007 - 2018, Intel Corporation.'\\r
             ' All rights reserved.<BR>\n'\\r
             'Copyright (c) 2007 - 2010, FOO1 Corporation.'\\r
             ' All rights reserved.<BR>\n'\\r
             'Copyright (c) 2007 - 2010, FOO2 Corporation.'\\r
             ' All rights reserved.<BR>'\r
         self.assertEqual(Copyright, ExpectedCopyright)\r
-        \r
+\r
         ExpectedLicense = \\r
             'License'\r
         self.assertEqual(License, ExpectedLicense)\r
@@ -307,39 +307,39 @@ class ParseHeaderCommentSectionTest(unittest.TestCase):
         #\r
         # Description\r
         #\r
-        # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
-        # Copyright (c) 2007 - 2010, FOO1 Corporation. All rights reserved.<BR>      \r
+        # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
+        # Copyright (c) 2007 - 2010, FOO1 Corporation. All rights reserved.<BR>\r
         # Copyright (c) 2007 - 2010, FOO2 Corporation. All rights reserved.<BR>\r
         #\r
         # License\r
         #\r
         ##'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-            \r
+\r
         Abstract, Description, Copyright, License = \\r
             ParseHeaderCommentSection(TestCommentLinesList, "PhonyFile")\r
-        \r
+\r
         ExpectedAbstract = ''\r
         self.assertEqual(Abstract, ExpectedAbstract)\r
-        \r
+\r
         ExpectedDescription = 'Description'\r
         self.assertEqual(Description, ExpectedDescription)\r
-        \r
+\r
         ExpectedCopyright = \\r
-            'Copyright (c) 2007 - 2010, Intel Corporation.'\\r
+            'Copyright (c) 2007 - 2018, Intel Corporation.'\\r
             ' All rights reserved.<BR>\n'\\r
             'Copyright (c) 2007 - 2010, FOO1 Corporation.'\\r
             ' All rights reserved.<BR>\n'\\r
             'Copyright (c) 2007 - 2010, FOO2 Corporation.'\\r
             ' All rights reserved.<BR>'\r
         self.assertEqual(Copyright, ExpectedCopyright)\r
-        \r
+\r
         ExpectedLicense = \\r
             'License'\r
         self.assertEqual(License, ExpectedLicense)\r
@@ -353,37 +353,37 @@ class ParseHeaderCommentSectionTest(unittest.TestCase):
         ## @file\r
         # Abstact\r
         #\r
-        # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>\r
+        # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
         #\r
         # License\r
         #\r
         ##'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-            \r
+\r
         Abstract, Description, Copyright, License = \\r
             ParseHeaderCommentSection(TestCommentLinesList, "PhonyFile")\r
-        \r
+\r
         ExpectedAbstract = 'Abstact'\r
         self.assertEqual(Abstract, ExpectedAbstract)\r
-        \r
+\r
         ExpectedDescription = ''\r
         self.assertEqual(Description, ExpectedDescription)\r
-        \r
+\r
         ExpectedCopyright = \\r
-            'Copyright (c) 2007 - 2010, Intel Corporation.'\\r
+            'Copyright (c) 2007 - 2018, Intel Corporation.'\\r
             ' All rights reserved.<BR>'\r
         self.assertEqual(Copyright, ExpectedCopyright)\r
-        \r
+\r
         ExpectedLicense = \\r
             'License'\r
         self.assertEqual(License, ExpectedLicense)\r
-                \r
+\r
     #\r
     # Error case1: No copyright found\r
     #\r
@@ -398,18 +398,18 @@ class ParseHeaderCommentSectionTest(unittest.TestCase):
         # License\r
         #\r
         ##'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
-        self.assertRaises(Logger.FatalError, \r
-                          ParseHeaderCommentSection, \r
+\r
+        self.assertRaises(Logger.FatalError,\r
+                          ParseHeaderCommentSection,\r
                           TestCommentLinesList,\r
-                          "PhonyFile")    \r
+                          "PhonyFile")\r
 \r
     #\r
     # Error case2: non-empty non-comment lines passed in\r
@@ -423,22 +423,22 @@ class ParseHeaderCommentSectionTest(unittest.TestCase):
         this is invalid line\r
         # Description\r
         #\r
-        # Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>        \r
+        # Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
         # License\r
         #\r
         ##'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
-        self.assertRaises(Logger.FatalError, \r
-                          ParseHeaderCommentSection, \r
+\r
+        self.assertRaises(Logger.FatalError,\r
+                          ParseHeaderCommentSection,\r
                           TestCommentLinesList,\r
-                          "PhonyFile")   \r
+                          "PhonyFile")\r
 \r
 #\r
 # Test ParseGenericComment\r
@@ -449,14 +449,14 @@ class ParseGenericCommentTest(unittest.TestCase):
 \r
     def tearDown(self):\r
         pass\r
- \r
+\r
     #\r
     # Normal case1: one line of comment\r
     #\r
     def testNormalCase1(self):\r
         TestCommentLines = \\r
         '''# hello world'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
@@ -476,17 +476,17 @@ class ParseGenericCommentTest(unittest.TestCase):
         TestCommentLines = \\r
         '''## hello world\r
         # second line'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         HelptxtObj = ParseGenericComment(TestCommentLinesList, 'testNormalCase2')\r
         self.failIf(not HelptxtObj)\r
-        self.assertEqual(HelptxtObj.GetString(), \r
+        self.assertEqual(HelptxtObj.GetString(),\r
                          'hello world\n' + 'second line')\r
         self.assertEqual(HelptxtObj.GetLang(), TAB_LANGUAGE_EN_US)\r
 \r
@@ -497,17 +497,17 @@ class ParseGenericCommentTest(unittest.TestCase):
         TestCommentLines = \\r
         '''## hello world\r
         This is not comment line'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         HelptxtObj = ParseGenericComment(TestCommentLinesList, 'testNormalCase3')\r
         self.failIf(not HelptxtObj)\r
-        self.assertEqual(HelptxtObj.GetString(), \r
+        self.assertEqual(HelptxtObj.GetString(),\r
                          'hello world\n\n')\r
         self.assertEqual(HelptxtObj.GetLang(), TAB_LANGUAGE_EN_US)\r
 \r
@@ -520,7 +520,7 @@ class ParseDecPcdGenericCommentTest(unittest.TestCase):
 \r
     def tearDown(self):\r
         pass\r
- \r
+\r
     #\r
     # Normal case1: comments with no special comment\r
     #\r
@@ -528,22 +528,22 @@ class ParseDecPcdGenericCommentTest(unittest.TestCase):
         TestCommentLines = \\r
         '''## hello world\r
         # second line'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         (HelpTxt, PcdErr) = \\r
             ParseDecPcdGenericComment(TestCommentLinesList, 'testNormalCase1')\r
         self.failIf(not HelpTxt)\r
         self.failIf(PcdErr)\r
-        self.assertEqual(HelpTxt, \r
+        self.assertEqual(HelpTxt,\r
                          'hello world\n' + 'second line')\r
-       \r
-       \r
+\r
+\r
     #\r
     # Normal case2: comments with valid list\r
     #\r
@@ -553,19 +553,19 @@ class ParseDecPcdGenericCommentTest(unittest.TestCase):
         # second line\r
         # @ValidList 1, 2, 3\r
         # other line'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         (HelpTxt, PcdErr) = \\r
             ParseDecPcdGenericComment(TestCommentLinesList, 'UnitTest')\r
         self.failIf(not HelpTxt)\r
         self.failIf(not PcdErr)\r
-        self.assertEqual(HelpTxt, \r
+        self.assertEqual(HelpTxt,\r
                          'hello world\n' + 'second line\n' + 'other line')\r
         ExpectedList = GetSplitValueList('1 2 3', TAB_SPACE_SPLIT)\r
         ActualList = [item for item in \\r
@@ -583,19 +583,19 @@ class ParseDecPcdGenericCommentTest(unittest.TestCase):
         # second line\r
         # @ValidRange LT 1 AND GT 2\r
         # other line'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         (HelpTxt, PcdErr) = \\r
             ParseDecPcdGenericComment(TestCommentLinesList, 'UnitTest')\r
         self.failIf(not HelpTxt)\r
         self.failIf(not PcdErr)\r
-        self.assertEqual(HelpTxt, \r
+        self.assertEqual(HelpTxt,\r
                          'hello world\n' + 'second line\n' + 'other line')\r
         self.assertEqual(PcdErr.GetValidValueRange().strip(), 'LT 1 AND GT 2')\r
         self.failIf(PcdErr.GetExpression())\r
@@ -610,19 +610,19 @@ class ParseDecPcdGenericCommentTest(unittest.TestCase):
         # second line\r
         # @Expression LT 1 AND GT 2\r
         # other line'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         (HelpTxt, PcdErr) = \\r
             ParseDecPcdGenericComment(TestCommentLinesList, 'UnitTest')\r
         self.failIf(not HelpTxt)\r
         self.failIf(not PcdErr)\r
-        self.assertEqual(HelpTxt, \r
+        self.assertEqual(HelpTxt,\r
                          'hello world\n' + 'second line\n' + 'other line')\r
         self.assertEqual(PcdErr.GetExpression().strip(), 'LT 1 AND GT 2')\r
         self.failIf(PcdErr.GetValidValueRange())\r
@@ -634,14 +634,14 @@ class ParseDecPcdGenericCommentTest(unittest.TestCase):
     def testNormalCase5(self):\r
         TestCommentLines = \\r
         '''# @Expression LT 1 AND GT 2'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         (HelpTxt, PcdErr) = \\r
             ParseDecPcdGenericComment(TestCommentLinesList, 'UnitTest')\r
         self.failIf(HelpTxt)\r
@@ -649,28 +649,28 @@ class ParseDecPcdGenericCommentTest(unittest.TestCase):
         self.assertEqual(PcdErr.GetExpression().strip(), 'LT 1 AND GT 2')\r
         self.failIf(PcdErr.GetValidValueRange())\r
         self.failIf(PcdErr.GetValidValue())\r
- \r
+\r
     #\r
     # Normal case6: comments with only generic help text\r
     #\r
     def testNormalCase6(self):\r
         TestCommentLines = \\r
         '''#'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         (HelpTxt, PcdErr) = \\r
             ParseDecPcdGenericComment(TestCommentLinesList, 'UnitTest')\r
         self.assertEqual(HelpTxt, '\n')\r
         self.failIf(PcdErr)\r
 \r
-        \r
-        \r
+\r
+\r
     #\r
     # Error case1: comments with both expression and valid list, use later\r
     # ignore the former and with a warning message\r
@@ -679,17 +679,17 @@ class ParseDecPcdGenericCommentTest(unittest.TestCase):
         TestCommentLines = \\r
         '''## hello world\r
         # second line\r
-        # @ValidList 1, 2, 3        \r
+        # @ValidList 1, 2, 3\r
         # @Expression LT 1 AND GT 2\r
         # other line'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         try:\r
             ParseDecPcdGenericComment(TestCommentLinesList, 'UnitTest')\r
         except Logger.FatalError:\r
@@ -704,26 +704,26 @@ class ParseDecPcdTailCommentTest(unittest.TestCase):
 \r
     def tearDown(self):\r
         pass\r
- \r
+\r
     #\r
     # Normal case1: comments with no SupModeList\r
     #\r
     def testNormalCase1(self):\r
         TestCommentLines = \\r
         '''## #hello world'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         (SupModeList, HelpStr) = \\r
             ParseDecPcdTailComment(TestCommentLinesList, 'UnitTest')\r
         self.failIf(not HelpStr)\r
         self.failIf(SupModeList)\r
-        self.assertEqual(HelpStr, \r
+        self.assertEqual(HelpStr,\r
                          'hello world')\r
 \r
     #\r
@@ -732,44 +732,44 @@ class ParseDecPcdTailCommentTest(unittest.TestCase):
     def testNormalCase2(self):\r
         TestCommentLines = \\r
         '''## BASE #hello world'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         (SupModeList, HelpStr) = \\r
             ParseDecPcdTailComment(TestCommentLinesList, 'UnitTest')\r
         self.failIf(not HelpStr)\r
         self.failIf(not SupModeList)\r
-        self.assertEqual(HelpStr, \r
+        self.assertEqual(HelpStr,\r
                          'hello world')\r
-        self.assertEqual(SupModeList, \r
+        self.assertEqual(SupModeList,\r
                          ['BASE'])\r
-        \r
+\r
     #\r
     # Normal case3: comments with more than one SupMode\r
     #\r
     def testNormalCase3(self):\r
         TestCommentLines = \\r
         '''## BASE  UEFI_APPLICATION #hello world'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         (SupModeList, HelpStr) = \\r
             ParseDecPcdTailComment(TestCommentLinesList, 'UnitTest')\r
         self.failIf(not HelpStr)\r
         self.failIf(not SupModeList)\r
-        self.assertEqual(HelpStr, \r
+        self.assertEqual(HelpStr,\r
                          'hello world')\r
-        self.assertEqual(SupModeList, \r
+        self.assertEqual(SupModeList,\r
                          ['BASE', 'UEFI_APPLICATION'])\r
 \r
     #\r
@@ -778,58 +778,58 @@ class ParseDecPcdTailCommentTest(unittest.TestCase):
     def testNormalCase4(self):\r
         TestCommentLines = \\r
         '''## BASE  UEFI_APPLICATION'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         (SupModeList, HelpStr) = \\r
             ParseDecPcdTailComment(TestCommentLinesList, 'UnitTest')\r
         self.failIf(HelpStr)\r
         self.failIf(not SupModeList)\r
-        self.assertEqual(SupModeList, \r
+        self.assertEqual(SupModeList,\r
                          ['BASE', 'UEFI_APPLICATION'])\r
 \r
     #\r
-    # Normal case5: general comments with no supModList, extract from real case \r
+    # Normal case5: general comments with no supModList, extract from real case\r
     #\r
     def testNormalCase5(self):\r
         TestCommentLines = \\r
         ''' # 1 = 128MB, 2 = 256MB, 3 = MAX'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         (SupModeList, HelpStr) = \\r
             ParseDecPcdTailComment(TestCommentLinesList, 'UnitTest')\r
         self.failIf(not HelpStr)\r
-        self.assertEqual(HelpStr, \r
+        self.assertEqual(HelpStr,\r
                          '1 = 128MB, 2 = 256MB, 3 = MAX')\r
         self.failIf(SupModeList)\r
-        \r
+\r
 \r
     #\r
-    # Error case2: comments with supModList contains valid and invalid \r
+    # Error case2: comments with supModList contains valid and invalid\r
     # module type\r
     #\r
     def testErrorCase2(self):\r
         TestCommentLines = \\r
         '''## BASE INVALID_MODULE_TYPE #hello world'''\r
-     \r
+\r
         CommentList = GetSplitValueList(TestCommentLines, "\n")\r
         LineNum = 0\r
         TestCommentLinesList = []\r
         for Comment in CommentList:\r
             LineNum += 1\r
             TestCommentLinesList.append((Comment, LineNum))\r
-        \r
+\r
         try:\r
             ParseDecPcdTailComment(TestCommentLinesList, 'UnitTest')\r
         except Logger.FatalError:\r
@@ -869,7 +869,7 @@ class _IsCopyrightLineTest(unittest.TestCase):
         Line = 'this is not aCopyright ( line'\r
         Result = _IsCopyrightLine(Line)\r
         self.failIf(Result)\r
- \r
+\r
     #\r
     # Normal case\r
     #\r
@@ -917,7 +917,7 @@ class _IsCopyrightLineTest(unittest.TestCase):
         Line = 'not a Copyright '\r
         Result = _IsCopyrightLine(Line)\r
         self.failIf(Result)\r
-        \r
+\r
 if __name__ == '__main__':\r
     Logger.Initialize()\r
-    unittest.main()
\ No newline at end of file
+    unittest.main()\r