licenses: fix Wt IBPP regression coverage

Author: kumarasantosh

src/licensedcode/data/rules/ibpp_text.RULE

@@ -0,0 +1,28 @@
+---
+license_expression: ibpp
+is_license_text: yes
+relevance: 100
+notes: Full IBPP text variant with the inserted copyright line seen in the Wt appendix.
+---
+IBPP License v1.1
+-----------------
+
+(C) Copyright 2000-2006 T.I.P. Group S.A. and the IBPP Team (www.ibpp.org)
+
+Permission is hereby granted, free of charge, to any person or organization
+("You") obtaining a copy of this software and associated documentation files
+covered by this license (the "Software") to use the Software as part of another
+work; to modify it for that purpose; to publish or distribute it, modified or
+not, for that same purpose; to permit persons to whom the other work using the
+Software is furnished to do so; subject to the following conditions: the above
+copyright notice and this complete and unmodified permission notice shall be
+included in all copies or substantial portions of the Software; You will not
+misrepresent modified versions of the Software as being the original.
+
+The Software is provided "as is", without warranty of any kind, express or
+implied, including but not limited to the warranties of merchantability,
+fitness for a particular purpose and noninfringement.  In no event shall
+the authors or copyright holders be liable for any claim, damages or other
+liability, whether in an action of contract, tort or otherwise, arising from,
+out of or in connection with the software or the use of other dealings in
+the Software.

tests/licensedcode/data/datadriven/lic1/wt_ibpp_interference.md

@@ -1,4 +1,6 @@
-passwdqc
+### passwdqc
+
+```
 Copyright (c) 2000-2002 by Solar Designer
 Copyright (c) 2008,2009 by Dmitry V. Levin
 Redistribution and use in source and binary forms, with or without
@@ -15,12 +17,51 @@ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 SUCH DAMAGE.
+```
+
+### Sha1
+
+```
+Copyright (C) 1998, 2009
+Paul E. Jones <paulej@packetizer.com>
+All Rights Reserved
 
-| IBPP | Wt::Dbo Firebird backend | IBPP License, see appendix | Copyright 2000-2006 T.I.P. Group S.A. and the IBPP Team |
+Freeware Public License (FPL)
+
+This software is licensed as "freeware."  Permission to distribute
+this software in source and binary forms, including incorporation
+into other products, is hereby granted without a fee.  THIS SOFTWARE
+IS PROVIDED 'AS IS' AND WITHOUT ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND FITNESS FOR A PARTICULAR PURPOSE.  THE AUTHOR SHALL NOT BE HELD
+LIABLE FOR ANY DAMAGES RESULTING FROM THE USE OF THIS SOFTWARE, EITHER
+DIRECTLY OR INDIRECTLY, INCLUDING, BUT NOT LIMITED TO, LOSS OF DATA
+OR DATA BEING RENDERED INACCURATE.
+```
 
 ### IBPP
 
+```
 IBPP License v1.1
 -----------------
 
 (C) Copyright 2000-2006 T.I.P. Group S.A. and the IBPP Team (www.ibpp.org)
+
+Permission is hereby granted, free of charge, to any person or organization
+("You") obtaining a copy of this software and associated documentation files
+covered by this license (the "Software") to use the Software as part of another
+work; to modify it for that purpose; to publish or distribute it, modified or
+not, for that same purpose; to permit persons to whom the other work using the
+Software is furnished to do so; subject to the following conditions: the above
+copyright notice and this complete and unmodified permission notice shall be
+included in all copies or substantial portions of the Software; You will not
+misrepresent modified versions of the Software as being the original.
+
+The Software is provided "as is", without warranty of any kind, express or
+implied, including but not limited to the warranties of merchantability,
+fitness for a particular purpose and noninfringement.  In no event shall
+the authors or copyright holders be liable for any claim, damages or other
+liability, whether in an action of contract, tort or otherwise, arising from,
+out of or in connection with the software or the use of other dealings in
+the Software.
+```

tests/licensedcode/data/datadriven/lic1/wt_ibpp_interference.md.yml

@@ -1,5 +1,5 @@
-notes: Minimal Wt-derived regression fixture for issue #3553, keeping the passwdqc disclaimer immediately before the IBPP reference and appendix intro.
+notes: Wt-derived appendix excerpt for issue #3553, preserving the upstream passwdqc and Sha1 blocks immediately before the IBPP appendix text without the table-row reference shortcut.
 license_expressions:
   - bsd-1-clause
-  - ibpp
+  - fpl
   - ibpp

tests/licensedcode/test_plugin_license_detection.py

@@ -377,6 +377,10 @@ def test_match_reference_license():
 
 
 def test_wt_ibpp_interference_is_detected_in_scan_output():
+    from licensedcode.cache import get_index
+
+    get_index(force=True)
+
     test_file = test_env.get_test_loc('datadriven/lic1/wt_ibpp_interference.md')
     result_file = test_env.get_temp_file('json')
     args = [
@@ -395,9 +399,9 @@ def test_wt_ibpp_interference_is_detected_in_scan_output():
     codebase = VirtualCodebase(result_file)
     resource = codebase.get_resource(path='wt_ibpp_interference.md')
 
-    assert resource.detected_license_expression == 'bsd-1-clause AND ibpp'
+    assert resource.detected_license_expression == 'bsd-1-clause AND fpl AND ibpp'
     assert any(
-        match['license_expression'] == 'ibpp'
+        match['rule_identifier'] in {'ibpp.LICENSE', 'ibpp_text.RULE'}
         for detection in resource.license_detections
         for match in detection['matches']
     )