You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by sb...@apache.org on 2016/11/16 20:08:59 UTC
svn commit: r1770054 - in /sling/trunk/contrib/jcr/js/nodetypes/src:
main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/
test/java/org/apache/sling/jcr/js/nodetypes/ test/resources/expectedNTJSON/
Author: sboehme
Date: Wed Nov 16 20:08:59 2016
New Revision: 1770054
URL: http://svn.apache.org/viewvc?rev=1770054&view=rev
Log:
SLING-6292 (jcr.js.nodetypes tests fail when run in a different timezone) fixed and @override removed
Modified:
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java
sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/GenerationConstants.java
sling/trunk/contrib/jcr/js/nodetypes/src/test/resources/expectedNTJSON/testCompleteDatePropertyDefinition.json
sling/trunk/contrib/jcr/js/nodetypes/src/test/resources/expectedNTJSON/testTwoResidualPropertyDefinitions.json
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java?rev=1770054&r1=1770053&r2=1770054&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/AutoCreatedMatcher.java Wed Nov 16 20:08:59 2016
@@ -27,7 +27,6 @@ public class AutoCreatedMatcher extends
super.index = index;
}
- @Override
public boolean match(PropertyDefinition propertyDefinition) {
String arrayValue = super.getArrayValue(idFields, index);
if (arrayValue!=null){
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java?rev=1770054&r1=1770053&r2=1770054&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MandatoryMatcher.java Wed Nov 16 20:08:59 2016
@@ -27,7 +27,6 @@ public class MandatoryMatcher extends Ab
super.index = index;
}
- @Override
public boolean match(PropertyDefinition propertyDefinition) {
String arrayValue = super.getArrayValue(idFields, index);
if (arrayValue!=null){
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java?rev=1770054&r1=1770053&r2=1770054&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/MultipleMatcher.java Wed Nov 16 20:08:59 2016
@@ -27,7 +27,6 @@ public class MultipleMatcher extends Abs
super.index = index;
}
- @Override
public boolean match(PropertyDefinition propertyDefinition) {
String arrayValue = super.getArrayValue(idFields, index);
if (arrayValue!=null){
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java?rev=1770054&r1=1770053&r2=1770054&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/OnParentVersionMatcher.java Wed Nov 16 20:08:59 2016
@@ -32,7 +32,6 @@ public class OnParentVersionMatcher exte
super.index = index;
}
- @Override
public boolean match(PropertyDefinition propertyDefinition) {
String arrayValue = super.getArrayValue(idFields, index);
if (arrayValue!=null){
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java?rev=1770054&r1=1770053&r2=1770054&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/PropertyNameMatcher.java Wed Nov 16 20:08:59 2016
@@ -27,7 +27,6 @@ public class PropertyNameMatcher extends
super.index = index;
}
- @Override
public boolean match(PropertyDefinition propertyDefinition) {
String arrayValue = super.getArrayValue(idFields, index);
if (arrayValue!=null){
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java?rev=1770054&r1=1770053&r2=1770054&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/ProtectedMatcher.java Wed Nov 16 20:08:59 2016
@@ -27,7 +27,6 @@ public class ProtectedMatcher extends Ab
super.index = index;
}
- @Override
public boolean match(PropertyDefinition propertyDefinition) {
String arrayValue = super.getArrayValue(idFields, index);
if (arrayValue!=null){
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java?rev=1770054&r1=1770053&r2=1770054&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/main/java/org/apache/sling/jcr/js/nodetypes/downloaddefaultbinary/RequiredPropertyTypeMatcher.java Wed Nov 16 20:08:59 2016
@@ -32,7 +32,6 @@ public class RequiredPropertyTypeMatcher
super.index = index;
}
- @Override
public boolean match(PropertyDefinition propertyDefinition) {
String arrayValue = super.getArrayValue(idFields, index);
if (arrayValue!=null){
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/GenerationConstants.java
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/GenerationConstants.java?rev=1770054&r1=1770053&r2=1770054&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/GenerationConstants.java (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/test/java/org/apache/sling/jcr/js/nodetypes/GenerationConstants.java Wed Nov 16 20:08:59 2016
@@ -21,6 +21,7 @@ package org.apache.sling.jcr.js.nodetype
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
+import java.util.TimeZone;
/**
* Used by generators to generate the right content and by the test cases to compare if the right content has been returned.
@@ -33,7 +34,7 @@ public class GenerationConstants {
private static Calendar maxDate = Calendar.getInstance();
static {
maxDate.clear();
- maxDate.set(2012, 03, 01);
+ maxDate.set(2014, 07, 11);
}
public static final String CONSTRAINT_DATE = df.format(maxDate.getTime());
public static final String CONSTRAINT_DOUBLE = "[,5]";
@@ -45,10 +46,10 @@ public class GenerationConstants {
public static final String CONSTRAINT_REFERENCE = "nt:unstructured";
- public static final Calendar DEFAULT_VALUE_CALENDAR = Calendar.getInstance();
+ public static final Calendar DEFAULT_VALUE_CALENDAR = Calendar.getInstance(TimeZone.getTimeZone("UTC"));
static {
DEFAULT_VALUE_CALENDAR.clear();
- DEFAULT_VALUE_CALENDAR.set(2012, 01, 01);
+ DEFAULT_VALUE_CALENDAR.set(2014, 7, 10); // 10.8.2014
}
public static final String DEFAULT_VALUE_BINARY = "/ntName/stringPropertyDef/Binary/true/true/true/true/VERSION/0.default_binary_value.bin";
public static final String DEFAULT_VALUE_STRING = "Default-String";
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/test/resources/expectedNTJSON/testCompleteDatePropertyDefinition.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/test/resources/expectedNTJSON/testCompleteDatePropertyDefinition.json?rev=1770054&r1=1770053&r2=1770054&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/test/resources/expectedNTJSON/testCompleteDatePropertyDefinition.json (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/test/resources/expectedNTJSON/testCompleteDatePropertyDefinition.json Wed Nov 16 20:08:59 2016
@@ -4,13 +4,13 @@
{
"defaultValues": [
{
- "date": "2012-02-01T00:00:00.000+01:00",
+ "date": "2014-08-10T00:00:00.000Z",
"type": "Date"
}
],
"requiredType": "Date",
"valueConstraints": [
- "2012-04-01T00:00:00Z"
+ "2014-08-11T00:00:00Z"
],
"multiple": true,
"autoCreated": true,
Modified: sling/trunk/contrib/jcr/js/nodetypes/src/test/resources/expectedNTJSON/testTwoResidualPropertyDefinitions.json
URL: http://svn.apache.org/viewvc/sling/trunk/contrib/jcr/js/nodetypes/src/test/resources/expectedNTJSON/testTwoResidualPropertyDefinitions.json?rev=1770054&r1=1770053&r2=1770054&view=diff
==============================================================================
--- sling/trunk/contrib/jcr/js/nodetypes/src/test/resources/expectedNTJSON/testTwoResidualPropertyDefinitions.json (original)
+++ sling/trunk/contrib/jcr/js/nodetypes/src/test/resources/expectedNTJSON/testTwoResidualPropertyDefinitions.json Wed Nov 16 20:08:59 2016
@@ -21,13 +21,13 @@
{
"defaultValues": [
{
- "date": "2012-02-01T00:00:00.000+01:00",
+ "date": "2014-08-10T00:00:00.000Z",
"type": "Date"
}
],
"requiredType": "Date",
"valueConstraints": [
- "2012-04-01T00:00:00Z"
+ "2014-08-11T00:00:00Z"
],
"multiple": true,
"autoCreated": true,