You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sis.apache.org by de...@apache.org on 2016/09/14 21:29:51 UTC
svn commit: r1760780 [6/11] - in /sis/branches/JDK7: ./
application/sis-webapp/src/test/
core/sis-feature/src/main/java/org/apache/sis/feature/
core/sis-metadata/src/main/java/org/apache/sis/metadata/
core/sis-metadata/src/main/java/org/apache/sis/meta...
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors.properties [ISO-8859-1] Wed Sep 14 21:29:50 2016
@@ -42,6 +42,7 @@ CanNotMapAxisToDirection_2 = Can
CanNotOpen_1 = Can not open \u201c{0}\u201d.
CanNotParseFile_2 = Can not parse \u201c{1}\u201d as a file in the {0} format.
CanNotRead_1 = Can not read \u201c{0}\u201d.
+CanNotReadPropertyInFile_2 = Can not read property \u201c{1}\u201d in file \u201c{0}\u201d.
CanNotRepresentInFormat_2 = Can not represent \u201c{1}\u201d in a strictly standard-compliant {0} format.
CanNotSeparateTargetDimension_1 = Target dimension {0} depends on excluded source dimensions.
CanNotSetParameterValue_1 = Can not set a value for parameter \u201c{0}\u201d.
@@ -181,6 +182,7 @@ NonTemporalUnit_1 = \u20
NonUniformScale = Scale is not uniform.
NotABackwardReference_1 = No element for the \u201c{0}\u201d identifier, or the identifier is a forward reference.
NotAnAffineTransform = Transform is not affine.
+NotAKeyValuePair_1 = \u201c{0}\u201d is not a key-value pair.
NotANumber_1 = Argument \u2018{0}\u2019 shall not be NaN (Not-a-Number).
NotAPrimitiveWrapper_1 = Class \u2018{0}\u2019 is not a primitive type wrapper.
NotASingleton_1 = The \u201c{0}\u201d collection is not a singleton.
Modified: sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/core/sis-utility/src/main/java/org/apache/sis/util/resources/Errors_fr.properties [ISO-8859-1] Wed Sep 14 21:29:50 2016
@@ -39,6 +39,7 @@ CanNotMapAxisToDirection_2 = Aucu
CanNotOpen_1 = Ne peut pas ouvrir \u00ab\u202f{0}\u202f\u00bb.
CanNotParseFile_2 = Ne peut pas lire \u00ab\u202f{1}\u202f\u00bb comme un fichier au format {0}.
CanNotRead_1 = Ne peut pas lire \u00ab\u202f{0}\u202f\u00bb.
+CanNotReadPropertyInFile_2 = Ne peut pas lire la propri\u00e9t\u00e9 \u00ab\u202f{1}\u202f\u00bb dans le fichier \u00ab\u202f{0}\u202f\u00bb.
CanNotRepresentInFormat_2 = Ne peut pas repr\u00e9senter \u00ab\u202f{1}\u202f\u00bb dans un format {0} strictement conforme.
CanNotSeparateTargetDimension_1 = La dimension de destination {0} d\u00e9pend de dimensions sources qui ont \u00e9t\u00e9 exclues.
CanNotSetParameterValue_1 = Ne peut pas d\u00e9finir une valeur pour le param\u00e8tre \u00ab\u202f{0}\u202f\u00bb.
@@ -178,6 +179,7 @@ NonTemporalUnit_1 = \u00
NonUniformScale = L\u2019\u00e9chelle n\u2019est pas uniforme.
NotABackwardReference_1 = Il n\u2019y a pas d\u2019\u00e9l\u00e9ment pour l\u2019identifiant \u201c{0}\u201d, ou l\u2019identifiant est une r\u00e9f\u00e9rence vers l\u2019avant.
NotAnAffineTransform = La transformation n\u2019est pas affine.
+NotAKeyValuePair_1 = \u00ab\u202f{0}\u202f\u00bb n\u2019est pas une paire cl\u00e9-valeur.
NotANumber_1 = L\u2019argument \u2018{0}\u2019 ne doit pas \u00eatre NaN (Not-a-Number).
NotAPrimitiveWrapper_1 = La classe \u2018{0}\u2019 n\u2019est pas un adaptateur d\u2019un type primitif.
NotASingleton_1 = La collection de \u00ab\u202f{0}\u202f\u00bb n\u2019est pas un singleton.
Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/StandardDateFormatTest.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -17,9 +17,11 @@
package org.apache.sis.internal.util;
import java.text.ParseException;
+import org.apache.sis.test.DependsOnMethod;
import org.apache.sis.test.TestCase;
import org.junit.Test;
+import static org.apache.sis.test.TestUtilities.date;
import static org.junit.Assert.*;
@@ -41,19 +43,31 @@ public final strictfp class StandardDate
}
/**
- * Tests {@link StandardDateFormat.Fix} class.
+ * Tests {@link StandardDateFormat#dateToISO(String, int, boolean)} method.
*/
@Test
- public void testAdaptText() {
- StandardDateFormat.Fix fix = StandardDateFormat.Fix.apply("2016-06-27T16:48:12Z", 0, 0);
- assertEquals("fix.input", "2016-06-27T16:48:12.000Z", fix.text);
- assertEquals("An index before", 18, fix.adjustIndex(18));
- assertEquals("An index after", 19, fix.adjustIndex(23));
-
- fix = StandardDateFormat.Fix.apply("2016-06-27T16:48:12.48Z", 0, 0);
- assertEquals("fix.input", "2016-06-27T16:48:12.480Z", fix.text);
- assertEquals("An index before", 18, fix.adjustIndex(18));
- assertEquals("An index after", 22, fix.adjustIndex(23));
+ public void testDateToISO() {
+ assertEquals("2009-01-01T06:00:00.000+01:00", StandardDateFormat.dateToISO("2009-01-01T06:00:00+01:00", 0, false));
+ assertEquals("2005-09-22T04:30:15.432Z", StandardDateFormat.dateToISO("2005-09-22T04:30:15.4321Z", 0, false));
+ assertEquals("2005-09-22T04:30:15.432Z", StandardDateFormat.dateToISO("2005-09-22T04:30:15.432Z", 0, false));
+ assertEquals("2005-09-22T04:30:15.000Z", StandardDateFormat.dateToISO("2005-09-22T04:30:15Z", 0, false));
+ assertEquals("2005-09-22T04:30:15.000Z", StandardDateFormat.dateToISO("2005-09-22T04:30:15", 0, false));
+ assertEquals("2005-09-22T04:30:00.000Z", StandardDateFormat.dateToISO("2005-09-22T04:30", 0, false));
+ assertEquals("2005-09-22T04:00:00.000Z", StandardDateFormat.dateToISO("2005-09-22T04", 0, false));
+ assertEquals("2005-09-22T00:00:00.000Z", StandardDateFormat.dateToISO("2005-09-22", 0, false));
+ assertEquals("2005-09-22T00:00:00.000Z", StandardDateFormat.dateToISO("2005-9-22", 0, false));
+
+ String text = "2016-06-27T16:48:12Z";
+ String modified = StandardDateFormat.dateToISO(text, 0, false);
+ assertEquals("2016-06-27T16:48:12.000Z", modified);
+ assertEquals("An index before", 18, StandardDateFormat.adjustIndex(text, modified, 0, 18));
+ assertEquals("An index after", 19, StandardDateFormat.adjustIndex(text, modified, 0, 23));
+
+ text = "2016-06-27T16:48:12.48Z";
+ modified = StandardDateFormat.dateToISO(text, 0, false);
+ assertEquals("2016-06-27T16:48:12.480Z", modified);
+ assertEquals("An index before", 18, StandardDateFormat.adjustIndex(text, modified, 0, 18));
+ assertEquals("An index after", 22, StandardDateFormat.adjustIndex(text, modified, 0, 23));
}
/**
@@ -64,6 +78,7 @@ public final strictfp class StandardDate
* @throws ParseException if an error occurred while parsing the date.
*/
@Test
+ @DependsOnMethod("testDateToISO")
public void testParse() throws ParseException {
final long day = 1466985600000L;
final StandardDateFormat f = new StandardDateFormat();
@@ -71,5 +86,14 @@ public final strictfp class StandardDate
assertEquals("millis", day + ((16*60 + 48)*60 + 12)*1000, f.parse("2016-06-27T16:48:12Z") .getTime());
assertEquals("millis", day, f.parse("2016-06-27") .getTime());
assertEquals("millis", day + (( 3*60 + 2)*60 + 1)*1000 + 90, f.parse("2016-06-27T03:02:01.09Z").getTime());
+
+ assertEquals(date("2009-01-01 05:00:00"), f.parse("2009-01-01T06:00:00+01:00"));
+ assertEquals(date("2005-09-22 04:30:15"), f.parse("2005-09-22T04:30:15Z"));
+ assertEquals(date("2005-09-22 04:30:15"), f.parse("2005-09-22T04:30:15"));
+ assertEquals(date("2005-09-22 04:30:00"), f.parse("2005-09-22T04:30"));
+ assertEquals(date("2005-09-22 04:00:00"), f.parse("2005-09-22T04"));
+ assertEquals(date("2005-09-22 00:00:00"), f.parse("2005-09-22"));
+ assertEquals(date("2005-09-22 00:00:00"), f.parse("2005-9-22"));
+ assertEquals(date("1992-01-01 00:00:00"), f.parse("1992-1-1"));
}
}
Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/UtilitiesTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/UtilitiesTest.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/UtilitiesTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/internal/util/UtilitiesTest.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -17,9 +17,10 @@
package org.apache.sis.internal.util;
import org.apache.sis.test.TestCase;
+import org.apache.sis.util.Characters;
import org.junit.Test;
-import static org.apache.sis.test.Assert.*;
+import static org.junit.Assert.*;
/**
@@ -27,7 +28,7 @@ import static org.apache.sis.test.Assert
*
* @author Martin Desruisseaux (Geomatys)
* @since 0.3
- * @version 0.4
+ * @version 0.8
* @module
*/
public final strictfp class UtilitiesTest extends TestCase {
@@ -38,4 +39,15 @@ public final strictfp class UtilitiesTes
public void testToString() {
assertEquals("Number[base=\u201cdecimal\u201d, value=20]", Utilities.toString(Number.class, "base", "decimal", "value", 20));
}
+
+ /**
+ * Tests the {@link Utilities#toUpperCase(String, Characters.Filter)} method.
+ */
+ @Test
+ public void testToUpperCase() {
+ final String expected = "WGS84";
+ assertSame (expected, Utilities.toUpperCase(expected, Characters.Filter.LETTERS_AND_DIGITS));
+ assertEquals(expected, Utilities.toUpperCase("WGS 84", Characters.Filter.LETTERS_AND_DIGITS));
+ assertEquals(expected, Utilities.toUpperCase("wgs 84", Characters.Filter.LETTERS_AND_DIGITS));
+ }
}
Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/test/TestUtilities.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -108,7 +108,7 @@ public final strictfp class TestUtilitie
* of different test cases. This method does nothing if verbose output is not enabled,
* because only the output of failed tests should be printed in such case.
*
- * @param title The title to write.
+ * @param title the title to write.
*/
public static void printSeparator(final String title) {
if (TestCase.VERBOSE) {
@@ -162,7 +162,7 @@ public final strictfp class TestUtilitie
* the developer to reproduce the test with the exact same sequence of numbers.
* Using this method, the seed can be retrieved in the messages sent to the output stream.</p>
*
- * @return A new random number generator initialized with a random seed.
+ * @return a new random number generator initialized with a random seed.
*/
public static Random createRandomNumberGenerator() {
long seed;
@@ -186,8 +186,8 @@ public final strictfp class TestUtilitie
* <li>Once the test has been fixed, remove the argument from the {@code createRandomNumberGenerator()} call.</li>
* </ul>
*
- * @param seed The random generator seed.
- * @return A new random number generator initialized with the given seed.
+ * @param seed the random generator seed.
+ * @return a new random number generator initialized with the given seed.
*
* @since 0.5
*/
@@ -200,8 +200,8 @@ public final strictfp class TestUtilitie
/**
* Parses the date for the given string using the {@code "yyyy-MM-dd HH:mm:ss"} pattern in UTC timezone.
*
- * @param date The date as a {@link String}.
- * @return The date as a {@link Date}.
+ * @param date the date as a {@link String}.
+ * @return the date as a {@link Date}.
*/
public static Date date(final String date) {
ArgumentChecks.ensureNonNull("date", date);
@@ -217,8 +217,8 @@ public final strictfp class TestUtilitie
/**
* Formats the given date using the {@code "yyyy-MM-dd HH:mm:ss"} pattern in UTC timezone.
*
- * @param date The date to format.
- * @return The date as a {@link String}.
+ * @param date the date to format.
+ * @return the date as a {@link String}.
*/
public static String format(final Date date) {
ArgumentChecks.ensureNonNull("date", date);
@@ -231,9 +231,9 @@ public final strictfp class TestUtilitie
* Formats the given value using the given formatter, and parses the text back to its value.
* If the parsed value is not equal to the original one, an {@link AssertionError} is thrown.
*
- * @param formatter The formatter to use for formatting and parsing.
- * @param value The value to format.
- * @return The formatted value.
+ * @param formatter the formatter to use for formatting and parsing.
+ * @param value the value to format.
+ * @return the formatted value.
*/
public static String formatAndParse(final Format formatter, final Object value) {
final String text = formatter.format(value);
@@ -252,8 +252,8 @@ public final strictfp class TestUtilitie
* Dates and times, if any, will be formatted using the {@code "yyyy-MM-dd HH:mm:ss"} pattern in UTC timezone.
* This method is used mostly as a convenient way to verify the content of an ISO 19115 metadata object.
*
- * @param table The table for which to get a string representation.
- * @return A unlocalized string representation of the given tree table.
+ * @param table the table for which to get a string representation.
+ * @return a unlocalized string representation of the given tree table.
*/
public static String formatNameAndValue(final TreeTable table) {
synchronized (TestUtilities.class) {
@@ -290,8 +290,8 @@ public final strictfp class TestUtilitie
* In such case, we can not compare the actual text content. The best we can do is to compare
* the tree structure.
*
- * @param tree The string representation of a tree.
- * @return The structure of the given tree, without text.
+ * @param tree the string representation of a tree.
+ * @return the structure of the given tree, without text.
*/
public static CharSequence[] toTreeStructure(final CharSequence tree) {
final CharSequence[] lines = CharSequences.split(tree, '\n');
@@ -314,9 +314,9 @@ public final strictfp class TestUtilitie
* Returns the single element from the given array. If the given array is null or
* does not contains exactly one element, then an {@link AssertionError} is thrown.
*
- * @param <E> The type of array elements.
- * @param array The array from which to get the singleton.
- * @return The singleton element from the array.
+ * @param <E> the type of array elements.
+ * @param array the array from which to get the singleton.
+ * @return the singleton element from the array.
*/
public static <E> E getSingleton(final E[] array) {
assertNotNull("Null array.", array);
@@ -328,9 +328,9 @@ public final strictfp class TestUtilitie
* Returns the single element from the given collection. If the given collection is null
* or does not contains exactly one element, then an {@link AssertionError} is thrown.
*
- * @param <E> The type of collection elements.
- * @param collection The collection from which to get the singleton.
- * @return The singleton element from the collection.
+ * @param <E> the type of collection elements.
+ * @param collection the collection from which to get the singleton.
+ * @return the singleton element from the collection.
*/
public static <E> E getSingleton(final Iterable<? extends E> collection) {
assertNotNull("Null collection.", collection);
@@ -344,10 +344,10 @@ public final strictfp class TestUtilitie
/**
* Returns a copy of the given array with the last ordinate values dropped for each coordinates.
*
- * @param coordinates The source coordinates from which to drop the last ordinate values.
- * @param sourceDim Number of dimensions of each point in the {@code coordinates} array.
- * @param targetDim Number of dimensions to retain.
- * @return Copy of the given {@code coordinates} array with only the {@code targetDim} first dimension for each point.
+ * @param coordinates the source coordinates from which to drop the last ordinate values.
+ * @param sourceDim number of dimensions of each point in the {@code coordinates} array.
+ * @param targetDim number of dimensions to retain.
+ * @return copy of the given {@code coordinates} array with only the {@code targetDim} first dimension for each point.
*
* @since 0.7
*/
@@ -365,7 +365,7 @@ public final strictfp class TestUtilitie
* If the given failure is not null, re-thrown it as an {@link Error} or
* {@link RuntimeException}. Otherwise do nothing.
*
- * @param failure The exception to re-thrown if non-null.
+ * @param failure the exception to re-thrown if non-null.
*/
public static void rethrownIfNotNull(final Throwable failure) {
if (failure != null) {
@@ -384,10 +384,10 @@ public final strictfp class TestUtilitie
* {@linkplain java.lang.Thread.State#BLOCKED blocked} or the
* {@linkplain java.lang.Thread.State#WAITING waiting} state.
*
- * @param thread The thread to wait for blocked or waiting state.
- * @throws IllegalThreadStateException If the thread has terminated its execution,
+ * @param thread the thread to wait for blocked or waiting state.
+ * @throws IllegalThreadStateException if the thread has terminated its execution,
* or has not reached the waiting or blocked state before the timeout.
- * @throws InterruptedException If this thread has been interrupted while waiting.
+ * @throws InterruptedException if this thread has been interrupted while waiting.
*/
public static void waitForBlockedState(final Thread thread) throws IllegalThreadStateException, InterruptedException {
int retry = MAXIMAL_WAIT_TIME / 5; // 5 shall be the same number than in the call to Thread.sleep.
@@ -411,11 +411,11 @@ public final strictfp class TestUtilitie
* value. This method is designed that way because the caller can usually produce a more
* accurate error message about which value has not been garbage collected as expected.</p>
*
- * @param stopCondition A condition which return {@code true} if this method can stop waiting,
+ * @param stopCondition a condition which return {@code true} if this method can stop waiting,
* or {@code false} if it needs to ask again for garbage collection.
* @return {@code true} if the given condition has been meet, or {@code false} if we waited up
* to the timeout without meeting the given condition.
- * @throws InterruptedException If this thread has been interrupted while waiting.
+ * @throws InterruptedException if this thread has been interrupted while waiting.
*/
public static boolean waitForGarbageCollection(final Callable<Boolean> stopCondition) throws InterruptedException {
assertTrue("GC-dependent tests not allowed in this run.", TestConfiguration.allowGarbageCollectorDependentTests());
Modified: sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java [UTF-8] (original)
+++ sis/branches/JDK7/core/sis-utility/src/test/java/org/apache/sis/util/NumbersTest.java [UTF-8] Wed Sep 14 21:29:50 2016
@@ -168,6 +168,7 @@ public final strictfp class NumbersTest
* Tests {@link Numbers#narrowestNumber(Number)}.
*/
@Test
+ @SuppressWarnings("UnnecessaryBoxing")
public void testNarrowestNumber() {
assertEquals(Byte .valueOf((byte) 127), narrowestNumber( 127.0));
assertEquals(Short .valueOf((short) 128), narrowestNumber( 128.0));
@@ -186,6 +187,7 @@ public final strictfp class NumbersTest
*/
@Test
public void testCast() {
+ @SuppressWarnings("UnnecessaryBoxing")
final Integer value = new Integer(10); // Intentionally a new instance.
assertEquals(Byte .valueOf((byte) 10), cast(value, Byte .class));
assertEquals(Short .valueOf((short) 10), cast(value, Short .class));
Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml Wed Sep 14 21:29:50 2016
@@ -122,6 +122,7 @@ is divided into following sections:
</condition>
<condition property="have.tests">
<or>
+ <available file="${test.webapp.dir}"/>
<available file="${test.console.dir}"/>
<available file="${test.earth-obs.dir}"/>
<available file="${test.geotiff.dir}"/>
@@ -264,6 +265,7 @@ is divided into following sections:
<fail unless="src.metadata.dir">Must set src.metadata.dir</fail>
<fail unless="src.utility.dir">Must set src.utility.dir</fail>
<fail unless="src.fra-profile.dir">Must set src.fra-profile.dir</fail>
+ <fail unless="test.webapp.dir">Must set test.webapp.dir</fail>
<fail unless="test.console.dir">Must set test.console.dir</fail>
<fail unless="test.earth-obs.dir">Must set test.earth-obs.dir</fail>
<fail unless="test.geotiff.dir">Must set test.geotiff.dir</fail>
@@ -456,6 +458,9 @@ is divided into following sections:
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}">
+ <fileset dir="${test.webapp.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
<fileset dir="${test.console.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -518,6 +523,9 @@ is divided into following sections:
<isset property="test.method"/>
</condition>
<union id="test.set">
+ <fileset dir="${test.webapp.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
<fileset dir="${test.console.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -660,6 +668,9 @@ is divided into following sections:
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}">
+ <fileset dir="${test.webapp.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
<fileset dir="${test.console.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -1476,11 +1487,12 @@ is divided into following sections:
<!-- You can override this target in the ../build.xml file. -->
</target>
<target if="do.depend.true" name="-compile-test-depend">
- <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
+ <j2seproject3:depend classpath="${javac.test.classpath}" destdir="${build.test.classes.dir}" srcdir="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
</target>
<target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
- <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
+ <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
<copy todir="${build.test.classes.dir}">
+ <fileset dir="${test.webapp.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.console.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.earth-obs.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.geotiff.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1506,8 +1518,9 @@ is divided into following sections:
<target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test-single" if="have.tests" name="-do-compile-test-single">
<fail unless="javac.includes">Must select some files in the IDE or set javac.includes</fail>
<j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
- <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}" srcdir="${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
+ <j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}" srcdir="${test.webapp.dir}:${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
<copy todir="${build.test.classes.dir}">
+ <fileset dir="${test.webapp.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.console.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.earth-obs.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.geotiff.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
Copied: sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml~ (from r1760700, sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml)
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml%7E?p2=sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml%7E&p1=sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml&r1=1760700&r2=1760780&rev=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/build-impl.xml~ Wed Sep 14 21:29:50 2016
@@ -122,6 +122,7 @@ is divided into following sections:
</condition>
<condition property="have.tests">
<or>
+ <available file="${test.webapp.dir}"/>
<available file="${test.console.dir}"/>
<available file="${test.earth-obs.dir}"/>
<available file="${test.geotiff.dir}"/>
@@ -264,6 +265,7 @@ is divided into following sections:
<fail unless="src.metadata.dir">Must set src.metadata.dir</fail>
<fail unless="src.utility.dir">Must set src.utility.dir</fail>
<fail unless="src.fra-profile.dir">Must set src.fra-profile.dir</fail>
+ <fail unless="test.webapp.dir">Must set test.webapp.dir</fail>
<fail unless="test.console.dir">Must set test.console.dir</fail>
<fail unless="test.earth-obs.dir">Must set test.earth-obs.dir</fail>
<fail unless="test.geotiff.dir">Must set test.geotiff.dir</fail>
@@ -456,6 +458,9 @@ is divided into following sections:
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}">
+ <fileset dir="${test.webapp.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
<fileset dir="${test.console.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -518,6 +523,9 @@ is divided into following sections:
<isset property="test.method"/>
</condition>
<union id="test.set">
+ <fileset dir="${test.webapp.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
<fileset dir="${test.console.dir}" excludes="@{excludes},**/*.xml,${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -660,6 +668,9 @@ is divided into following sections:
<property name="junit.forkmode" value="perTest"/>
<junit dir="${work.dir}" errorproperty="tests.failed" failureproperty="tests.failed" fork="true" forkmode="${junit.forkmode}" showoutput="true" tempdir="${build.dir}">
<batchtest todir="${build.test.results.dir}">
+ <fileset dir="${test.webapp.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
+ <filename name="@{testincludes}"/>
+ </fileset>
<fileset dir="${test.console.dir}" excludes="@{excludes},${excludes}" includes="@{includes}">
<filename name="@{testincludes}"/>
</fileset>
@@ -1481,6 +1492,7 @@ is divided into following sections:
<target depends="init,deps-jar,compile,-pre-pre-compile-test,-pre-compile-test,-compile-test-depend" if="have.tests" name="-do-compile-test">
<j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" processorpath="${javac.test.processorpath}" srcdir="${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
<copy todir="${build.test.classes.dir}">
+ <fileset dir="${test.webapp.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.console.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.earth-obs.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.geotiff.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
@@ -1508,6 +1520,7 @@ is divided into following sections:
<j2seproject3:force-recompile destdir="${build.test.classes.dir}"/>
<j2seproject3:javac apgeneratedsrcdir="${build.test.classes.dir}" classpath="${javac.test.classpath}" debug="true" destdir="${build.test.classes.dir}" excludes="" includes="${javac.includes}" processorpath="${javac.test.processorpath}" sourcepath="${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}" srcdir="${test.console.dir}:${test.earth-obs.dir}:${test.geotiff.dir}:${test.netcdf.dir}:${test.shapefile.dir}:${test.storage.dir}:${test.feature.dir}:${test.referencing.dir}:${test.metadata.dir}:${test.utility.dir}:${test.fra-profile.dir}"/>
<copy todir="${build.test.classes.dir}">
+ <fileset dir="${test.webapp.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.console.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.earth-obs.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
<fileset dir="${test.geotiff.dir}" excludes="${build.classes.excludes},${excludes}" includes="${includes}"/>
Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/genfiles.properties [ISO-8859-1] Wed Sep 14 21:29:50 2016
@@ -3,6 +3,6 @@
build.xml.data.CRC32=58e6b21c
build.xml.script.CRC32=462eaba0
build.xml.stylesheet.CRC32=28e38971@1.53.1.46
-nbproject/build-impl.xml.data.CRC32=c75de539
-nbproject/build-impl.xml.script.CRC32=c82732c9
+nbproject/build-impl.xml.data.CRC32=4d73a96a
+nbproject/build-impl.xml.script.CRC32=c6b211a6
nbproject/build-impl.xml.stylesheet.CRC32=05530350@1.79.1.48
Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.properties [ISO-8859-1] Wed Sep 14 21:29:50 2016
@@ -46,6 +46,7 @@ junit.forkmode = once
project.root = ../..
src.local-src.dir = ../local-src
src.webapp.dir = ${project.root}/application/sis-webapp/src/main/java
+test.webapp.dir = ${project.root}/application/sis-webapp/src/test/java
src.console.dir = ${project.root}/application/sis-console/src/main/java
test.console.dir = ${project.root}/application/sis-console/src/test/java
src.earth-obs.dir = ${project.root}/storage/sis-earth-observation/src/main/java
Modified: sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml
URL: http://svn.apache.org/viewvc/sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml?rev=1760780&r1=1760779&r2=1760780&view=diff
==============================================================================
--- sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml (original)
+++ sis/branches/JDK7/ide-project/NetBeans/nbproject/project.xml Wed Sep 14 21:29:50 2016
@@ -38,6 +38,7 @@
<root id="src.fra-profile.dir" name="French profile"/>
</source-roots>
<test-roots>
+ <root id="test.webapp.dir" name="Test web application"/>
<root id="test.console.dir" name="Test Console"/>
<root id="test.earth-obs.dir" name="Test Earth observation"/>
<root id="test.geotiff.dir" name="Test GeoTIFF"/>