Author: rdonkin
Date: Fri Dec 6 19:34:37 2013
New Revision: 1548691
URL: http://svn.apache.org/r1548691
Log:
Convert ApacheSoftwareLicense20 to use LicenseFamily constructor
Modified:
creadur/rat/branches/gsoc/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
creadur/rat/branches/gsoc/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
Modified:
creadur/rat/branches/gsoc/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java?rev=1548691&r1=1548690&r2=1548691&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-api/src/main/java/org/apache/rat/api/domain/RatLicenseFamily.java
Fri Dec 6 19:34:37 2013
@@ -25,6 +25,11 @@ import static org.apache.rat.api.domain.
*/
public enum RatLicenseFamily {
+ APACHE(
+ "Apache License Version 2.0",
+ "AL ",
+ "Note that APACHE requires a NOTICE. All modifications
require notes. See http://www.apache.org/licenses/LICENSE-2.0.";),
+
W3C(
"W3C Software Copyright",
"W3C ",
Modified:
creadur/rat/branches/gsoc/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java?rev=1548691&r1=1548690&r2=1548691&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-api/src/test/java/org/apache/rat/api/domain/RatLicenseFamilyTest.java
Fri Dec 6 19:34:37 2013
@@ -18,6 +18,7 @@
*/
package org.apache.rat.api.domain;
+import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
import static org.apache.rat.api.domain.RatLicenseFamily.W3C;
import static org.apache.rat.api.domain.RatLicenseFamily.W3C_DOCUMENTATION;
import static org.hamcrest.CoreMatchers.is;
@@ -60,4 +61,21 @@ public class RatLicenseFamilyTest {
W3C_DOCUMENTATION.getNotes(),
is("Note that W3CD does not allow modifications. See
http://www.w3.org/Consortium/Legal/2002/copyright-documents-20021231.";));
}
+
+ @Test
+ public void testAPACHELicenseFamilyCategory() {
+ assertThat(APACHE.getCategory(), is("AL "));
+ }
+
+ @Test
+ public void testAPACHELicenseFamilyName() {
+ assertThat(APACHE.getName(), is("Apache License Version 2.0"));
+ }
+
+ @Test
+ public void testAPACHELicenseFamilyNotes() {
+ assertThat(
+ APACHE.getNotes(),
+ is("Note that APACHE requires a NOTICE. All
modifications require notes. See http://www.apache.org/licenses/LICENSE-2.0.";));
+ }
}
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java?rev=1548691&r1=1548690&r2=1548691&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20.java
Fri Dec 6 19:34:37 2013
@@ -15,24 +15,24 @@
* KIND, either express or implied. See the License for the *
* specific language governing permissions and limitations *
* under the License. *
- */
+ */
package org.apache.rat.analysis.license;
-import org.apache.rat.api.MetaData;
+import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
/**
* Matches Apache License, Version 2.0
- *
+ *
*/
public final class ApacheSoftwareLicense20 extends SimplePatternBasedLicense {
- public static final String FIRST_LICENSE_LINE = "Licensed under the Apache
License, Version 2.0 (the \"License\")";
- public static final String LICENSE_REFERENCE_LINE =
"http://www.apache.org/licenses/LICENSE-2.0";;
+ public static final String FIRST_LICENSE_LINE = "Licensed under the
Apache License, Version 2.0 (the \"License\")";
+ public static final String LICENSE_REFERENCE_LINE =
"http://www.apache.org/licenses/LICENSE-2.0";;
- /**
+ /**
*
*/
- public ApacheSoftwareLicense20() {
- super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL,
MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0,
- "", new String[]{FIRST_LICENSE_LINE, LICENSE_REFERENCE_LINE});
- }
+ public ApacheSoftwareLicense20() {
+ super(APACHE.licenseFamily(), new String[] {
+ FIRST_LICENSE_LINE, LICENSE_REFERENCE_LINE });
+ }
}
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java?rev=1548691&r1=1548690&r2=1548691&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/AppliedApacheSoftwareLicense20.java
Fri Dec 6 19:34:37 2013
@@ -18,8 +18,9 @@
*/
package org.apache.rat.analysis.license;
+import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
+
import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
/**
* Matches an applied AL 2.0 License header, including a <em>required</em>
@@ -49,14 +50,9 @@ public class AppliedApacheSoftwareLicens
* Instantiates a new applied apache software license20.
*/
public AppliedApacheSoftwareLicense20() {
- super(
- MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL,
-
MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0,
- "");
- textMatcher = new FullTextMatchingLicense(
- MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL,
-
MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0,
- "", ASL20_LICENSE_DEFN);
+ super(APACHE.licenseFamily(), "");
+ textMatcher = new
FullTextMatchingLicense(APACHE.licenseFamily(),
+ ASL20_LICENSE_DEFN);
}
/**
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java?rev=1548691&r1=1548690&r2=1548691&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/CopyrightHeader.java
Fri Dec 6 19:34:37 2013
@@ -23,6 +23,7 @@ import java.util.regex.Pattern;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData.Datum;
+import org.apache.rat.api.domain.LicenseFamily;
/**
* Matches a typical Copyright header line only based on a regex pattern which
@@ -87,6 +88,20 @@ public class CopyrightHeader extends Bas
this(licenseFamilyCategory, licenseFamilyName, notes);
setCopyrightOwner(copyrightOwner);
}
+
+ /**
+ * Constructs a license indicated by the given patterns.
+ *
+ * @param pLicenseFamily
+ * not null
+ * @param copyrightOwner
+ * not null
+ */
+ protected CopyrightHeader(final LicenseFamily pLicenseFamily,
+ final String copyrightOwner) {
+ super(pLicenseFamily);
+ setCopyrightOwner(copyrightOwner);
+ }
// Called by ctor, so must not be overridden
/**
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java?rev=1548691&r1=1548690&r2=1548691&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/FullTextMatchingLicense.java
Fri Dec 6 19:34:37 2013
@@ -23,6 +23,7 @@ import java.util.Locale;
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData.Datum;
+import org.apache.rat.api.domain.LicenseFamily;
/**
* Accumulates all letters and numbers contained inside the header and compares
@@ -83,6 +84,20 @@ public class FullTextMatchingLicense ext
super(licenseFamilyCategory, licenseFamilyName, notes);
setFullText(fullText);
}
+
+ /**
+ * Constructs a license indicated by the given patterns.
+ *
+ * @param pLicenseFamily
+ * not null
+ * @param fullText
+ * not null
+ */
+ public FullTextMatchingLicense(final LicenseFamily pLicenseFamily,
+ final String fullText) {
+ super(pLicenseFamily);
+ setFullText(fullText);
+ }
/**
* Sets the full text.
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java?rev=1548691&r1=1548690&r2=1548691&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/api/MetaData.java
Fri Dec 6 19:34:37 2013
@@ -64,7 +64,6 @@ public class MetaData {
// Shortcuts used in report output, must be exactly 5 characters
public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_GEN = "GEN ";
public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN =
"?????";
- public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_ASL = "AL ";
public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_OASIS =
"OASIS";
public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_DOJO = "DOJO
";
public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_TMF = "TMF ";
@@ -80,9 +79,6 @@ public class MetaData {
public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_UNKNOWN = new
Datum(
RAT_URL_LICENSE_FAMILY_CATEGORY,
RAT_LICENSE_FAMILY_CATEGORY_VALUE_UNKNOWN);
- public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL = new
Datum(
- RAT_URL_LICENSE_FAMILY_CATEGORY,
- RAT_LICENSE_FAMILY_CATEGORY_VALUE_ASL);
public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_OASIS = new
Datum(
RAT_URL_LICENSE_FAMILY_CATEGORY,
RAT_LICENSE_FAMILY_CATEGORY_VALUE_OASIS);
@@ -114,7 +110,6 @@ public class MetaData {
public static final String
RAT_LICENSE_FAMILY_NAME_VALUE_W3C_DOCUMENT_COPYRIGHT = "W3C Document Copyright";
public static final String
RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE = "OASIS Open License";
public static final String
RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE = "Modified BSD License";
- public static final String
RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0 = "Apache License
Version 2.0";
public static final String RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_1 =
"GNU General Public License, version 1";
public static final String RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_2 =
"GNU General Public License, version 2";
public static final String RAT_LICENSE_FAMILY_NAME_VALUE_GPL_VERSION_3 =
"GNU General Public License, version 3";
@@ -128,9 +123,6 @@ public class MetaData {
public static final Datum
RAT_LICENSE_FAMILY_NAME_DATUM_MODIFIED_BSD_LICENSE = new Datum(
RAT_URL_LICENSE_FAMILY_NAME,
RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE);
- public static final Datum
RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0 = new Datum(
- RAT_URL_LICENSE_FAMILY_NAME,
- RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0);
public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_1 =
new Datum(
RAT_URL_LICENSE_FAMILY_NAME,
RAT_LICENSE_FAMILY_CATEGORY_VALUE_GPL1);
public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_GPL_VERSION_2 =
new Datum(
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java?rev=1548691&r1=1548690&r2=1548691&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/Apache20LicenseFamily.java
Fri Dec 6 19:34:37 2013
@@ -18,10 +18,10 @@
*/
package org.apache.rat.license;
-import org.apache.rat.api.MetaData;
+import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
public final class Apache20LicenseFamily extends SimpleLicenseFamily {
public Apache20LicenseFamily() {
-
super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0);
+ super(APACHE.getName());
}
}
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java?rev=1548691&r1=1548690&r2=1548691&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/policy/DefaultPolicy.java
Fri Dec 6 19:34:37 2013
@@ -18,8 +18,11 @@
*/
package org.apache.rat.policy;
+import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
import static org.apache.rat.api.domain.RatLicenseFamily.W3C;
+import java.util.Arrays;
+
import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
import org.apache.rat.api.MetaData.Datum;
@@ -27,13 +30,11 @@ import org.apache.rat.api.domain.RatLice
import org.apache.rat.document.IDocumentAnalyser;
import org.apache.rat.license.ILicenseFamily;
-import java.util.Arrays;
-
public class DefaultPolicy implements IDocumentAnalyser {
private static final String[] APPROVED_LICENSES = {
- MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_APACHE_LICENSE_VERSION_2_0,
- MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE,
- W3C.getName(),
+ APACHE.getName(),
+ MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE,
+ W3C.getName(),
RatLicenseFamily.W3C_DOCUMENTATION.getName(),
MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE,
MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MIT,
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java?rev=1548691&r1=1548690&r2=1548691&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/ApacheSoftwareLicense20Test.java
Fri Dec 6 19:34:37 2013
@@ -18,16 +18,17 @@
*/
package org.apache.rat.analysis.license;
-import org.apache.rat.analysis.license.BaseLicense;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
import org.apache.rat.api.MetaData.Datum;
import org.apache.rat.document.MockLocation;
import org.junit.Before;
import org.junit.Test;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
/**
*
*/
@@ -87,4 +88,22 @@ public class ApacheSoftwareLicense20Test
new BaseLicense(licenseFamilyCategory, licenseFamilyName,
notes);
}
+ @Test
+ public void testNotes() {
+ assertThat(
+ this.worker.getNotes(),
+ is("Note that APACHE requires a NOTICE. All
modifications require notes. See http://www.apache.org/licenses/LICENSE-2.0.";));
+ }
+
+ @Test
+ public void testCategory() {
+ assertThat(this.worker.getLicenseFamilyCategory(), is("AL "));
+ }
+
+ @Test
+ public void testName() {
+ assertThat(this.worker.getLicenseFamilyName(),
+ is("Apache License Version 2.0"));
+ }
+
}
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java?rev=1548691&r1=1548690&r2=1548691&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/CopyrightHeaderTest.java
Fri Dec 6 19:34:37 2013
@@ -18,11 +18,11 @@
*/
package org.apache.rat.analysis.license;
+import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertTrue;
import org.apache.rat.api.Document;
-import org.apache.rat.api.MetaData;
import org.apache.rat.document.MockLocation;
import org.junit.Before;
import org.junit.Test;
@@ -44,10 +44,7 @@ public class CopyrightHeaderTest {
@Before
public void setUp() throws Exception {
- header = new CopyrightHeader(
- MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_ASL,
-
MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0,
- "", "FooBar");
+ header = new CopyrightHeader(APACHE.licenseFamily(), "FooBar");
subject = new MockLocation("subject");
}
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java?rev=1548691&r1=1548690&r2=1548691&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/policy/DefaultPolicyTest.java
Fri Dec 6 19:34:37 2013
@@ -18,18 +18,18 @@
*/
package org.apache.rat.policy;
+import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
+import static org.apache.rat.api.domain.RatLicenseFamily.W3C;
+import static org.apache.rat.api.domain.RatLicenseFamily.W3C_DOCUMENTATION;
+import static org.junit.Assert.assertEquals;
+
import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
-import org.apache.rat.api.MetaData.Datum;
import org.apache.rat.document.MockLocation;
import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
import org.junit.Before;
import org.junit.Test;
-import static org.apache.rat.api.domain.RatLicenseFamily.W3C;
-import static org.apache.rat.api.domain.RatLicenseFamily.W3C_DOCUMENTATION;
-import static org.junit.Assert.assertEquals;
-
public class DefaultPolicyTest {
@@ -46,7 +46,9 @@ public class DefaultPolicyTest {
@Test
public void testALFamily() throws Exception {
-
subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_APACHE_LICENSE_VERSION_2_0);
+ subject.getMetaData().set(
+ new
MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, APACHE
+ .getName()));
policy.analyse(subject);
assertApproval(true);
}
