Add new and improved license rules and tests

This is fixing failing tests following new rules added for
#1418 and #1419

Reported-by: John M. Horan <jmhoran@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>

Author: pombredanne

src/licensedcode/data/licenses/jython.yml

@@ -6,3 +6,4 @@ owner: Python Software Foundation (PSF)
 homepage_url: http://www.jython.org/license.txt
 text_urls:
     - http://www.jython.org/license.txt
+notes: this is a complex composite of multiple licenses

src/licensedcode/data/rules/apache-2.0_162.RULE

@@ -0,0 +1,2 @@
+The command line interpreter is covered by the Apache Software
+License. See the org/apache/LICENSE file for details.

src/licensedcode/data/rules/apache-2.0_162.yml

@@ -0,0 +1,4 @@
+license_expression: apache-2.0
+is_license_notice: yes
+referenced_filenames:
+    - org/apache/LICENSE

src/licensedcode/data/rules/apache-2.0_30.yml

@@ -1,3 +1,4 @@
 license_expression: apache-2.0
 is_license_notice: yes
 notes: Apache license variant
+minimum_coverage: 20

src/licensedcode/data/rules/bsd-new_312.RULE

@@ -0,0 +1,26 @@
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in
+the documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Developers nor the names of
+its contributors may be used to endorse or promote products
+derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+PROFITS; OR BUSINESS INTERRUPTION) 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.

src/licensedcode/data/rules/bsd-new_312.yml

@@ -0,0 +1,2 @@
+license_expression: bsd-new
+is_license_text: yes

src/licensedcode/data/rules/jython_1.RULE …sedcode/data/rules/bsd-new_jython_1.RULEsrc/licensedcode/data/rules/jython_1.RULE renamed to src/licensedcode/data/rules/bsd-new_jython_1.RULE src/licensedcode/data/rules/jython_1.RULE renamed to src/licensedcode/data/rules/bsd-new_jython_1.RULE

@@ -1,8 +1,6 @@
 Jython 2.0, 2.1 License
 --------------------------------------------
 
-Copyright (c) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Jython Developers
-All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions
@@ -15,7 +13,7 @@ are met:
    notice, this list of conditions and the following disclaimer in
    the documentation and/or other materials provided with the distribution.
 
- - Neither the name of the Jython Developers nor the names of
+ - Neither the name of the  Developers nor the names of
    its contributors may be used to endorse or promote products
    derived from this software without specific prior written permission.
 

src/licensedcode/data/rules/bsd-new_jython_1.yml

@@ -0,0 +1,2 @@
+license_expression: bsd-new
+is_license_text: yes

src/licensedcode/data/rules/bsd-new_jython_2.RULE

@@ -0,0 +1 @@
+Jython 2.0, 2.1 License

src/licensedcode/data/rules/bsd-new_jython_2.yml

@@ -0,0 +1,3 @@
+license_expression: bsd-new
+is_license_reference: yes
+relevance: 90