]> git.proxmox.com Git - mirror_edk2.git/blobdiff - BaseTools/Source/Python/UPT/UnitTest/CommentGeneratingUnitTest.py
BaseTools: Clean up source files
[mirror_edk2.git] / BaseTools / Source / Python / UPT / UnitTest / CommentGeneratingUnitTest.py
index 42a2ba3a6b3014c93892818c8d58f51e74d0d56d..3371ec3c2f7cd8835af2c7a7e706d975d6735d70 100644 (file)
@@ -1,11 +1,11 @@
 ## @file\r
 # This file contain unit test for CommentParsing\r
 #\r
-# Copyright (c) 2011 - 2014, Intel Corporation. All rights reserved.<BR>\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
@@ -15,20 +15,20 @@ import os
 import unittest\r
 \r
 import Logger.Log as Logger\r
-from GenMetaFile.GenInfFile import GenGuidSections \r
+from GenMetaFile.GenInfFile import GenGuidSections\r
 from GenMetaFile.GenInfFile import GenProtocolPPiSections\r
 from GenMetaFile.GenInfFile import GenPcdSections\r
 from GenMetaFile.GenInfFile import GenSpecialSections\r
 from Library.CommentGenerating import GenGenericCommentF\r
-from Library.CommentGenerating import _GetHelpStr \r
+from Library.CommentGenerating import _GetHelpStr\r
 from Object.POM.CommonObject import TextObject\r
 from Object.POM.CommonObject import GuidObject\r
 from Object.POM.CommonObject import ProtocolObject\r
 from Object.POM.CommonObject import PpiObject\r
 from Object.POM.CommonObject import PcdObject\r
 from Object.POM.ModuleObject import HobObject\r
-                               \r
-from Library.String import GetSplitValueList\r
+\r
+from Library.StringUtils import GetSplitValueList\r
 from Library.DataType import TAB_SPACE_SPLIT\r
 from Library.DataType import TAB_LANGUAGE_EN_US\r
 from Library.DataType import TAB_LANGUAGE_ENG\r
@@ -46,7 +46,7 @@ class _GetHelpStrTest(unittest.TestCase):
 \r
     def tearDown(self):\r
         pass\r
\r
+\r
     #\r
     # Normal case1: have one help text object with Lang = 'en-US'\r
     #\r
@@ -55,11 +55,11 @@ class _GetHelpStrTest(unittest.TestCase):
         HelpTextObj = TextObject()\r
         HelpTextObj.SetLang(TAB_LANGUAGE_EN_US)\r
         HelpTextObj.SetString(HelpStr)\r
-        \r
+\r
         HelpTextList = [HelpTextObj]\r
         Result = _GetHelpStr(HelpTextList)\r
         self.assertEqual(Result, HelpStr)\r
-        \r
+\r
     #\r
     # Normal case2: have two help text object with Lang = 'en-US' and other\r
     #\r
@@ -68,16 +68,16 @@ class _GetHelpStrTest(unittest.TestCase):
         HelpTextObj = TextObject()\r
         HelpTextObj.SetLang(TAB_LANGUAGE_ENG)\r
         HelpTextObj.SetString(HelpStr)\r
-        \r
+\r
         HelpTextList = [HelpTextObj]\r
 \r
         ExpectedStr = 'Hello world1'\r
         HelpTextObj = TextObject()\r
         HelpTextObj.SetLang(TAB_LANGUAGE_EN_US)\r
-        HelpTextObj.SetString(ExpectedStr)        \r
-        \r
+        HelpTextObj.SetString(ExpectedStr)\r
+\r
         HelpTextList.append(HelpTextObj)\r
-        \r
+\r
         Result = _GetHelpStr(HelpTextList)\r
         self.assertEqual(Result, ExpectedStr)\r
 \r
@@ -89,16 +89,16 @@ class _GetHelpStrTest(unittest.TestCase):
         HelpTextObj = TextObject()\r
         HelpTextObj.SetLang('')\r
         HelpTextObj.SetString(HelpStr)\r
-        \r
+\r
         HelpTextList = [HelpTextObj]\r
 \r
         ExpectedStr = 'Hello world1'\r
         HelpTextObj = TextObject()\r
         HelpTextObj.SetLang(TAB_LANGUAGE_ENG)\r
-        HelpTextObj.SetString(ExpectedStr)        \r
-        \r
+        HelpTextObj.SetString(ExpectedStr)\r
+\r
         HelpTextList.append(HelpTextObj)\r
-        \r
+\r
         Result = _GetHelpStr(HelpTextList)\r
         self.assertEqual(Result, ExpectedStr)\r
 \r
@@ -110,15 +110,15 @@ class _GetHelpStrTest(unittest.TestCase):
         ExpectedStr = 'Hello world1'\r
         HelpTextObj = TextObject()\r
         HelpTextObj.SetLang(TAB_LANGUAGE_ENG)\r
-        HelpTextObj.SetString(ExpectedStr)        \r
+        HelpTextObj.SetString(ExpectedStr)\r
         HelpTextList = [HelpTextObj]\r
-      \r
+\r
         HelpStr = 'Hello world'\r
         HelpTextObj = TextObject()\r
         HelpTextObj.SetLang('')\r
-        HelpTextObj.SetString(HelpStr)        \r
+        HelpTextObj.SetString(HelpStr)\r
         HelpTextList.append(HelpTextObj)\r
-        \r
+\r
         Result = _GetHelpStr(HelpTextList)\r
         self.assertEqual(Result, ExpectedStr)\r
 \r
