Author: rdonkin
Date: Fri Dec 6 19:49:23 2013
New Revision: 1548699
URL: http://svn.apache.org/r1548699
Log:
Convert MITLicense 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/MITLicense.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/MITLicenseFamily.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/MITLicenseTest.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=1548699&r1=1548698&r2=1548699&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:49:23 2013
@@ -41,6 +41,10 @@ public enum RatLicenseFamily {
"GNU General Public License, version 3",
"GPL3 ",
"Note that GPL3 requires a NOTICE. All modifications
require notes. See http://www.gnu.org/licenses/gpl-3.0.html.";),
+ MIT(
+ "The MIT License",
+ "MIT ",
+ "Note that MIT requires a NOTICE. All modifications
require notes. See http://opensource.org/licenses/MIT.";),
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=1548699&r1=1548698&r2=1548699&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:49:23 2013
@@ -22,6 +22,7 @@ import static org.apache.rat.api.domain.
import static org.apache.rat.api.domain.RatLicenseFamily.GPL1;
import static org.apache.rat.api.domain.RatLicenseFamily.GPL2;
import static org.apache.rat.api.domain.RatLicenseFamily.GPL3;
+import static org.apache.rat.api.domain.RatLicenseFamily.MIT;
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;
@@ -115,7 +116,7 @@ public class RatLicenseFamilyTest {
GPL2.getNotes(),
is("Note that GPL2 requires a NOTICE. All
modifications require notes. See http://www.gnu.org/licenses/gpl-2.0.html.";));
}
-
+
@Test
public void testGPL3LicenseFamilyCategory() {
assertThat(GPL3.getCategory(), is("GPL3 "));
@@ -132,4 +133,21 @@ public class RatLicenseFamilyTest {
GPL3.getNotes(),
is("Note that GPL3 requires a NOTICE. All
modifications require notes. See http://www.gnu.org/licenses/gpl-3.0.html.";));
}
+
+ @Test
+ public void testMITLicenseFamilyCategory() {
+ assertThat(MIT.getCategory(), is("MIT "));
+ }
+
+ @Test
+ public void testMITLicenseFamilyName() {
+ assertThat(MIT.getName(), is("The MIT License"));
+ }
+
+ @Test
+ public void testMITLicenseFamilyNotes() {
+ assertThat(
+ MIT.getNotes(),
+ is("Note that MIT requires a NOTICE. All
modifications require notes. See http://opensource.org/licenses/MIT.";));
+ }
}
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MITLicense.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MITLicense.java?rev=1548699&r1=1548698&r2=1548699&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MITLicense.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/analysis/license/MITLicense.java
Fri Dec 6 19:49:23 2013
@@ -18,7 +18,7 @@
*/
package org.apache.rat.analysis.license;
-import org.apache.rat.api.MetaData;
+import static org.apache.rat.api.domain.RatLicenseFamily.MIT;
/**
* Base MIT license (all 3 parts).
@@ -32,8 +32,7 @@ public class MITLicense extends FullText
*
*/
public MITLicense() {
- super(MetaData.RAT_LICENSE_FAMILY_CATEGORY_DATUM_MIT,
- MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_MIT, "",
+ super(MIT.licenseFamily(),
FIRST_LICENSE_LINE + MIDDLE_LICENSE_LINE +
AS_IS_LICENSE_LINE);
}
}
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=1548699&r1=1548698&r2=1548699&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:49:23 2013
@@ -67,7 +67,6 @@ public class MetaData {
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 ";
- public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_MIT = "MIT ";
public static final String RAT_LICENSE_FAMILY_CATEGORY_VALUE_CDDL1 =
"CDDL1";
public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_GEN = new
Datum(
@@ -85,9 +84,6 @@ public class MetaData {
public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_TMF = new
Datum(
RAT_URL_LICENSE_FAMILY_CATEGORY,
RAT_LICENSE_FAMILY_CATEGORY_VALUE_TMF);
- public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_MIT = new
Datum(
- RAT_URL_LICENSE_FAMILY_CATEGORY,
- RAT_LICENSE_FAMILY_CATEGORY_VALUE_MIT);
public static final Datum RAT_LICENSE_FAMILY_CATEGORY_DATUM_CDLL1 = new
Datum(
RAT_URL_LICENSE_FAMILY_CATEGORY,
RAT_LICENSE_FAMILY_CATEGORY_VALUE_CDDL1);
@@ -98,7 +94,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_MIT = "The MIT
License";
public static final String RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1 = "COMMON
DEVELOPMENT AND DISTRIBUTION LICENSE Version 1.0";
public static final String
RAT_LICENSE_FAMILY_NAME_VALUE_ACADEMIC_FREE_LICENSE_VERSION_2_1 = "Academic
Free License, Version 2.1";
public static final String RAT_LICENSE_FAMILY_NAME_VALUE_UNKNOWN = "?????";
@@ -108,8 +103,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_MIT = new Datum(
- RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_MIT);
public static final Datum RAT_LICENSE_FAMILY_NAME_DATUM_CDDL1 = new Datum(
RAT_URL_LICENSE_FAMILY_NAME, RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1);
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/MITLicenseFamily.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/MITLicenseFamily.java?rev=1548699&r1=1548698&r2=1548699&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/MITLicenseFamily.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/main/java/org/apache/rat/license/MITLicenseFamily.java
Fri Dec 6 19:49:23 2013
@@ -18,14 +18,14 @@
*/
package org.apache.rat.license;
-import org.apache.rat.api.MetaData;
+import static org.apache.rat.api.domain.RatLicenseFamily.MIT;
/**
* Base implementation for MIT licenses.
*/
public class MITLicenseFamily extends SimpleLicenseFamily {
public MITLicenseFamily() {
- super(MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MIT);
+ super(MIT.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=1548699&r1=1548698&r2=1548699&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:49:23 2013
@@ -18,28 +18,26 @@
*/
package org.apache.rat.policy;
+
import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
+import static org.apache.rat.api.domain.RatLicenseFamily.MIT;
import static org.apache.rat.api.domain.RatLicenseFamily.W3C;
+import static org.apache.rat.api.domain.RatLicenseFamily.W3C_DOCUMENTATION;
import java.util.Arrays;
import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
import org.apache.rat.api.MetaData.Datum;
-import org.apache.rat.api.domain.RatLicenseFamily;
import org.apache.rat.document.IDocumentAnalyser;
import org.apache.rat.license.ILicenseFamily;
public class DefaultPolicy implements IDocumentAnalyser {
- private static final String[] APPROVED_LICENSES = {
- 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,
- MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1,
- };
+ private static final String[] APPROVED_LICENSES = { APACHE.getName(),
+ MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_OASIS_OPEN_LICENSE,
+ W3C.getName(), W3C_DOCUMENTATION.getName(),
+ MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_MODIFIED_BSD_LICENSE,
+ MIT.getName(),
MetaData.RAT_LICENSE_FAMILY_NAME_VALUE_CDDL1, };
private static final String[] toNames(final ILicenseFamily[]
approvedLicenses) {
String[] results = null;
Modified:
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
URL:
http://svn.apache.org/viewvc/creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java?rev=1548699&r1=1548698&r2=1548699&view=diff
==============================================================================
---
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
(original)
+++
creadur/rat/branches/gsoc/apache-rat-core/src/test/java/org/apache/rat/analysis/license/MITLicenseTest.java
Fri Dec 6 19:49:23 2013
@@ -18,18 +18,20 @@
*/
package org.apache.rat.analysis.license;
+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 java.util.HashMap;
+import java.util.Map;
+
import org.apache.rat.analysis.IHeaderMatcher;
import org.apache.rat.api.Document;
import org.apache.rat.document.MockLocation;
import org.junit.Before;
import org.junit.Test;
-import java.util.HashMap;
-import java.util.Map;
-
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
/**
*
*/
@@ -77,4 +79,22 @@ public class MITLicenseTest {
}
}
+ @Test
+ public void testNotes() {
+ assertThat(
+ new MITLicense().getNotes(),
+ is("Note that MIT requires a NOTICE. All
modifications require notes. See http://opensource.org/licenses/MIT.";));
+ }
+
+ @Test
+ public void testCategory() {
+ assertThat(new MITLicense().getLicenseFamilyCategory(), is("MIT
"));
+ }
+
+ @Test
+ public void testName() {
+ assertThat(new MITLicense().getLicenseFamilyName(),
+ is("The MIT License"));
+ }
+
}
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=1548699&r1=1548698&r2=1548699&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:49:23 2013
@@ -19,6 +19,7 @@
package org.apache.rat.policy;
import static org.apache.rat.api.domain.RatLicenseFamily.APACHE;
+import static org.apache.rat.api.domain.RatLicenseFamily.MIT;
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;
@@ -26,20 +27,17 @@ import static org.junit.Assert.assertEqu
import org.apache.rat.api.Document;
import org.apache.rat.api.MetaData;
import org.apache.rat.document.MockLocation;
-import org.apache.rat.report.claim.impl.xml.MockClaimReporter;
import org.junit.Before;
import org.junit.Test;
public class DefaultPolicyTest {
- MockClaimReporter reporter;
DefaultPolicy policy;
private Document subject;
@Before
public void setUp() throws Exception {
- reporter = new MockClaimReporter();
policy = new DefaultPolicy();
subject = new MockLocation("subject");
}
@@ -79,7 +77,16 @@ public class DefaultPolicyTest {
assertApproval(true);
}
- @Test
+ @Test
+ public void testMITFamily() throws Exception {
+ subject.getMetaData().set(
+ new
MetaData.Datum(MetaData.RAT_URL_LICENSE_FAMILY_NAME, MIT
+ .getName()));
+ policy.analyse(subject);
+ assertApproval(true);
+ }
+
+ @Test
public void testUnknownFamily() throws Exception {
subject.getMetaData().set(MetaData.RAT_LICENSE_FAMILY_NAME_DATUM_UNKNOWN);
policy.analyse(subject);