@@ -130,27 +130,27 @@ class _GetHelpStrTest(unittest.TestCase):
         ExpectedStr = 'Hello world1'\r
         HelpTextObj = TextObject()\r
         HelpTextObj.SetLang(TAB_LANGUAGE_EN_US)\r
-        HelpTextObj.SetString(ExpectedStr)        \r
+        HelpTextObj.SetString(ExpectedStr)\r
         HelpTextList = [HelpTextObj]\r
-      \r
+\r
         HelpStr = 'Hello unknown world'\r
         HelpTextObj = TextObject()\r
         HelpTextObj.SetLang('')\r
-        HelpTextObj.SetString(HelpStr)        \r
+        HelpTextObj.SetString(HelpStr)\r
         HelpTextList.append(HelpTextObj)\r
 \r
         HelpStr = 'Hello mysterious world'\r
         HelpTextObj = TextObject()\r
         HelpTextObj.SetLang('')\r
-        HelpTextObj.SetString(HelpStr)        \r
+        HelpTextObj.SetString(HelpStr)\r
         HelpTextList.append(HelpTextObj)\r
-                \r
+\r
         Result = _GetHelpStr(HelpTextList)\r
         self.assertEqual(Result, ExpectedStr)\r
-        \r
+\r
         HelpTextList.sort()\r
         self.assertEqual(Result, ExpectedStr)\r
-        \r
+\r
         HelpTextList.sort(reverse=True)\r
         self.assertEqual(Result, ExpectedStr)\r
 \r
@@ -160,15 +160,15 @@ class _GetHelpStrTest(unittest.TestCase):
 #\r
 class GenGuidSectionsTest(unittest.TestCase):\r
     def setUp(self):\r
-        pass      \r
+        pass\r
 \r
     def tearDown(self):\r
         pass\r
-    \r
+\r
     #\r
     # This is the API to generate Guid Object to help UnitTest\r
     #\r
-    def GuidFactory(self, CName, FFE, Usage, GuidType, VariableName, HelpStr):           \r
+    def GuidFactory(self, CName, FFE, Usage, GuidType, VariableName, HelpStr):\r
         Guid = GuidObject()\r
         Guid.SetCName(CName)\r
         Guid.SetFeatureFlag(FFE)\r
@@ -180,22 +180,22 @@ class GenGuidSectionsTest(unittest.TestCase):
         HelpTextObj.SetLang('')\r
         HelpTextObj.SetString(HelpStr)\r
         Guid.SetHelpTextList([HelpTextObj])\r
-        \r
-        return Guid      \r
-        \r
+\r
+        return Guid\r
+\r
     #\r
     # Normal case: have two GuidObject\r
     #\r
     def testNormalCase1(self):\r
         GuidList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
         Usage = 'PRODUCES'\r
         GuidType = 'Event'\r
         VariableName = ''\r
         HelpStr = 'Usage comment line 1'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
 \r
@@ -205,10 +205,10 @@ class GenGuidSectionsTest(unittest.TestCase):
         GuidType = 'Variable'\r
         VariableName = ''\r
         HelpStr = 'Usage comment line 2'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
-        GuidList.append(Guid1)        \r
-        \r
+        GuidList.append(Guid1)\r
+\r
         Result = GenGuidSections(GuidList)\r
         Expected = '''[Guids]\r
 ## PRODUCES ## Event # Usage comment line 1\r
@@ -221,14 +221,14 @@ Guid1|FFE1'''
     #\r
     def testNormalCase2(self):\r
         GuidList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
         Usage = 'PRODUCES'\r
         GuidType = 'Event'\r
         VariableName = ''\r
         HelpStr = 'Usage comment line 1'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
 \r
@@ -238,10 +238,10 @@ Guid1|FFE1'''
         GuidType = 'UNDEFINED'\r
         VariableName = ''\r
         HelpStr = 'Generic comment line 1\n Generic comment line 2'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
-        GuidList.append(Guid1)        \r
-        \r
+        GuidList.append(Guid1)\r
+\r
         Result = GenGuidSections(GuidList)\r
         Expected = '''[Guids]\r
 ## PRODUCES ## Event # Usage comment line 1\r
@@ -252,7 +252,7 @@ Guid1|FFE1'''
         self.assertEqual(Result.strip(), Expected)\r
 \r
     #\r
-    # Normal case: have two GuidObject, one help goes to generic help, \r
+    # Normal case: have two GuidObject, one help goes to generic help,\r
     # the other go into usage comment\r
     #\r
     def testNormalCase3(self):\r
@@ -264,20 +264,20 @@ Guid1|FFE1'''
         GuidType = 'UNDEFINED'\r
         VariableName = ''\r
         HelpStr = 'Generic comment'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
-        GuidList.append(Guid1)  \r
-                \r
+        GuidList.append(Guid1)\r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
         Usage = 'PRODUCES'\r
         GuidType = 'Event'\r
         VariableName = ''\r
         HelpStr = 'Usage comment line 1'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
-              \r
+\r
         Result = GenGuidSections(GuidList)\r
         Expected = '''[Guids]\r
 # Generic comment\r
@@ -298,10 +298,10 @@ Guid1|FFE1'''
         GuidType = 'UNDEFINED'\r
         VariableName = ''\r
         HelpStr = 'Generic comment line1 \n generic comment line 2'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
-        GuidList.append(Guid1)  \r
-              \r
+        GuidList.append(Guid1)\r
+\r
         Result = GenGuidSections(GuidList)\r
         Expected = '''[Guids]\r
 # Generic comment line1\r
@@ -315,17 +315,17 @@ Guid1|FFE1'''
     #\r
     def testNormalCase6(self):\r
         GuidList = []\r
-                \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
         Usage = 'PRODUCES'\r
         GuidType = 'Event'\r
         VariableName = ''\r
         HelpStr = 'Usage comment line 1\n Usage comment line 2'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
-              \r
+\r
         Result = GenGuidSections(GuidList)\r
         Expected = '''[Guids]\r
 Guid1|FFE1 ## PRODUCES ## Event # Usage comment line 1  Usage comment line 2\r
@@ -337,36 +337,36 @@ Guid1|FFE1 ## PRODUCES ## Event # Usage comment line 1  Usage comment line 2
     #\r
     def testNormalCase7(self):\r
         GuidList = []\r
-                \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
         Usage = 'UNDEFINED'\r
         GuidType = 'UNDEFINED'\r
         VariableName = ''\r
         HelpStr = 'Usage comment line 1'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
-              \r
+\r
         Result = GenGuidSections(GuidList)\r
         Expected = '''[Guids]\r
 Guid1|FFE1 # Usage comment line 1\r
 '''\r
         self.assertEqual(Result.strip(), Expected.strip())\r
-    \r
+\r
     #\r
     # Normal case: have two GuidObject\r
     #\r
     def testNormalCase8(self):\r
         GuidList = []\r
-                \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
         Usage = 'PRODUCES'\r
         GuidType = 'Event'\r
         VariableName = ''\r
         HelpStr = 'Usage comment line 1\n Usage comment line 2'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
 \r
@@ -376,10 +376,10 @@ Guid1|FFE1 # Usage comment line 1
         GuidType = 'Event'\r
         VariableName = ''\r
         HelpStr = 'Usage comment line 3'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
-              \r
+\r
         Result = GenGuidSections(GuidList)\r
         Expected = '''[Guids]\r
 ## PRODUCES ## Event # Usage comment line 1  Usage comment line 2\r
@@ -403,14 +403,14 @@ Guid1|FFE1
     #\r
     def testNormalCase10(self):\r
         GuidList = []\r
-                \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
         Usage = 'UNDEFINED'\r
         GuidType = 'UNDEFINED'\r
         VariableName = ''\r
         HelpStr = ''\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
 \r
@@ -425,14 +425,14 @@ Guid1|FFE1
     #\r
     def testNormalCase11(self):\r
         GuidList = []\r
-                \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
         Usage = 'UNDEFINED'\r
         GuidType = 'UNDEFINED'\r
         VariableName = ''\r
         HelpStr = 'general comment line 1'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
 \r
@@ -442,7 +442,7 @@ Guid1|FFE1
         GuidType = 'Event'\r
         VariableName = ''\r
         HelpStr = 'Usage comment line 3'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
 \r
@@ -452,10 +452,10 @@ Guid1|FFE1
         GuidType = 'UNDEFINED'\r
         VariableName = ''\r
         HelpStr = 'general comment line 2'\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
-                      \r
+\r
         Result = GenGuidSections(GuidList)\r
         Expected = '''[Guids]\r
 # general comment line 1\r
@@ -470,14 +470,14 @@ Guid1|FFE1
     #\r
     def testNormalCase12(self):\r
         GuidList = []\r
-                \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
         Usage = 'PRODUCES'\r
         GuidType = 'GUID'\r
         VariableName = ''\r
         HelpStr = ''\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
 \r
@@ -487,7 +487,7 @@ Guid1|FFE1
         GuidType = 'Event'\r
         VariableName = ''\r
         HelpStr = ''\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
 \r
@@ -497,10 +497,10 @@ Guid1|FFE1
         GuidType = 'Event'\r
         VariableName = ''\r
         HelpStr = ''\r
-        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType, \r
+        Guid1 = self.GuidFactory(CName, FFE, Usage, GuidType,\r
                                  VariableName, HelpStr)\r
         GuidList.append(Guid1)\r
-                      \r
+\r
         Result = GenGuidSections(GuidList)\r
         Expected = '''[Guids]\r
 ## PRODUCES ## GUID\r
@@ -509,17 +509,17 @@ Guid1|FFE1
 Guid1|FFE1\r
 '''\r
         self.assertEqual(Result.strip(), Expected.strip())\r
-        \r
+\r
 #\r
 # Test GenProtocolPPiSections\r
 #\r
 class GenProtocolPPiSectionsTest(unittest.TestCase):\r
     def setUp(self):\r
-        pass      \r
+        pass\r
 \r
     def tearDown(self):\r
         pass\r
-    \r
+\r
     #\r
     # This is the API to generate Protocol/Ppi Object to help UnitTest\r
     #\r
@@ -528,7 +528,7 @@ class GenProtocolPPiSectionsTest(unittest.TestCase):
             Object = ProtocolObject()\r
         else:\r
             Object = PpiObject()\r
-        \r
+\r
         Object.SetCName(CName)\r
         Object.SetFeatureFlag(FFE)\r
         Object.SetUsage(Usage)\r
@@ -538,8 +538,8 @@ class GenProtocolPPiSectionsTest(unittest.TestCase):
         HelpTextObj.SetLang('')\r
         HelpTextObj.SetString(HelpStr)\r
         Object.SetHelpTextList([HelpTextObj])\r
-        \r
-        return Object      \r
+\r
+        return Object\r
 \r
     #    Usage        Notify    Help    INF Comment\r
     #1   UNDEFINED    true    Present    ## UNDEFINED ## NOTIFY # Help\r
@@ -557,19 +557,19 @@ class GenProtocolPPiSectionsTest(unittest.TestCase):
 \r
     def testNormalCase1(self):\r
         ObjectList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
-        \r
+\r
         Usage = 'UNDEFINED'\r
         Notify = True\r
         HelpStr = 'Help'\r
         IsProtocol = True\r
-        Object = self.ObjectFactory(CName, FFE, Usage, Notify, \r
+        Object = self.ObjectFactory(CName, FFE, Usage, Notify,\r
                                  HelpStr, IsProtocol)\r
         ObjectList.append(Object)\r
-      \r
-        \r
+\r
+\r
         Result = GenProtocolPPiSections(ObjectList, IsProtocol)\r
         Expected = '''[Protocols]\r
 Guid1|FFE1 ## UNDEFINED ## NOTIFY # Help'''\r
@@ -577,11 +577,11 @@ Guid1|FFE1 ## UNDEFINED ## NOTIFY # Help'''
 \r
         IsProtocol = False\r
         ObjectList = []\r
-        Object = self.ObjectFactory(CName, FFE, Usage, Notify, \r
+        Object = self.ObjectFactory(CName, FFE, Usage, Notify,\r
                                  HelpStr, IsProtocol)\r
         ObjectList.append(Object)\r
-      \r
-        \r
+\r
+\r
         Result = GenProtocolPPiSections(ObjectList, IsProtocol)\r
         Expected = '''[Ppis]\r
 Guid1|FFE1 ## UNDEFINED ## NOTIFY # Help'''\r
@@ -589,19 +589,19 @@ Guid1|FFE1 ## UNDEFINED ## NOTIFY # Help'''
 \r
     def testNormalCase2(self):\r
         ObjectList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
-        \r
+\r
         Usage = 'UNDEFINED'\r
         Notify = True\r
         HelpStr = ''\r
         IsProtocol = True\r
-        Object = self.ObjectFactory(CName, FFE, Usage, Notify, \r
+        Object = self.ObjectFactory(CName, FFE, Usage, Notify,\r
                                  HelpStr, IsProtocol)\r
         ObjectList.append(Object)\r
-      \r
-        \r
+\r
+\r
         Result = GenProtocolPPiSections(ObjectList, IsProtocol)\r
         Expected = '''[Protocols]\r
 Guid1|FFE1 ## UNDEFINED ## NOTIFY'''\r
@@ -609,19 +609,19 @@ Guid1|FFE1 ## UNDEFINED ## NOTIFY'''
 \r
     def testNormalCase3(self):\r
         ObjectList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
-        \r
+\r
         Usage = 'UNDEFINED'\r
         Notify = False\r
         HelpStr = 'Help'\r
         IsProtocol = True\r
-        Object = self.ObjectFactory(CName, FFE, Usage, Notify, \r
+        Object = self.ObjectFactory(CName, FFE, Usage, Notify,\r
                                  HelpStr, IsProtocol)\r
         ObjectList.append(Object)\r
-      \r
-        \r
+\r
+\r
         Result = GenProtocolPPiSections(ObjectList, IsProtocol)\r
         Expected = '''[Protocols]\r
 Guid1|FFE1 ## UNDEFINED # Help'''\r
@@ -629,19 +629,19 @@ Guid1|FFE1 ## UNDEFINED # Help'''
 \r
     def testNormalCase4(self):\r
         ObjectList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
-        \r
+\r
         Usage = 'UNDEFINED'\r
         Notify = False\r
         HelpStr = ''\r
         IsProtocol = True\r
-        Object = self.ObjectFactory(CName, FFE, Usage, Notify, \r
+        Object = self.ObjectFactory(CName, FFE, Usage, Notify,\r
                                  HelpStr, IsProtocol)\r
         ObjectList.append(Object)\r
-      \r
-        \r
+\r
+\r
         Result = GenProtocolPPiSections(ObjectList, IsProtocol)\r
         Expected = '''[Protocols]\r
 Guid1|FFE1 ## UNDEFINED'''\r
@@ -649,19 +649,19 @@ Guid1|FFE1 ## UNDEFINED'''
 \r
     def testNormalCase5(self):\r
         ObjectList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
-        \r
+\r
         Usage = 'UNDEFINED'\r
         Notify = ''\r
         HelpStr = 'Help'\r
         IsProtocol = True\r
-        Object = self.ObjectFactory(CName, FFE, Usage, Notify, \r
+        Object = self.ObjectFactory(CName, FFE, Usage, Notify,\r
                                  HelpStr, IsProtocol)\r
         ObjectList.append(Object)\r
-      \r
-        \r
+\r
+\r
         Result = GenProtocolPPiSections(ObjectList, IsProtocol)\r
         Expected = '''[Protocols]\r
 Guid1|FFE1 # Help'''\r
@@ -669,19 +669,19 @@ Guid1|FFE1 # Help'''
 \r
     def testNormalCase6(self):\r
         ObjectList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
-        \r
+\r
         Usage = 'UNDEFINED'\r
         Notify = ''\r
         HelpStr = ''\r
         IsProtocol = True\r
-        Object = self.ObjectFactory(CName, FFE, Usage, Notify, \r
+        Object = self.ObjectFactory(CName, FFE, Usage, Notify,\r
                                  HelpStr, IsProtocol)\r
         ObjectList.append(Object)\r
-      \r
-        \r
+\r
+\r
         Result = GenProtocolPPiSections(ObjectList, IsProtocol)\r
         Expected = '''[Protocols]\r
 Guid1|FFE1'''\r
@@ -689,19 +689,19 @@ Guid1|FFE1'''
 \r
     def testNormalCase7(self):\r
         ObjectList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
-        \r
+\r
         Usage = 'PRODUCES'\r
         Notify = True\r
         HelpStr = 'Help'\r
         IsProtocol = True\r
-        Object = self.ObjectFactory(CName, FFE, Usage, Notify, \r
+        Object = self.ObjectFactory(CName, FFE, Usage, Notify,\r
                                  HelpStr, IsProtocol)\r
         ObjectList.append(Object)\r
-      \r
-        \r
+\r
+\r
         Result = GenProtocolPPiSections(ObjectList, IsProtocol)\r
         Expected = '''[Protocols]\r
 Guid1|FFE1 ## PRODUCES ## NOTIFY # Help'''\r
@@ -709,19 +709,19 @@ Guid1|FFE1 ## PRODUCES ## NOTIFY # Help'''
 \r
     def testNormalCase8(self):\r
         ObjectList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
-        \r
+\r
         Usage = 'PRODUCES'\r
         Notify = True\r
         HelpStr = ''\r
         IsProtocol = True\r
-        Object = self.ObjectFactory(CName, FFE, Usage, Notify, \r
+        Object = self.ObjectFactory(CName, FFE, Usage, Notify,\r
                                  HelpStr, IsProtocol)\r
         ObjectList.append(Object)\r
-      \r
-        \r
+\r
+\r
         Result = GenProtocolPPiSections(ObjectList, IsProtocol)\r
         Expected = '''[Protocols]\r
 Guid1|FFE1 ## PRODUCES ## NOTIFY'''\r
@@ -729,19 +729,19 @@ Guid1|FFE1 ## PRODUCES ## NOTIFY'''
 \r
     def testNormalCase9(self):\r
         ObjectList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
-        \r
+\r
         Usage = 'PRODUCES'\r
         Notify = False\r
         HelpStr = 'Help'\r
         IsProtocol = True\r
-        Object = self.ObjectFactory(CName, FFE, Usage, Notify, \r
+        Object = self.ObjectFactory(CName, FFE, Usage, Notify,\r
                                  HelpStr, IsProtocol)\r
         ObjectList.append(Object)\r
-      \r
-        \r
+\r
+\r
         Result = GenProtocolPPiSections(ObjectList, IsProtocol)\r
         Expected = '''[Protocols]\r
 Guid1|FFE1 ## PRODUCES # Help'''\r
@@ -749,19 +749,19 @@ Guid1|FFE1 ## PRODUCES # Help'''
 \r
     def testNormalCaseA(self):\r
         ObjectList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
-        \r
+\r
         Usage = 'PRODUCES'\r
         Notify = False\r
         HelpStr = ''\r
         IsProtocol = True\r
-        Object = self.ObjectFactory(CName, FFE, Usage, Notify, \r
+        Object = self.ObjectFactory(CName, FFE, Usage, Notify,\r
                                  HelpStr, IsProtocol)\r
         ObjectList.append(Object)\r
-      \r
-        \r
+\r
+\r
         Result = GenProtocolPPiSections(ObjectList, IsProtocol)\r
         Expected = '''[Protocols]\r
 Guid1|FFE1 ## PRODUCES'''\r
@@ -769,19 +769,19 @@ Guid1|FFE1 ## PRODUCES'''
 \r
     def testNormalCaseB(self):\r
         ObjectList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
-        \r
+\r
         Usage = 'PRODUCES'\r
         Notify = ''\r
         HelpStr = 'Help'\r
         IsProtocol = True\r
-        Object = self.ObjectFactory(CName, FFE, Usage, Notify, \r
+        Object = self.ObjectFactory(CName, FFE, Usage, Notify,\r
                                  HelpStr, IsProtocol)\r
         ObjectList.append(Object)\r
-      \r
-        \r
+\r
+\r
         Result = GenProtocolPPiSections(ObjectList, IsProtocol)\r
         Expected = '''[Protocols]\r
 Guid1|FFE1 ## PRODUCES # Help'''\r
@@ -789,19 +789,19 @@ Guid1|FFE1 ## PRODUCES # Help'''
 \r
     def testNormalCaseC(self):\r
         ObjectList = []\r
-        \r
+\r
         CName = 'Guid1'\r
         FFE = 'FFE1'\r
-        \r
+\r
         Usage = 'PRODUCES'\r
         Notify = ''\r
         HelpStr = ''\r
         IsProtocol = True\r
-        Object = self.ObjectFactory(CName, FFE, Usage, Notify, \r
+        Object = self.ObjectFactory(CName, FFE, Usage, Notify,\r
                                  HelpStr, IsProtocol)\r
         ObjectList.append(Object)\r
-      \r
-        \r
+\r
+\r
         Result = GenProtocolPPiSections(ObjectList, IsProtocol)\r
         Expected = '''[Protocols]\r
 Guid1|FFE1 ## PRODUCES'''\r
@@ -812,18 +812,18 @@ Guid1|FFE1 ## PRODUCES'''
 #\r
 class GenPcdSectionsTest(unittest.TestCase):\r
     def setUp(self):\r
-        pass      \r
+        pass\r
 \r
     def tearDown(self):\r
         pass\r
-    \r
+\r
     #\r
     # This is the API to generate Pcd Object to help UnitTest\r
     #\r
     def ObjectFactory(self, ItemType, TSCName, CName, DValue, FFE, Usage, Str):\r
         Object = PcdObject()\r
         HelpStr = Str\r
-        \r
+\r
         Object.SetItemType(ItemType)\r
         Object.SetTokenSpaceGuidCName(TSCName)\r
         Object.SetCName(CName)\r
@@ -835,8 +835,8 @@ class GenPcdSectionsTest(unittest.TestCase):
         HelpTextObj.SetLang('')\r
         HelpTextObj.SetString(HelpStr)\r
         Object.SetHelpTextList([HelpTextObj])\r
-        \r
-        return Object      \r
+\r
+        return Object\r
 \r
 \r
     #    Usage        Help    INF Comment\r
@@ -852,14 +852,14 @@ class GenPcdSectionsTest(unittest.TestCase):
         CName = 'CName'\r
         DValue = 'DValue'\r
         FFE = 'FFE'\r
-        \r
+\r
         Usage = 'UNDEFINED'\r
         Str = 'Help'\r
\r
-        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE, \r
+\r
+        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE,\r
                                     Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenPcdSections(ObjectList)\r
         Expected = \\r
             '[Pcd]\n' + \\r
@@ -873,14 +873,14 @@ class GenPcdSectionsTest(unittest.TestCase):
         CName = 'CName'\r
         DValue = 'DValue'\r
         FFE = 'FFE'\r
-        \r
+\r
         Usage = 'UNDEFINED'\r
         Str = ''\r
\r
-        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE, \r
+\r
+        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE,\r
                                     Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenPcdSections(ObjectList)\r
         Expected = '[Pcd]\nTSCName.CName|DValue|FFE'\r
         self.assertEqual(Result.strip(), Expected)\r
@@ -892,14 +892,14 @@ class GenPcdSectionsTest(unittest.TestCase):
         CName = 'CName'\r
         DValue = 'DValue'\r
         FFE = 'FFE'\r
-        \r
+\r
         Usage = 'CONSUMES'\r
         Str = 'Help'\r
\r
-        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE, \r
+\r
+        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE,\r
                                     Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenPcdSections(ObjectList)\r
         Expected = '[Pcd]\nTSCName.CName|DValue|FFE ## CONSUMES # Help'\r
         self.assertEqual(Result.strip(), Expected)\r
@@ -911,14 +911,14 @@ class GenPcdSectionsTest(unittest.TestCase):
         CName = 'CName'\r
         DValue = 'DValue'\r
         FFE = 'FFE'\r
-        \r
+\r
         Usage = 'CONSUMES'\r
         Str = ''\r
\r
-        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE, \r
+\r
+        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE,\r
                                     Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenPcdSections(ObjectList)\r
         Expected = '[Pcd]\nTSCName.CName|DValue|FFE ## CONSUMES'\r
         self.assertEqual(Result.strip(), Expected)\r
@@ -933,13 +933,13 @@ class GenPcdSectionsTest(unittest.TestCase):
         CName = 'CName'\r
         DValue = 'DValue'\r
         FFE = 'FFE'\r
-        \r
+\r
         Usage = 'CONSUMES'\r
         Str = 'commment line 1\ncomment line 2'\r
-        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE, \r
+        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE,\r
                                     Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenPcdSections(ObjectList)\r
         Expected = '''[Pcd]\r
 TSCName.CName|DValue|FFE ## CONSUMES # commment line 1 comment line 2'''\r
@@ -955,19 +955,19 @@ TSCName.CName|DValue|FFE ## CONSUMES # commment line 1 comment line 2'''
         CName = 'CName'\r
         DValue = 'DValue'\r
         FFE = 'FFE'\r
-        \r
+\r
         Usage = 'UNDEFINED'\r
         Str = 'commment line 1\ncomment line 2'\r
-        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE, \r
+        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE,\r
                                     Usage, Str)\r
         ObjectList.append(Object)\r
 \r
         Usage = 'UNDEFINED'\r
         Str = 'commment line 3'\r
-        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE, \r
+        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE,\r
                                     Usage, Str)\r
         ObjectList.append(Object)\r
-                \r
+\r
         Result = GenPcdSections(ObjectList)\r
         Expected = '''[Pcd]\r
 # commment line 1\r
@@ -986,25 +986,25 @@ TSCName.CName|DValue|FFE'''
         CName = 'CName'\r
         DValue = 'DValue'\r
         FFE = 'FFE'\r
-        \r
+\r
         Usage = 'UNDEFINED'\r
         Str = 'commment line 1\ncomment line 2'\r
-        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE, \r
+        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE,\r
                                     Usage, Str)\r
         ObjectList.append(Object)\r
 \r
         Usage = 'CONSUMES'\r
         Str = 'Foo'\r
-        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE, \r
+        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE,\r
                                     Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Usage = 'UNDEFINED'\r
         Str = 'commment line 3'\r
-        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE, \r
+        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE,\r
                                     Usage, Str)\r
         ObjectList.append(Object)\r
-                \r
+\r
         Result = GenPcdSections(ObjectList)\r
         Expected = '''[Pcd]\r
 # commment line 1\r
@@ -1028,13 +1028,13 @@ TSCName.CName|DValue|FFE'''
         CName = 'CName'\r
         DValue = 'DValue'\r
         FFE = 'FFE'\r
-        \r
+\r
         Usage = 'CONSUMES'\r
         Str = 'commment line 1\ncomment line 2'\r
-        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE, \r
+        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE,\r
                                     Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenPcdSections(ObjectList)\r
         Expected = '''[FeaturePcd]\r
 # commment line 1\r
@@ -1052,13 +1052,13 @@ TSCName.CName|DValue|FFE'''
         CName = 'CName'\r
         DValue = 'DValue'\r
         FFE = 'FFE'\r
-        \r
+\r
         Usage = 'CONSUMES'\r
         Str = ''\r
-        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE, \r
+        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE,\r
                                     Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenPcdSections(ObjectList)\r
         Expected = '''[FeaturePcd]\r
 TSCName.CName|DValue|FFE'''\r
@@ -1074,13 +1074,13 @@ TSCName.CName|DValue|FFE'''
         CName = 'CName'\r
         DValue = 'DValue'\r
         FFE = 'FFE'\r
-        \r
+\r
         Usage = 'PRODUCES'\r
         Str = 'commment line 1\ncomment line 2'\r
-        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE, \r
+        Object = self.ObjectFactory(ItemType, TSCName, CName, DValue, FFE,\r
                                     Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenPcdSections(ObjectList)\r
         Expected = '''\r
 \r
@@ -1097,28 +1097,28 @@ TSCName.CName|DValue|FFE
 #\r
 class GenHobSectionsTest(unittest.TestCase):\r
     def setUp(self):\r
-        pass      \r
+        pass\r
 \r
     def tearDown(self):\r
         pass\r
-    \r
+\r
     #\r
     # This is the API to generate Event Object to help UnitTest\r
     #\r
     def ObjectFactory(self, SupArchList, Type, Usage, Str):\r
         Object = HobObject()\r
         HelpStr = Str\r
-        \r
+\r
         Object.SetHobType(Type)\r
         Object.SetUsage(Usage)\r
         Object.SetSupArchList(SupArchList)\r
-        \r
+\r
         HelpTextObj = TextObject()\r
         HelpTextObj.SetLang('')\r
         HelpTextObj.SetString(HelpStr)\r
         Object.SetHelpTextList([HelpTextObj])\r
-        \r
-        return Object      \r
+\r
+        return Object\r
 \r
     def testNormalCase1(self):\r
         ObjectList = []\r
@@ -1126,10 +1126,10 @@ class GenHobSectionsTest(unittest.TestCase):
         Type = 'Foo'\r
         Usage = 'UNDEFINED'\r
         Str = 'Help'\r
\r
+\r
         Object = self.ObjectFactory(SupArchList, Type, Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenSpecialSections(ObjectList, 'Hob')\r
         Expected = '''# [Hob.X64]\r
 # ##\r
@@ -1147,10 +1147,10 @@ class GenHobSectionsTest(unittest.TestCase):
         Type = 'Foo'\r
         Usage = 'UNDEFINED'\r
         Str = 'Help'\r
\r
+\r
         Object = self.ObjectFactory(SupArchList, Type, Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenSpecialSections(ObjectList, 'Hob')\r
         Expected = '''# [Hob]\r
 # ##\r
@@ -1161,17 +1161,17 @@ class GenHobSectionsTest(unittest.TestCase):
 #\r
 '''\r
         self.assertEqual(Result, Expected)\r
-        \r
+\r
     def testNormalCase3(self):\r
         ObjectList = []\r
         SupArchList = ['X64']\r
         Type = 'Foo'\r
         Usage = 'UNDEFINED'\r
         Str = '\nComment Line 1\n\n'\r
\r
+\r
         Object = self.ObjectFactory(SupArchList, Type, Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenSpecialSections(ObjectList, 'Hob')\r
         Expected = '''# [Hob.X64]\r
 # ##\r
@@ -1189,10 +1189,10 @@ class GenHobSectionsTest(unittest.TestCase):
         Type = 'Foo'\r
         Usage = 'UNDEFINED'\r
         Str = '\nComment Line 1\n'\r
\r
+\r
         Object = self.ObjectFactory(SupArchList, Type, Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenSpecialSections(ObjectList, 'Hob')\r
         Expected = '''# [Hob.X64]\r
 # ##\r
@@ -1210,10 +1210,10 @@ class GenHobSectionsTest(unittest.TestCase):
         Type = 'Foo'\r
         Usage = 'UNDEFINED'\r
         Str = 'Comment Line 1\n\n'\r
\r
+\r
         Object = self.ObjectFactory(SupArchList, Type, Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenSpecialSections(ObjectList, 'Hob')\r
         Expected = '''# [Hob.X64]\r
 # ##\r
@@ -1231,17 +1231,17 @@ class GenHobSectionsTest(unittest.TestCase):
         Type = 'Foo'\r
         Usage = 'UNDEFINED'\r
         Str = ''\r
-        \r
+\r
         Object = self.ObjectFactory(SupArchList, Type, Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenSpecialSections(ObjectList, 'Hob')\r
         Expected = '''# [Hob.X64]\r
 # Foo ## UNDEFINED\r
 #\r
 #\r
 '''\r
-        self.assertEqual(Result, Expected)    \r
+        self.assertEqual(Result, Expected)\r
 \r
     def testNormalCase7(self):\r
         ObjectList = []\r
@@ -1250,10 +1250,10 @@ class GenHobSectionsTest(unittest.TestCase):
         Usage = 'UNDEFINED'\r
         Str = '\nNew Stack HoB'\r
 \r
-        \r
+\r
         Object = self.ObjectFactory(SupArchList, Type, Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenSpecialSections(ObjectList, 'Hob')\r
         Expected = '''# [Hob.X64]\r
 # ##\r
@@ -1272,10 +1272,10 @@ class GenHobSectionsTest(unittest.TestCase):
         Usage = 'UNDEFINED'\r
         Str = '\nNew Stack HoB\n\nTail Comment'\r
 \r
-        \r
+\r
         Object = self.ObjectFactory(SupArchList, Type, Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenSpecialSections(ObjectList, 'Hob')\r
         Expected = '''# [Hob.X64]\r
 # ##\r
@@ -1287,7 +1287,7 @@ class GenHobSectionsTest(unittest.TestCase):
 #\r
 #\r
 '''\r
-        self.assertEqual(Result, Expected) \r
+        self.assertEqual(Result, Expected)\r
 \r
     def testNormalCase9(self):\r
         ObjectList = []\r
@@ -1296,10 +1296,10 @@ class GenHobSectionsTest(unittest.TestCase):
         Usage = 'UNDEFINED'\r
         Str = '\n\n'\r
 \r
-        \r
+\r
         Object = self.ObjectFactory(SupArchList, Type, Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenSpecialSections(ObjectList, 'Hob')\r
         Expected = '''# [Hob.X64]\r
 # ##\r
@@ -1309,7 +1309,7 @@ class GenHobSectionsTest(unittest.TestCase):
 #\r
 #\r
 '''\r
-        self.assertEqual(Result, Expected) \r
+        self.assertEqual(Result, Expected)\r
 \r
     def testNormalCase10(self):\r
         ObjectList = []\r
@@ -1320,7 +1320,7 @@ class GenHobSectionsTest(unittest.TestCase):
 \r
         Object = self.ObjectFactory(SupArchList, Type, Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenSpecialSections(ObjectList, 'Hob')\r
         Expected = '''# [Hob.X64]\r
 # ##\r
@@ -1330,7 +1330,7 @@ class GenHobSectionsTest(unittest.TestCase):
 #\r
 #\r
 '''\r
-        self.assertEqual(Result, Expected) \r
+        self.assertEqual(Result, Expected)\r
 \r
     def testNormalCase11(self):\r
         ObjectList = []\r
@@ -1341,7 +1341,7 @@ class GenHobSectionsTest(unittest.TestCase):
 \r
         Object = self.ObjectFactory(SupArchList, Type, Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenSpecialSections(ObjectList, 'Hob')\r
         Expected = '''# [Hob.X64]\r
 # ##\r
@@ -1351,7 +1351,7 @@ class GenHobSectionsTest(unittest.TestCase):
 #\r
 #\r
 '''\r
-        self.assertEqual(Result, Expected) \r
+        self.assertEqual(Result, Expected)\r
 \r
     def testNormalCase12(self):\r
         ObjectList = []\r
@@ -1362,7 +1362,7 @@ class GenHobSectionsTest(unittest.TestCase):
 \r
         Object = self.ObjectFactory(SupArchList, Type, Usage, Str)\r
         ObjectList.append(Object)\r
-        \r
+\r
         Result = GenSpecialSections(ObjectList, 'Hob')\r
         Expected = '''# [Hob.X64]\r
 # ##\r
@@ -1373,18 +1373,18 @@ class GenHobSectionsTest(unittest.TestCase):
 #\r
 #\r
 '''\r
-        self.assertEqual(Result, Expected) \r
-    \r
+        self.assertEqual(Result, Expected)\r
+\r
 #\r
 # Test GenGenericCommentF\r
 #\r
 class GenGenericCommentFTest(unittest.TestCase):\r
     def setUp(self):\r
-        pass      \r
+        pass\r
 \r
     def tearDown(self):\r
         pass\r
-    \r
+\r
     def testNormalCase1(self):\r
         CommentLines = 'Comment Line 1'\r
         Result = GenGenericCommentF(CommentLines)\r
@@ -1395,26 +1395,26 @@ class GenGenericCommentFTest(unittest.TestCase):
         CommentLines = '\n'\r
         Result = GenGenericCommentF(CommentLines)\r
         Expected = '#\n'\r
-        self.assertEqual(Result, Expected)        \r
+        self.assertEqual(Result, Expected)\r
 \r
     def testNormalCase3(self):\r
         CommentLines = '\n\n\n'\r
         Result = GenGenericCommentF(CommentLines)\r
         Expected = '#\n#\n#\n'\r
-        self.assertEqual(Result, Expected)  \r
+        self.assertEqual(Result, Expected)\r
 \r
     def testNormalCase4(self):\r
         CommentLines = 'coment line 1\n'\r
         Result = GenGenericCommentF(CommentLines)\r
         Expected = '# coment line 1\n'\r
-        self.assertEqual(Result, Expected)  \r
-        \r
+        self.assertEqual(Result, Expected)\r
+\r
     def testNormalCase5(self):\r
         CommentLines = 'coment line 1\n coment line 2\n'\r
         Result = GenGenericCommentF(CommentLines)\r
         Expected = '# coment line 1\n# coment line 2\n'\r
-        self.assertEqual(Result, Expected)          \r
-                \r
+        self.assertEqual(Result, Expected)\r
+\r
 if __name__ == '__main__':\r
     Logger.Initialize()\r
-    unittest.main()
\ No newline at end of file
+    unittest.main()\r